controller.git
10 years agoTurned down some logs in StatisticsProvider from INFO to DEBUG 71/4771/3
Ed Warnicke [Sat, 25 Jan 2014 21:31:11 +0000 (15:31 -0600)]
Turned down some logs in StatisticsProvider from INFO to DEBUG

Change-Id: I34729faa14d81e902add8acd59e2bfc895ddd87e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoBug 319: Fixed two-phase commit verification of data. 34/4734/4
Tony Tkacik [Fri, 24 Jan 2014 18:30:53 +0000 (19:30 +0100)]
Bug 319: Fixed two-phase commit verification of data.

Change-Id: I0183b2543d8842e485ad118badd14055035a44b0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoExtract dom-serializer-api|impl from binding-broker-impl 93/4593/9
Tony Tkacik [Sat, 25 Jan 2014 17:29:57 +0000 (18:29 +0100)]
Extract dom-serializer-api|impl from binding-broker-impl

Change-Id: I1b2844bfac5062fd15c1f011c3104b3dddb33b51
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoMinor fix in flow IP Matching 66/4766/2 jenkins-controller-bulk-release-prepare-only-2-9
Anil Vishnoi [Sat, 25 Jan 2014 12:25:53 +0000 (17:55 +0530)]
Minor fix in flow IP Matching

Change-Id: I458425ec4482665a29b56012ec91610346eac378
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoMerge "Gerrit contains following minor enhancements: 1) Send statistics requests...
Ed Warnicke [Sat, 25 Jan 2014 05:59:32 +0000 (05:59 +0000)]
Merge "Gerrit contains following minor enhancements: 1) Send statistics requests whenever new flow capable node connects to the controller 2) Clean up transaction-id cache for expired Ids 3) Remove Tx id when last part of multipart response received."

10 years agoMerge "fix for frm to not act on duplicate mode change notifications" jenkins-controller-bulk-release-prepare-only-2-7 jenkins-controller-bulk-release-prepare-only-2-8
Alessandro Boch [Sat, 25 Jan 2014 04:43:07 +0000 (04:43 +0000)]
Merge "fix for frm to not act on duplicate mode change notifications"

10 years agoMerge "Relaxing a strict check in updateNode in SwitchManager to handle a condition...
Ed Warnicke [Sat, 25 Jan 2014 04:39:16 +0000 (04:39 +0000)]
Merge "Relaxing a strict check in updateNode in SwitchManager to handle a condition in which the adaptor fails to call the addNode."

10 years agoSmall fix to finally fix dryrun. 58/4758/1
Ed Warnicke [Sat, 25 Jan 2014 03:54:07 +0000 (21:54 -0600)]
Small fix to finally fix dryrun.

Turns out that the lack of directory hiearchy matching
our pom hierarchy requires some redeclaration of
properties.

Change-Id: I5b608ba9599ac5d9d54d1898f4f45f68001ada5e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agofix for frm to not act on duplicate mode change notifications 40/4740/3
Asad Ahmed [Fri, 24 Jan 2014 21:53:59 +0000 (13:53 -0800)]
fix for frm to not act on duplicate mode change notifications

Change-Id: If3ec14399bd0fc52a26463f901967b6708b7f352
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
10 years agoRelaxing a strict check in updateNode in SwitchManager to handle a condition in which... 50/4750/1
Madhu Venugopal [Sat, 25 Jan 2014 00:04:27 +0000 (16:04 -0800)]
Relaxing a strict check in updateNode in SwitchManager to handle a condition in which the adaptor fails to call the addNode.

The existing ADSAL code is already robust enough to handle the scenario of NodeProps not containing the a node Key.
Also, there are cases in which an application might just want to see an update event for processing
(especially when the addNode events are missing).

Change-Id: I6561f2f34220b2372b142307754f086a2abe42fd
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoGerrit contains following minor enhancements: 48/4748/1
Anil Vishnoi [Thu, 23 Jan 2014 09:13:43 +0000 (14:43 +0530)]
Gerrit contains following minor enhancements:
1) Send statistics requests whenever new flow capable node connects to the controller
2) Clean up transaction-id cache for expired Ids
3) Remove Tx id when last part of multipart response received.

Change-Id: I4055b7e7ad10a67e78bafd3b977db642fe5b1ee3
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoMerge "Fix for NullPointerException" jenkins-controller-bulk-release-prepare-only-2-5 jenkins-controller-bulk-release-prepare-only-2-6
Jason Ye [Fri, 24 Jan 2014 21:16:31 +0000 (21:16 +0000)]
Merge "Fix for NullPointerException"

10 years agoSmall fix for version skew to fix dryrun 35/4735/1
Ed Warnicke [Fri, 24 Jan 2014 19:45:23 +0000 (13:45 -0600)]
Small fix for version skew to fix dryrun

Change-Id: Ie54347a79a11e06c3c33cdfae85a837ea5927365
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "Remove dependency on Exificient due to licensing incompatibility" jenkins-controller-bulk-release-prepare-only-2-4
Giovanni Meo [Fri, 24 Jan 2014 15:50:47 +0000 (15:50 +0000)]
Merge "Remove dependency on Exificient due to licensing incompatibility"

10 years agoMerge "Pull zeromq initial configuration out of 01 config file"
Ed Warnicke [Fri, 24 Jan 2014 15:29:44 +0000 (15:29 +0000)]
Merge "Pull zeromq initial configuration out of 01 config file"

10 years agoMerge "Make MD-SAL use opendaylight parent"
Giovanni Meo [Fri, 24 Jan 2014 15:17:26 +0000 (15:17 +0000)]
Merge "Make MD-SAL use opendaylight parent"

10 years agoMerge "Yangtools version police: remove references to non-current versions"
Giovanni Meo [Fri, 24 Jan 2014 14:50:51 +0000 (14:50 +0000)]
Merge "Yangtools version police: remove references to non-current versions"

10 years agoMerge "Added test for MouontPoints and URI"
Ed Warnicke [Fri, 24 Jan 2014 14:18:24 +0000 (14:18 +0000)]
Merge "Added test for MouontPoints and URI"

10 years agoMerge "Reduce informations from logging.bridge"
Ed Warnicke [Fri, 24 Jan 2014 14:17:02 +0000 (14:17 +0000)]
Merge "Reduce informations from logging.bridge"

10 years agoRemove dependency on Exificient due to licensing incompatibility 01/4701/2
Robert Varga [Fri, 24 Jan 2014 10:57:06 +0000 (11:57 +0100)]
Remove dependency on Exificient due to licensing incompatibility

Exificient is licensed under GPLv2 with no intention to add the
classpath exception (witnessed in at
http://sourceforge.net/p/exificient/discussion/856595/thread/6017013e/).
Remove all dependencies on it, pending reimplementation using a more
open library (OpenEXI looks like a good candidate).

Change-Id: I589367be593ebc275c7551d9e6008b74d8461de5
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMake MD-SAL use opendaylight parent 78/4078/8
Robert Varga [Wed, 8 Jan 2014 14:52:51 +0000 (15:52 +0100)]
Make MD-SAL use opendaylight parent

Since MD-SAL code does not comply with coding style enforced by the
checkstyle plugin, disable its execution for now -- BUG-272 tracks the
need to re-enable it.

Change-Id: I55763136cec2ce0e892a3c7cc6543f913d76a2ad
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoYangtools version police: remove references to non-current versions 00/4700/1
Robert Varga [Fri, 24 Jan 2014 12:37:37 +0000 (13:37 +0100)]
Yangtools version police: remove references to non-current versions

Unifies the version property to yangtools.version, force restconf to use
the versions specified in the md-sal parent and bump its reference to
restconf-api to 0.6.0-SNAPSHOT.

Change-Id: I7b4820cf3995cd3dd3f108dd8b935ee38c62ea56
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoPull zeromq initial configuration out of 01 config file 98/4698/1
Maros Marsalek [Fri, 24 Jan 2014 12:08:36 +0000 (13:08 +0100)]
Pull zeromq initial configuration out of 01 config file

Change-Id: I52e5fefb08e3c97c4a6c235f0e158d72ccfa0766
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agomd-sal: sync commons-lang dependency 51/4551/2
Chris Wright [Wed, 22 Jan 2014 07:47:44 +0000 (23:47 -0800)]
md-sal: sync commons-lang dependency

topology-lldp-discovery is currently specifying 2.6 commons-lang
dependency whereas the controller is dependent on 2.4.  Bring md-sal in
sync w/ the controller by dropping back to 2.4.

Change-Id: Ifb340ceef25f866cf606c4733ade80e78aea0e31
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agoAdded test for MouontPoints and URI 72/4572/2
Ladislav Borak [Wed, 22 Jan 2014 12:05:42 +0000 (13:05 +0100)]
Added test for MouontPoints and URI

Change-Id: Ibb18ac011f0523e18595e4fff0900a492d3c5e25
Signed-off-by: Ladislav Borak <lborak@cisco.com>
10 years agoMerge "Remove powermock dependency from md-sal." jenkins-controller-bulk-release-prepare-only-2-3
Giovanni Meo [Fri, 24 Jan 2014 10:03:28 +0000 (10:03 +0000)]
Merge "Remove powermock dependency from md-sal."

10 years agoMerge "Provide single point for enforcing config naming convention"
Giovanni Meo [Fri, 24 Jan 2014 09:59:35 +0000 (09:59 +0000)]
Merge "Provide single point for enforcing config naming convention"

10 years agoRemove powermock dependency from md-sal. 86/4686/1
Tomas Olvecky [Fri, 24 Jan 2014 09:29:36 +0000 (10:29 +0100)]
Remove powermock dependency from md-sal.

Remove unused dependency.

Change-Id: Iaba9344297693a2052ae849f3377e130486a4298
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoReduce informations from logging.bridge 85/4685/1
Giovanni Meo [Fri, 24 Jan 2014 08:53:03 +0000 (09:53 +0100)]
Reduce informations from logging.bridge

Logging bridge maps 1-1 the log level from OSGi logging service to
slf4j. By design the OSGi framework set al INFO level all the modules
start and stop, which by pure chance, is also inline with our
guideline. Even though the compliance is satisfied there is a
usability issue because the console is flooded with many start stop
events given there are many bundles hence setting to WARN level the
log level for logging.bridge

Change-Id: I0dc484c49bd5966ad7dcdc01d55b9c28cfcf8217
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
10 years agoProvide single point for enforcing config naming convention 86/4286/7
Alessandro Boch [Tue, 21 Jan 2014 17:20:23 +0000 (09:20 -0800)]
Provide single point for enforcing config naming convention

- Provide generic ConfigurationObject class which other will extend
- Class provides method for validate string based on default private regex
- Regex enforces 1 to 256 alphanumeric chars with addition of -+/*.()[]@
- Default regex can be overwritten with one set in config.ini
- Have configs which need name validation to extend new class.
  Change is bacward compatible, existing config file are correctly
  deserialized

Change-Id: I17714fc6b0462fc2a85e9a6d8f44fd7f0bbda188
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoSmall fix to make dryrun happy. 78/4678/1
Ed Warnicke [Fri, 24 Jan 2014 07:55:09 +0000 (01:55 -0600)]
Small fix to make dryrun happy.

Change-Id: I28a55d464c1e9ce4201ab3e44683982a1f525601
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "Binary masks in match types yang model changed to numbers. Plugin code review... jenkins-controller-bulk-release-prepare-only-2-1 jenkins-controller-bulk-release-prepare-only-2-2
Ed Warnicke [Fri, 24 Jan 2014 04:05:20 +0000 (04:05 +0000)]
Merge "Binary masks in match types yang model changed to numbers. Plugin code review corresponding to this change: https://git.opendaylight.org/gerrit/#/c/4638/"

10 years agoBinary masks in match types yang model changed to numbers. 35/4635/3
Ed Warnicke [Thu, 23 Jan 2014 12:35:04 +0000 (18:05 +0530)]
Binary masks in match types yang model changed to numbers.
Plugin code review corresponding to this change: https://git.opendaylight.org/gerrit/#/c/4638/

Patch3: Fixed masks to use the same type as values (MacAddress for MacAddress and
IPv6FlowLabel for IPv6FlowLabel) rather than arbitrary uint* values.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: Icbc84312c0a2f26738ab9d84f6af34783c4aad5d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "Fix config transaction handling in netconf."
Ed Warnicke [Thu, 23 Jan 2014 23:42:28 +0000 (23:42 +0000)]
Merge "Fix config transaction handling in netconf."

10 years agoMerge "sal-remote yang"
Ed Warnicke [Thu, 23 Jan 2014 23:42:08 +0000 (23:42 +0000)]
Merge "sal-remote yang"

10 years agoMerge "Provide callback feature when modal is visible"
Andrew Kim [Thu, 23 Jan 2014 23:33:23 +0000 (23:33 +0000)]
Merge "Provide callback feature when modal is visible"

10 years agoProvide callback feature when modal is visible 66/4666/1
Sapan Shah [Thu, 23 Jan 2014 22:39:53 +0000 (14:39 -0800)]
Provide callback feature when modal is visible

Change-Id: I50cc978f1a32bca94d53db84d2c281ddf9099d52
Signed-off-by: Sapan Shah <sapshah@cisco.com>
10 years agoMerge "Add support to resolve docker container names for clustering support. Currentl...
Giovanni Meo [Thu, 23 Jan 2014 20:29:58 +0000 (20:29 +0000)]
Merge "Add support to resolve docker container names for clustering support. Currently on works when all containers are on a single docker host"

10 years agoAdd support to resolve docker container names for clustering support. Currently on... 13/4613/2
David K. Bainbridge [Thu, 23 Jan 2014 00:36:01 +0000 (16:36 -0800)]
Add support to resolve docker container names for clustering support. Currently on works when all containers are on a single docker host

Change-Id: Ie141e80712e15e037d39ae788a739cb4d51db403
Signed-off-by: David K. Bainbridge <dbainbri@ciena.com>
10 years agoFix for NullPointerException 62/4662/1
Pramila Singh [Thu, 23 Jan 2014 19:44:15 +0000 (11:44 -0800)]
Fix for NullPointerException

Change-Id: Id272d14bc1b248780ce533af00073c104a2503b0
Signed-off-by: Pramila Singh <pramisin@cisco.com>
10 years agoFix config transaction handling in netconf. 58/4658/1
Tomas Olvecky [Thu, 23 Jan 2014 17:20:29 +0000 (18:20 +0100)]
Fix config transaction handling in netconf.

When config manager fails a transaction because of optimistic lock failure, netconf
must clean up this transaction as well. Fix TransactionProvider to abort transaction
if commit fails. Only exception is ValidationException where user should
have an option to fix the configuration and commit again.

Turn off netconf client reuse in persister: this narrows the possibility of
hitting concurrent modification with other config transactions. Each retry
to push a snapshot is now done with a newly obtained client, so new transaction
will be started each time.

Change-Id: I4d49fea10a682e4d7cd85ab49f2b78be63a84c02
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agosal-remote yang 28/4228/8
Martin Bobak [Tue, 14 Jan 2014 15:28:24 +0000 (16:28 +0100)]
sal-remote yang

Change-Id: I7aaa6b341ce3199b3f90ed59b5d64f470f80d7b8
Signed-off-by: Martin Bobak <mbobak@cisco.com>
10 years agoInclude the incomming port in PacketOut message. 62/4562/3
Elek Jani [Wed, 22 Jan 2014 10:29:04 +0000 (11:29 +0100)]
Include the incomming port in PacketOut message.
Without this flood messages do not omit the incomming port on the switch.

Change-Id: I932d00c1f17b95678cb73136aefa05fcc5718a95
Signed-off-by: Elek Jani <elekjani@gmail.com>
10 years agoFixed incorrect null check. 29/4629/1
Tony Tkacik [Thu, 23 Jan 2014 09:37:30 +0000 (10:37 +0100)]
Fixed incorrect null check.

Change-Id: I8acb8b1826365bcadccb1b685088a88b46a42c33
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge "Change target to ${project.build.target} in a bunch of pom file. Add some...
Giovanni Meo [Thu, 23 Jan 2014 09:05:39 +0000 (09:05 +0000)]
Merge "Change target to ${project.build.target} in a bunch of pom file. Add some xtend-gen source dir to the build path. The commit purpose is to eliminate errors in eclipse."

10 years agoMerge "Make configuration push timeout configurable"
Ed Warnicke [Thu, 23 Jan 2014 03:40:29 +0000 (03:40 +0000)]
Merge "Make configuration push timeout configurable"

10 years agoMerge "Gerrit contains following changes : 1) Fix for bug 284. Added functionality...
Ed Warnicke [Thu, 23 Jan 2014 03:26:04 +0000 (03:26 +0000)]
Merge "Gerrit contains following changes : 1) Fix for bug 284. Added functionality that listen to data store *remove* changes and cleanup the relevant statistics from operational data store. 2) Added functionality that listen to config data store *create* changes for Flow,Group, Meter & Queue and send statistics request to switch to get respective stats. 3) Added functionality to periodically remove stale stats from operational data store. Clean up thread invokes after every two cycle of stats collection. 4) Removed unnecessary local caching."

10 years agoMerge "md-sal: commons-codec artifact version sync"
Ed Warnicke [Thu, 23 Jan 2014 03:20:22 +0000 (03:20 +0000)]
Merge "md-sal: commons-codec artifact version sync"

10 years agoGerrit contains following changes : 83/4583/2
Anil Vishnoi [Tue, 21 Jan 2014 10:34:25 +0000 (16:04 +0530)]
Gerrit contains following changes :
1) Fix for bug 284. Added functionality that listen to data store *remove* changes and
cleanup the relevant statistics from operational data store.
2) Added functionality that listen to config data store *create* changes for Flow,Group,
Meter & Queue and send statistics request to switch to get respective stats.
3) Added functionality to periodically remove stale stats from operational data store.
Clean up thread invokes after every two cycle of stats collection.
4) Removed unnecessary local caching.

Change-Id: Ibee3c73905ce872302c4f54ce5b7b53c0657ee51
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoMake AbstractSessionNegotiator react to exceptions 23/4523/3
Robert Varga [Tue, 21 Jan 2014 20:14:58 +0000 (21:14 +0100)]
Make AbstractSessionNegotiator react to exceptions

While the SessionNegotiator is present on the pipeline it should react
to exceptions happening on the channel by failing negotiation.

Change-Id: I6571dc25f17c7afe8fa4e4eb58f70ad0bb3397a4
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoIntroduced advanced strategy for parsing of YANG schemas 85/4585/4
Tony Tkacik [Wed, 22 Jan 2014 14:54:00 +0000 (15:54 +0100)]
Introduced advanced strategy for parsing of YANG schemas

  - This strategy increases convergence time, because it does not
    parse files with unsatisfied dependencies.

  - New strategy for schema parsing in runtime uses two separate parser
     Minimalistic - is used when YANG source is discovered and scans only
     for module name, revision and dependency information
     Full - parses set of YANG sources and creates model representation.

     When bundle is added / removed - tracker gets yang sources,
     registers it to SchemaResolver, which immediatelly uses
     Minimalistic parser to obtain base information.

     Then context of all known sources and their dependencies is sorted
     and filtered only to use sources which has their dependencies resolved.

     Full parser is then invoked only for models, which have dependencies
     resolved.

Change-Id: Ic62fbd86929866a21f4dbd3c62e73a02d423d7bf
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge "Fixed bug when global RPCs we're not forwarded"
Ed Warnicke [Thu, 23 Jan 2014 00:53:57 +0000 (00:53 +0000)]
Merge "Fixed bug when global RPCs we're not forwarded"

10 years agoMerge "Added DEBUG log statements for transaction translation."
Ed Warnicke [Thu, 23 Jan 2014 00:53:21 +0000 (00:53 +0000)]
Merge "Added DEBUG log statements for transaction translation."

10 years agoMerge "Fixed inappropriate uses of log level INFO"
Alessandro Boch [Wed, 22 Jan 2014 23:40:53 +0000 (23:40 +0000)]
Merge "Fixed inappropriate uses of log level INFO"

10 years agoMerge "fix typos and some Java improvements in ClusterManager"
Giovanni Meo [Wed, 22 Jan 2014 22:17:00 +0000 (22:17 +0000)]
Merge "fix typos and some Java improvements in ClusterManager"

10 years agoFixed inappropriate uses of log level INFO 20/4420/5
Ed Warnicke [Sun, 19 Jan 2014 23:33:16 +0000 (17:33 -0600)]
Fixed inappropriate uses of log level INFO

This is done per the recommendation here:

https://wiki.opendaylight.org/view/Draft_Syslog_Level_Settings

Change-Id: I69bbe15d81ed49511f643fd4a8c0ad60f58a0c22
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoChange target to ${project.build.target} in a bunch of pom file. 57/4557/2
Elek Jani [Wed, 22 Jan 2014 09:55:30 +0000 (10:55 +0100)]
Change target to ${project.build.target} in a bunch of pom file.
Add some xtend-gen source dir to the build path.
The commit purpose is to eliminate errors in eclipse.

Change-Id: I90727a0096154d7633f4b6cc309dcc09c9a51678
Signed-off-by: Elek Jani <elekjani@gmail.com>
10 years agoFixed bug when global RPCs we're not forwarded 80/4580/3
Tony Tkacik [Wed, 22 Jan 2014 13:41:40 +0000 (14:41 +0100)]
Fixed bug when global RPCs we're not forwarded

Change-Id: I2220530609cdbc02549637f92dd550ff657816d6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoAdded DEBUG log statements for transaction translation. 79/4579/3
Tony Tkacik [Wed, 22 Jan 2014 12:56:33 +0000 (13:56 +0100)]
Added DEBUG log statements for transaction translation.

Change-Id: Ia94d8a400e43bb8d0d342e9b6e68b7bf86fd6804
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge "Optimization - calculate the subnet prefix only once."
Giovanni Meo [Wed, 22 Jan 2014 21:31:53 +0000 (21:31 +0000)]
Merge "Optimization - calculate the subnet prefix only once."

10 years agoMerge "Bump yangtools artifacts to reflect their uptodate versions"
Giovanni Meo [Wed, 22 Jan 2014 21:24:11 +0000 (21:24 +0000)]
Merge "Bump yangtools artifacts to reflect their uptodate versions"

10 years agoMerge "Fix ClassCastException in logging bridge stop"
Giovanni Meo [Wed, 22 Jan 2014 21:16:16 +0000 (21:16 +0000)]
Merge "Fix ClassCastException in logging bridge stop"

10 years agofix typos and some Java improvements in ClusterManager 11/3911/2
Alissa Bonas [Tue, 24 Dec 2013 11:44:24 +0000 (13:44 +0200)]
fix typos and some Java improvements in ClusterManager

Fix typos in error messages, use StringBuilder instead
of StringBuffer, append strings more efficiently,
and move a local variable to be a constant.

Change-Id: I23a4436449909cf02a6fce47e0f1f9a0ce80f0e4
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoOptimization - calculate the subnet prefix only once. 24/3924/2
Alissa Bonas [Wed, 25 Dec 2013 17:23:33 +0000 (19:23 +0200)]
Optimization - calculate the subnet prefix only once.

Before this change, subnet prefix was calculated on every
'isSubnetOf' call. Since the prefix is not changing unless
the subnet address itself changed, it's sufficient to do it only once
and keep it as part of the Subnet object.

Marked it as transient so it will not be serialized - it can be
calculated from the rest of the info of Subnet anytime after
deserialization.

Change-Id: Ie16bf80713820b566864bea0ff46298c93cc2d47
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoMerge "Avoiding hash collisions of a match with its reverse"
Alessandro Boch [Wed, 22 Jan 2014 20:41:05 +0000 (20:41 +0000)]
Merge "Avoiding hash collisions of a match with its reverse"

10 years agoMinor bugfix in Topology Manager 36/4536/2
Yevgeny Khodorkovsky [Tue, 21 Jan 2014 23:13:08 +0000 (15:13 -0800)]
Minor bugfix in Topology Manager

- This fixes an incorrect assumption that subsequent edge-ADDED updates
  will always have equal edge properties

Change-Id: Ib124a4c260d7fce6bb8464f267c2e88cf0b35384
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>
10 years agoFix ClassCastException in logging bridge stop 05/4605/1
Prasanth Pallamreddy [Wed, 22 Jan 2014 18:45:40 +0000 (10:45 -0800)]
Fix ClassCastException in logging bridge stop

  - Additional fix to handle NPE during logging bridge start

Change-Id: Id6d4b727dd08db18a91b509cad99450fd41a5171
Signed-off-by: Prasanth Pallamreddy <ppallamr@cisco.com>
10 years agoMake configuration push timeout configurable 98/4598/1
Robert Varga [Wed, 22 Jan 2014 16:24:16 +0000 (17:24 +0100)]
Make configuration push timeout configurable

This patch adds the option to specify a the pusher timeout, such that it
can be made either shorter or longer than the default 2 minutes.

Another improvement is the use of System.nanoTime(), making the deadline
work in face of calender time changing.

Change-Id: Ia8b596c7cd285695696fa5074f7d1f23c2b8b560
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agounitests: Remove extending TestCase from unitest classes. 19/3919/4
Alissa Bonas [Wed, 25 Dec 2013 13:06:36 +0000 (15:06 +0200)]
unitests: Remove extending TestCase from unitest classes.

Extending TestCase which is a Junit3 format, and using Junit4
annotations at the same time in same class causes confusion,
and can also lead to runtime problems.
An example for a problem - putting @Ignore on a test case which starts
with word "test" and is located in a class that extends TestCase will
actually NOT ignore the test because it will be interpreted as Junit3
and not as Junit4.
Removing extending TestCase will make the unitests to be interpreted
as Junit4 style and leave no room for confusion.

Change-Id: I2365f0921d64667a5489c42eeb53adadc45efdaa
Signed-off-by: Alissa Bonas <abonas@redhat.com>
10 years agoMerge "Move NetconfUtil to netconf-util."
Ed Warnicke [Wed, 22 Jan 2014 13:29:09 +0000 (13:29 +0000)]
Merge "Move NetconfUtil to netconf-util."

10 years agoMerge "Default DataBroker does not read subtrees from Mountpoint"
Ed Warnicke [Wed, 22 Jan 2014 13:28:42 +0000 (13:28 +0000)]
Merge "Default DataBroker does not read subtrees from Mountpoint"

10 years agoBump yangtools artifacts to reflect their uptodate versions 67/4567/2
Robert Varga [Wed, 22 Jan 2014 11:05:01 +0000 (12:05 +0100)]
Bump yangtools artifacts to reflect their uptodate versions

Change-Id: I9f90d50b1cb3955f04b54353dc771a19048ca209
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Log transactions being allocated"
Giovanni Meo [Wed, 22 Jan 2014 12:41:36 +0000 (12:41 +0000)]
Merge "Log transactions being allocated"

10 years agoMove NetconfUtil to netconf-util. 12/4512/2
Tomas Olvecky [Tue, 21 Jan 2014 16:24:29 +0000 (17:24 +0100)]
Move NetconfUtil to netconf-util.

Implement simple acceptance netconf client test that can connect to a remote machine. Clean up
helper functions from netconf-impl and persister-impl to netconf-util.

Change-Id: I1dd221822c6e6fff69388f65c4df3bb39fa21d60
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoDefault DataBroker does not read subtrees from Mountpoint 61/4561/1
Tony Tkacik [Wed, 22 Jan 2014 10:22:53 +0000 (11:22 +0100)]
Default DataBroker does not read subtrees from Mountpoint

Changed default behaviour of DataBroker, which involved
also read from remote Netconf nodes to return only
data from local store. To access Netconf device
as a datastore one must get MountInstance for it -
MD-SAL instance exclusive for that device.

Change-Id: I5e900b3964475e95a5436746c1d47c3b68b712db
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoLog transactions being allocated 55/4555/1
Robert Varga [Wed, 22 Jan 2014 09:21:22 +0000 (10:21 +0100)]
Log transactions being allocated

We do get logs when the transaction processing starts, unfortunately we
do not get the context in which the transaction was created. This fixes
the deficiency by logging when the transaction is first allocated. Also
adds explicit logs about transaction state transitions.

Change-Id: I46b3a6326ec853e3d1fc32e9820f00d950fd9100
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agomd-sal: commons-codec artifact version sync 50/4550/1
Chris Wright [Wed, 22 Jan 2014 06:42:40 +0000 (22:42 -0800)]
md-sal: commons-codec artifact version sync

md-sal is using both 1.7 and 1.8 versions of commons-codec.  The rest of
the controller is using 1.7, so bring md-sal in line with that.

Change-Id: I2a0e38874f857c30f34bf4f0e65becc35bc46f28
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agoAvoiding hash collisions of a match with its reverse 03/4603/1
Asad Ahmed [Wed, 22 Jan 2014 07:00:19 +0000 (23:00 -0800)]
Avoiding hash collisions of a match with its reverse

Change-Id: I6b6942e90b85028af9ec98cb27cf17cd0377c033
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
10 years agoChanged port number for test server in ClientRequestHandlerTest 39/4539/3
Abhishek Kumar [Wed, 22 Jan 2014 03:45:24 +0000 (19:45 -0800)]
Changed port number for test server in ClientRequestHandlerTest
When tests are run in parallel, the port number in ServerRequestHandlerTests and ClientRequestHandlerTests
could have conflicted. Changed the port number to avoid conflict.

Change-Id: I63fae99458fc9109fdbfc5f063ca4289b10aa30c
Signed-off-by: Abhishek Kumar <abhishk2@cisco.com>
10 years agoMerge "More defensive RPC handling in DOM Broker"
Ed Warnicke [Wed, 22 Jan 2014 05:54:32 +0000 (05:54 +0000)]
Merge "More defensive RPC handling in DOM Broker"

10 years agoMerge "sal-remoterpc-connector: sync ch.qos.logback:logback-classic version"
Ed Warnicke [Wed, 22 Jan 2014 05:21:23 +0000 (05:21 +0000)]
Merge "sal-remoterpc-connector: sync ch.qos.logback:logback-classic version"

10 years agoMore defensive RPC handling in DOM Broker 21/4521/2
Tony Tkacik [Mon, 20 Jan 2014 17:47:06 +0000 (18:47 +0100)]
More defensive RPC handling in DOM Broker

  - RPCs registered to DOM broker now must comform to the schema
    - at the time of registration of RPC implementation,
      the YANG schema must be present for that RPC.
      This does not affect RPC registrations for Binding Aware Broker.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Change-Id: I9961efaf547818e08dec571ad9e2378d8e1f48cd

10 years agoMerge "Commented out Sys.outs in runtime generated code."
Ed Warnicke [Wed, 22 Jan 2014 04:51:21 +0000 (04:51 +0000)]
Merge "Commented out Sys.outs in runtime generated code."

10 years agoMerge "Update to new version of the artifacts proposed by jenkins-controller-version...
Ed Warnicke [Wed, 22 Jan 2014 04:50:00 +0000 (04:50 +0000)]
Merge "Update to new version of the artifacts proposed by jenkins-controller-version-changes-11"

10 years agoMerge "Fix bug in hello message: module with more revisions."
Ed Warnicke [Wed, 22 Jan 2014 04:48:44 +0000 (04:48 +0000)]
Merge "Fix bug in hello message: module with more revisions."

10 years agoMerge "fix of Bug 314"
Ed Warnicke [Wed, 22 Jan 2014 04:46:53 +0000 (04:46 +0000)]
Merge "fix of Bug 314"

10 years agoMerge "Fix: removed tabs from yang files."
Ed Warnicke [Wed, 22 Jan 2014 04:46:37 +0000 (04:46 +0000)]
Merge "Fix: removed tabs from yang files."

10 years agoMerge "Tests for loading data with augmented schema nodes with equal names"
Ed Warnicke [Wed, 22 Jan 2014 04:12:29 +0000 (04:12 +0000)]
Merge "Tests for loading data with augmented schema nodes with equal names"

10 years agoMerge "Clean up unnecessary imports in 01-md-sal.xml ."
Ed Warnicke [Wed, 22 Jan 2014 04:09:20 +0000 (04:09 +0000)]
Merge "Clean up unnecessary imports in 01-md-sal.xml ."

10 years agoMerge "The config now is loaded only from the coordinator. The previous way of loadin...
Alessandro Boch [Wed, 22 Jan 2014 03:51:48 +0000 (03:51 +0000)]
Merge "The config now is loaded only from the coordinator. The previous way of loading the config only if empty had some side-effects."

10 years agoMerge "Migrate all artifact versions to dependencyManagement"
Alessandro Boch [Wed, 22 Jan 2014 03:51:28 +0000 (03:51 +0000)]
Merge "Migrate all artifact versions to dependencyManagement"

10 years agosal-remoterpc-connector: sync ch.qos.logback:logback-classic version 38/4538/1
Chris Wright [Wed, 22 Jan 2014 03:34:38 +0000 (19:34 -0800)]
sal-remoterpc-connector: sync ch.qos.logback:logback-classic version

The following commit:

  8079442 Enhancements to remote rpc server. Using zmq router-dealer bridge

introduced a new version dependency on ch.qos.logback:logback-classic.
Let's make this dependency consisten with the rest of the project by
moving from 1.0.12 back to 1.0.9.

Change-Id: I3bd7e3ce7d5c4af36fad8ddf7ee883117d9c4386
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agoMerge "InputStream for RSA file should not be static"
Ed Warnicke [Wed, 22 Jan 2014 02:46:01 +0000 (02:46 +0000)]
Merge "InputStream for RSA file should not be static"

10 years agoMerge "Changed codec for Identityref in JSON transformation"
Ed Warnicke [Wed, 22 Jan 2014 02:45:31 +0000 (02:45 +0000)]
Merge "Changed codec for Identityref in JSON transformation"

10 years agoMerge "OSGI version change to 5.0.0 in ganymed subproject"
Ed Warnicke [Wed, 22 Jan 2014 02:15:41 +0000 (02:15 +0000)]
Merge "OSGI version change to 5.0.0 in ganymed subproject"

10 years agoMerge "Enhancements to remote rpc server. Using zmq router-dealer bridge to make...
Ed Warnicke [Wed, 22 Jan 2014 02:14:43 +0000 (02:14 +0000)]
Merge "Enhancements to remote rpc server. Using zmq router-dealer bridge to make the server async. Enhancements to remote rpc client. Using zmq router-dealer bridge to make the client async. Added configuration for remote rpc in Configuration subsystem On Server startup reading of routingtable to populate remoterpcs was giving exception - fixed the same Client was not registered with Server and addRPCImplementation was failing - fixed the same ServerImpl was not getting registered as listener to RoutingTable hence announcement was not received on remote - fixed the same Patch 6: Some unit tests were intemittently hanging. ZMQ Test server was not gracefully shutting down."

10 years agoThe config now is loaded only from the coordinator. The previous way of loading 26/4526/3
Asad Ahmed [Tue, 21 Jan 2014 20:38:51 +0000 (12:38 -0800)]
The config now is loaded only from the coordinator. The previous way of loading
the config only if empty had some side-effects.

Change-Id: I4f1819c60b491a36e1c14a78ec376e2dfcee8583
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
10 years agoMerge "Bug fix for bug 328 https://bugs.opendaylight.org/show_bug.cgi?id=328#add_comment"
Alessandro Boch [Tue, 21 Jan 2014 22:36:34 +0000 (22:36 +0000)]
Merge "Bug fix for bug 328 https://bugs.opendaylight.org/show_bug.cgi?id=328#add_comment"

10 years agoBug fix for bug 328 93/4493/3
Dave Tucker [Tue, 21 Jan 2014 11:50:39 +0000 (11:50 +0000)]
Bug fix for bug 328
https://bugs.opendaylight.org/show_bug.cgi?id=328#add_comment

Casts node_id to long before instantiatiing an Node

Change-Id: I846bfe11cef49adeea65d9d2cce6a0d7444b93f5
Signed-off-by: Dave Tucker <dave.j.tucker@hp.com>
10 years agoMigrate all artifact versions to dependencyManagement 22/4522/1
Giovanni Meo [Tue, 21 Jan 2014 17:57:28 +0000 (18:57 +0100)]
Migrate all artifact versions to dependencyManagement

- Migrate all the artifacts to use dependencyManagement to centralize
the version changes in controller and make sure the dry-run for
release could actually rewrite those.

Change-Id: I510e4f15d6d75ec52d49835600338fa069a5a4f6
Signed-off-by: Giovanni Meo <gmeo@cisco.com>