controller.git
10 years agoBUG 871: Restrict MD-SAL data operations to a single thread 44/6444/2
Surekha Bejgam [Fri, 31 Jan 2014 15:31:05 +0000 (16:31 +0100)]
BUG 871: Restrict MD-SAL data operations to a single thread

MD-SAL does not give us transaction ordering guarantees, which mean that
data may hit the data store than what the application intended. Change
the model to single-threaded until proper transaction ordering APIs are
defined.

Change-Id: I6c6375480082b94c614ab2602a2857e0f4779ee8
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
10 years agoBUG: 856 - Yang Changes to include list<actions> to PacketOut 57/6557/1
Surekha Bejgam [Fri, 31 Jan 2014 16:11:36 +0000 (21:41 +0530)]
BUG: 856 - Yang Changes to include list<actions> to PacketOut
- Added list<actions> and buffer_id to PacketOut Message to handle group processing and Packet Modification through different actions

Change-Id: I5875f9792f6a036bf2b4060ba377f1565e66d2fd
Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
10 years agoMerge "Bug 483: Fixed removals for child nodes" into stable/hydrogen
Jason Ye [Mon, 28 Apr 2014 17:09:23 +0000 (17:09 +0000)]
Merge "Bug 483: Fixed removals for child nodes" into stable/hydrogen

10 years agoMerge "Bug 483: Make sure transaction applies whole removal list" into stable/hydrogen
Jason Ye [Mon, 28 Apr 2014 17:07:45 +0000 (17:07 +0000)]
Merge "Bug 483: Make sure transaction applies whole removal list" into stable/hydrogen

10 years agoBug 483: Fixed removals for child nodes 24/6524/1
Tony Tkacik [Wed, 12 Feb 2014 00:19:23 +0000 (01:19 +0100)]
Bug 483: Fixed removals for child nodes

Fixed removals from data store did not clean direct-match indexes to child
nodes.

  - Added deepRemoveStrategy, which checks for all quick indexes
    if they are removed correctly.

Change-Id: Icb7a231ca0308774f76b43ac40ab4eaf47e68937
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit db0081760bd611555397fe110da793dcdc7c98e9)

10 years agoBug 483: Make sure transaction applies whole removal list 23/6523/1
Tony Tkacik [Mon, 3 Feb 2014 18:33:52 +0000 (19:33 +0100)]
Bug 483: Make sure transaction applies whole removal list

Change-Id: I53d1cf10bce6e444f80b13d9ce57e5f1ef2eb5c9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit 5659f588f80522a5be5c80d0e5ff34068b5f4786)

10 years agoBug 309: Fixed bug when new childs were ommited during data store merge. 22/6522/1
Tony Tkacik [Mon, 3 Feb 2014 18:20:36 +0000 (19:20 +0100)]
Bug 309: Fixed bug when new childs were ommited during data store merge.

Change-Id: I0680d1354614d7597b0079445951d4a6f33d8d5c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit 28d57b868fb2f43c8a1631818d78ff3ed6908308)

10 years agoFix for bug 830. 25/6325/2
Hideyuki Tai [Thu, 30 Jan 2014 10:17:25 +0000 (02:17 -0800)]
Fix for bug 830.

Fixed bugs in getUnsigned methods of NetUtils class.

 * Fixed bugs that getUnsignedByte(byte) and getUnsignedShort(short)
   handled 0 incorrectly.
 * Added tests for getUnsignedByte(byte) and getUnsignedShort(short).

Change-Id: Ie67fb5c07bed31d16d4a52068dda7735fb7cd5e2
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
(cherry picked from commit 37d7a25950e5132d7dabfe4a66d81becbc6ef4dd)

10 years agoBUG 388: corrected media type in /operations resource 09/6409/1
Moiz Raja [Thu, 30 Jan 2014 15:50:05 +0000 (16:50 +0100)]
BUG 388: corrected media type in /operations resource

There were added these media types for /operations resource:
application/yang.operation+json
application/yang.operation+xml
Corrected handling of requests which have empty body and Content-Type has some value or is missing

Change-Id: I8a42a6c51219a0a1828f2d7f70d6eaee8bcae62c
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-692 Change unprotected netconf address from 0.0.0.0 to 127.0.0.1 . 08/6408/1
Moiz Raja [Fri, 31 Jan 2014 14:13:40 +0000 (15:13 +0100)]
BUG-692 Change unprotected netconf address from 0.0.0.0 to 127.0.0.1 .

Plaintext netconf server was bound to any local interface. This is a security risk
because there is no authentication. The ssh server should be used as public endpoint instead.

Change-Id: I6f710cd25ed85ff022abde2bfb79c11bf5bda611
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-801 Fix end of TLV in LLDP packet 06/6406/1
Moiz Raja [Thu, 30 Jan 2014 20:46:22 +0000 (12:46 -0800)]
BUG-801 Fix end of TLV in LLDP packet

Change-Id: Id2964757439748a931c334190ca94d21b254ef6e
Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-798 Handling the case where vlan priority is set to 0. 05/6405/1
Moiz Raja [Wed, 29 Jan 2014 22:36:16 +0000 (14:36 -0800)]
BUG-798 Handling the case where vlan priority is set to 0.

Change-Id: I3970134fc4351118795c153a310e238ab1e40cdf
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-813 Double the SSL input packet buffer size 04/6404/1
Moiz Raja [Thu, 30 Jan 2014 06:14:39 +0000 (22:14 -0800)]
BUG-813 Double the SSL input packet buffer size

Change-Id: I078890b5f383388372e099ad3b08ef2c2ca37e8c
Signed-off-by: Jason Ye <yisye@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-335 Fix For Bug #335 03/6403/1
Moiz Raja [Tue, 28 Jan 2014 10:54:31 +0000 (16:24 +0530)]
BUG-335 Fix For Bug #335
Bug Description : Remove SW2 property "description" to a node - not working for both OF13 and OF10 mininet.

Change-Id: I8d5145e4137696b3592e06a21c55e04b3c8b7122
Signed-off-by: goyal <sheena.goyal@tcs.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBug-380 SwitchManager.getHardwareMAC() does not handle empty string case 02/6402/1
Moiz Raja [Mon, 27 Jan 2014 20:42:58 +0000 (12:42 -0800)]
Bug-380 SwitchManager.getHardwareMAC() does not handle empty string case

Change-Id: Id82fd6e0bd214dcb00773a907daf94067671979b
Signed-off-by: Alessandro Boch <aboch@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-785 Backward compatibility change for Configuration Service 01/6401/1
Moiz Raja [Mon, 27 Jan 2014 18:17:48 +0000 (10:17 -0800)]
BUG-785 Backward compatibility change for Configuration Service

- Now that config save is no longer bound to infinispan cache type
  contraint of ConcurrentMap, need to assure old configuration still
  serialized as concurrent maps can be still be read.

Change-Id: Ia22f829174a330938eddaa4356471f522a837aca
Signed-off-by: Alessandro Boch <aboch@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-799 Topology misses host(s) if multiple hosts are found on the same port 00/6400/1
Moiz Raja [Mon, 27 Jan 2014 19:35:54 +0000 (11:35 -0800)]
BUG-799 Topology misses host(s) if  multiple hosts are found on the same port

Change-Id: Ie22e174ab3a25e46ecc912d5c7cb280481d618bd
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-697: Bump versions for next stable release 75/5975/4
Robert Varga [Tue, 8 Apr 2014 17:00:49 +0000 (19:00 +0200)]
BUG-697: Bump versions for next stable release

Version two fixes TAG mismatch.

Change-Id: Icfafee8d128c8842dcd172ec9e34debfb6e610fa
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoBUG-844 updated test coverage for AutodetectDirectoryPersister 80/6180/4
Moiz Raja [Thu, 30 Jan 2014 09:19:00 +0000 (10:19 +0100)]
BUG-844 updated test coverage for AutodetectDirectoryPersister
test coverage raised on config-persister-file-xml-adapter

Change-Id: I027fd57baeb233271c88499c29e4708a735bb10d
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBug 737 - Refactor config-persister: clean up exception handling and netconf client. 79/6179/5
Tomas Olvecky [Fri, 31 Jan 2014 13:51:08 +0000 (14:51 +0100)]
Bug 737 - Refactor config-persister: clean up exception handling and netconf client.

Split ConfigPersisterNotificationHandler into registrator and listener, remove unnecessary
reference to NetconfClient.
Refactor ConfigPusher: each method now returns computational results instead of void. Avoid
unnecessary NetconfClient reference leak - close it after every use. Rename generic 'timeout'
to 'maxWaitForCapabilitiesMillis'. Avoid throwing and catching SAXException and IOException
as there is no recovery from them; keep only ConflictingVersionException.
ConfigPersisterActivator now actually uses the configurable timeout, the property is renamed
from 'pushTimeout' to 'maxWaitForCapabilitiesMillis'.

Change-Id: Idc9995b11dd2f19a90598c88eb7337d39d63fc27
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoBUG-739: Removed unused code from md-sal. 77/6177/4
Martin Vitez [Thu, 30 Jan 2014 14:15:45 +0000 (15:15 +0100)]
BUG-739: Removed unused code from md-sal.

Change-Id: Ia64a118ec7c75d0abf5800f7eee98ae708b8e50a
Signed-off-by: Martin Vitez <mvitez@cisco.com>
10 years agoBug 736 - Add configurable connection timeout to netconf client. 76/6176/4
Tomas Olvecky [Thu, 23 Jan 2014 16:03:17 +0000 (17:03 +0100)]
Bug 736 - Add configurable connection timeout to netconf client.

Make connection timeout configurable. Previous behavior was having hardcoded connection timeout set to 1 minute.
Make NetconfConnectorModule more configurable, allow (and this is new default) to retry on connection failures forever.

Change-Id: Ia9280cff1b751a4e7318e1e0331175c960823dad
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years agoBUG 312: Removed legacy RESTCONF draft 01 syntax 75/6175/3
Martin Sunal [Thu, 30 Jan 2014 14:26:54 +0000 (15:26 +0100)]
BUG 312: Removed legacy RESTCONF draft 01 syntax

Change-Id: I1dab84ae70ef39964ead1b14efd58ae2e3eee087
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoBUG-845 Adding FlowRef,GroupRef and MeterRef for the ErrorNotification Message 74/6174/4
Moiz Raja [Thu, 30 Jan 2014 14:11:35 +0000 (19:41 +0530)]
BUG-845 Adding FlowRef,GroupRef and MeterRef for the ErrorNotification Message

Signed-off-by: Govind <p.govinda.rajulu@ericsson.com>
Change-Id: I8b851733a4947a6757e14faa6098dafd7b8e7ebb
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-843 : Added description to meter types yang model. 73/6173/5
Moiz Raja [Thu, 30 Jan 2014 12:25:46 +0000 (17:55 +0530)]
BUG-843 : Added description to meter types yang model.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: Iedb115fa2178178d79292705f787502df56ab844
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG 340: Resolved instance-identifier translation in JSON 72/6172/4
Martin Sunal [Mon, 27 Jan 2014 15:15:30 +0000 (16:15 +0100)]
BUG 340: Resolved instance-identifier translation in JSON

Change-Id: Ia8853c00798674251b39941a675e9c359aa68a00
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoBUG 392: Resolved translation to JSON behind mount point 71/6171/4
Martin Sunal [Mon, 27 Jan 2014 14:49:44 +0000 (15:49 +0100)]
BUG 392: Resolved translation to JSON behind mount point

Change-Id: Icee18d06679dcfa935b4c832b0b6673936d60a10
Signed-off-by: Martin Sunal <msunal@cisco.com>
10 years agoBUG-841 Added utility SynchronizedTransaction wrapper implementation. 70/6170/5
Moiz Raja [Wed, 29 Jan 2014 13:00:22 +0000 (13:00 +0000)]
BUG-841 Added utility SynchronizedTransaction wrapper implementation.

Change-Id: Ic35661a59fde08f0ec0b72121cd2e3dedf1de480
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBug 757: Minor bug fix in stale flow statistics data cleanup 69/6169/5
Anil Vishnoi [Mon, 27 Jan 2014 14:40:10 +0000 (20:10 +0530)]
Bug 757: Minor bug fix in stale flow statistics data cleanup

Change-Id: I72ba43b33a2580bd07c3eef2d4c85a3a8c265a51
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoBug 387 : Fixed Binding Independent Connector to properly serialize output. 68/6168/4
Tony Tkacik [Wed, 29 Jan 2014 12:06:56 +0000 (12:06 +0000)]
Bug 387 : Fixed Binding Independent Connector to properly serialize output.

Change-Id: Ibabb08983ca31182e087edbdf6821bd1a0216516
Signed-off-by: Robert Gallas <rgallas@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoBug 377 for Notifications resolving. 67/6167/4
Tony Tkacik [Wed, 29 Jan 2014 12:06:25 +0000 (12:06 +0000)]
Bug 377 for Notifications resolving.

Fixed issue when Notification didn't pass from Netconf client to registered and configured ODL plugin application. After Fix, when notification is send to ODL,
notification is forwarded through md-sal directly into application that is registered for listening on mount point where notification arrive.

Change-Id: If47b1084a55a34c469ae7e345ac25fbb6fe44f0f
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoBUG-842 Removed javadoc declaration from md-sal to enable parent javadocs settings. 63/6163/7
Moiz Raja [Wed, 29 Jan 2014 09:51:04 +0000 (10:51 +0100)]
BUG-842 Removed javadoc declaration from md-sal to enable parent javadocs settings.

Change-Id: Ic0207a98d8755cb1ea12d570e37d55e76c94f4b6
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-771 - Add javadoc generation for yang modules in netconf subsystem 62/6162/7
Moiz Raja [Mon, 14 Apr 2014 16:04:08 +0000 (11:04 -0500)]
BUG-771 - Add javadoc generation for yang modules in netconf subsystem

Added org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl generator
to yang-maven-plugin configuration in order to generate informational html page about yang modules.

Affected yang modules: ietf-netconf-monitoring, ietf-netconf-monitoring-extension.

Change-Id: I83d3089256a21515cc4fb3320a81956af590e1ce
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG-362: add some diagnostic information 61/6161/4
Moiz Raja [Fri, 24 Jan 2014 17:44:46 +0000 (18:44 +0100)]
BUG-362: add some diagnostic information

Changed Remote RPC Server Implementation to log an error when
host IP address is not found and stop itself. Earlier it would
raise exception that the configuration subsystem could not
handle.

Change-Id: I5ea843f8c1d86b5cd923081ff9ba82e94c29c4d2
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Abhishek Kumar <abhishk2@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoFix for BUG 410 18/6318/1
Ryan Moats [Mon, 10 Feb 2014 18:02:16 +0000 (12:02 -0600)]
Fix for BUG 410

Ensure lower case alpha hex representation is included in MAC
regex match in all cases.

Change-Id: Ic2da17146cf8f9325cc5d951f70d614ec61762a0
(cherry picked from commit ef41cf35255cddfdd8d732471c13a7462ecd2018)

Change-Id: I404130f2240fc061c87ad4d21bc051abedff2bd0
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
10 years agoFix for BUG 402: Subnet creation with NeutronAPIService sometimes fails 17/6317/1
Ryan Moats [Wed, 5 Feb 2014 17:07:35 +0000 (11:07 -0600)]
Fix for BUG 402: Subnet creation with NeutronAPIService sometimes fails
with a 409 error

Correct typo and bring hostRoutes out as own init block

Change-Id: I7f6f83cb6a63aa81a057b40c377ac49132a9fcb9
(cherry picked from commit d84669c8b2594b702c7726b9a5de9ac0dd0a4e15)

Change-Id: Id47b7c1e3121f5fb4091d5b799ed7f292a4dd658
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
10 years agoBUG-697: Bump versions for next stable release 20/6020/23
Surekha Bejgam [Tue, 8 Apr 2014 17:00:49 +0000 (19:00 +0200)]
BUG-697: Bump versions for next stable release

Version two fixes TAG mismatch.

Resolve Bug:717 - Remove fragment version requirement from config-persister-*

Remove Fragment-Host version requirement, because it does not map well
with maven versioning.

Change-Id: I0e00d6e3a82790a2e7b0f5c9db3f8d4f1e24f7dd
Signed-off-by: Abhishek Kumar <abhishk2@cisco.com>
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
10 years ago[maven-release-plugin] prepare release master-tagforprepareonly-controller-bulk-relea... master-tagforprepareonly-controller-bulk-release-2-1
jenkins-controller [Mon, 27 Jan 2014 20:50:53 +0000 (20:50 +0000)]
[maven-release-plugin] prepare release master-tagforprepareonly-controller-bulk-release-2-1

10 years agoUpdate to new version of the artifacts proposed by jenkins-controller-version-changes-16 21/4921/5 jenkins-controller-bulk-release-prepare-only-2-17
Chris Wright [Mon, 27 Jan 2014 18:28:18 +0000 (18:28 +0000)]
Update to new version of the artifacts proposed by jenkins-controller-version-changes-16

Patch 2:  Added manual fixes not caught by mavne change versions plugin
Patch 3:  [chrisw] added two more manual fixes

Change-Id: I84e1e32de85ab817f1925a5a008088e3cfb91136
Signed-off-by: jenkins-controller <jenkins-controller@opendaylight.org>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agoMerge "Prevent ConfigPusher from killing its thread" jenkins-controller-bulk-release-prepare-only-2-14 jenkins-controller-bulk-release-prepare-only-2-15 jenkins-controller-bulk-release-prepare-only-2-16
Ed Warnicke [Mon, 27 Jan 2014 14:43:33 +0000 (14:43 +0000)]
Merge "Prevent ConfigPusher from killing its thread"

10 years agoMerge changes I8c23739a,Ia0e70828
Ed Warnicke [Mon, 27 Jan 2014 14:11:06 +0000 (14:11 +0000)]
Merge changes I8c23739a,Ia0e70828

* changes:
  Bulk-add copyright headers to java files
  Bulk-add copyright headers to .xtend files

10 years agoPrevent ConfigPusher from killing its thread 82/4882/1
Robert Varga [Mon, 27 Jan 2014 13:51:10 +0000 (14:51 +0100)]
Prevent ConfigPusher from killing its thread

The original code promoted pretty much every error to an unhandled
RuntimeException. Use the exceptions already in place to handle erros
occuring. Also handle IO error as a retriable operation.

Change-Id: I666d66e89993f0f9d18afb6ec680e64a50cefec1
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Fix RPC forwarding related bugs in Binding Independent Connector" jenkins-controller-bulk-release-prepare-only-2-13
Ed Warnicke [Mon, 27 Jan 2014 12:33:27 +0000 (12:33 +0000)]
Merge "Fix RPC forwarding related bugs in Binding Independent Connector"

10 years agoMerge "Adding a couple of ovsdb config variables to the config.ini" jenkins-controller-bulk-release-prepare-only-2-12
Giovanni Meo [Mon, 27 Jan 2014 09:27:57 +0000 (09:27 +0000)]
Merge "Adding a couple of ovsdb config variables to the config.ini"

10 years agoAdding a couple of ovsdb config variables to the config.ini 49/4849/2
Madhu Venugopal [Mon, 27 Jan 2014 09:07:03 +0000 (01:07 -0800)]
Adding a couple of ovsdb config variables to the config.ini

Change-Id: I5c524121130845bd8d42f545430f5f06293cfc25
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
10 years agoMigrate bundles' configuration mgmt to ConfigurationService 46/4846/1
Alessandro Boch [Mon, 27 Jan 2014 08:11:30 +0000 (00:11 -0800)]
Migrate bundles' configuration mgmt to ConfigurationService

- Change current logic where read/save config is completely managed by each bundle,
  with moving it to configuration manager. This decoupling will allow configuration
  manager to decide how to persist the bundles' configurations to disk, withouth
  necessarely depend on java serialization as today controlelr does.
  Also now file names can be static and each bundle does not need to track the container
  context in the file name (which was lame). This allow controller to erase container
  startup files on container removal, which was not possible today.
- Global and in container configuration services to expose
  two APIs for the other bundles to retrieve and save their config
- Per container startup files organized in directories (directory name = container name)
- Container startup directory removed on container removal, and created on container creation if not present

Change-Id: I58c283eb796cf2a60466a97162428a8c2ae478ae
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoFix for dry run 37/4837/4 jenkins-controller-bulk-release-prepare-only-2-11
Ed Warnicke [Mon, 27 Jan 2014 03:18:34 +0000 (03:18 +0000)]
Fix for dry run

Removed unneeded variables from commons/opendaylight/pom.xml
Expanded dependencyManagement in commons/opendaylight/pom.xml
Added explicte dependency on sanitytest to distribution pom.xml
Fixed dependencies in two integration tests
Removed module archetypes from pom.xml
Moved third-party/ganymed build from netconf to root pom.xml

Change-Id: Id4d1586bd86f375fa2bd4b64faf28682d402e4e9
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "One more fix to pass release-prepareonly"
Alessandro Boch [Mon, 27 Jan 2014 03:40:40 +0000 (03:40 +0000)]
Merge "One more fix to pass release-prepareonly"

10 years agoMerge "Gerrit contains following fixes: 1) Fix for bug 284 - Added custom ip matching...
Ed Warnicke [Sun, 26 Jan 2014 23:33:06 +0000 (23:33 +0000)]
Merge "Gerrit contains following fixes: 1) Fix for bug 284 - Added custom ip matching method to compare ip addresses with mask 2) Fix for bug 286 3) Fix for bug 379"

10 years agoMerge "Changed multimaps to synchronized multimaps"
Ed Warnicke [Sun, 26 Jan 2014 23:32:49 +0000 (23:32 +0000)]
Merge "Changed multimaps to synchronized multimaps"

10 years agoBulk-add copyright headers to java files 34/4834/2
Robert Varga [Sun, 26 Jan 2014 23:00:09 +0000 (00:00 +0100)]
Bulk-add copyright headers to java files

Change-Id: I8c23739a21f3f6cecb138f62a54efbabf03b9c55
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoBulk-add copyright headers to .xtend files 35/4835/2
Robert Varga [Sun, 26 Jan 2014 23:00:50 +0000 (00:00 +0100)]
Bulk-add copyright headers to .xtend files

Change-Id: Ia0e70828399607e3e5b4193e01200420f85c0a8a
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Self assign controller MAC when cannot retrieve one from host"
Giovanni Meo [Sun, 26 Jan 2014 23:03:38 +0000 (23:03 +0000)]
Merge "Self assign controller MAC when cannot retrieve one from host"

10 years agoMerge "Add a the logger config for debugging schema loading"
Ed Warnicke [Sun, 26 Jan 2014 22:46:52 +0000 (22:46 +0000)]
Merge "Add a the logger config for debugging schema loading"

10 years agoMerge "Improve logging to indicate when configuration has been pushed"
Ed Warnicke [Sun, 26 Jan 2014 22:46:43 +0000 (22:46 +0000)]
Merge "Improve logging to indicate when configuration has been pushed"

10 years agoSelf assign controller MAC when cannot retrieve one from host 30/4830/1
Alessandro Boch [Sun, 26 Jan 2014 22:10:35 +0000 (14:10 -0800)]
Self assign controller MAC when cannot retrieve one from host

- When Switch Manager is not able to retrieve the list of the host
  network interfaces, self assign a custom MAC address.
  This is a quick fix for Hydrogen release. User can still
  overwrite the custom MAC with the one of his choice via
  switchmanager REST API

Change-Id: I7a76107fc970e8dead649ac9e8703533921c8d30
Signed-off-by: Alessandro Boch <aboch@cisco.com>
10 years agoChanged multimaps to synchronized multimaps 26/4826/2
Tony Tkacik [Sun, 26 Jan 2014 21:32:20 +0000 (22:32 +0100)]
Changed multimaps to synchronized multimaps

Change-Id: I4279eb099559d019523eef8ac59e17e12e62ebdd
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge "Instance identifier support"
Ed Warnicke [Sun, 26 Jan 2014 20:56:12 +0000 (20:56 +0000)]
Merge "Instance identifier support"

10 years agoImprove logging to indicate when configuration has been pushed 24/4824/1
Robert Varga [Sun, 26 Jan 2014 20:42:27 +0000 (21:42 +0100)]
Improve logging to indicate when configuration has been pushed

Change-Id: I1abe5cfc6704300fba12785edda94a2f24aad562
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoGerrit contains following fixes: 22/4822/1
Anil Vishnoi [Sun, 26 Jan 2014 14:17:19 +0000 (19:47 +0530)]
Gerrit contains following fixes:
1) Fix for bug 284 - Added custom ip matching method to compare ip addresses with mask
2) Fix for bug 286
3) Fix for bug 379

Change-Id: I64b36a817eab6654d24b3f91835cdc068f19c401
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoAdd a the logger config for debugging schema loading 21/4821/1
Robert Varga [Sun, 26 Jan 2014 19:29:45 +0000 (20:29 +0100)]
Add a the logger config for debugging schema loading

Change-Id: Ie2bc0d4f9e6c3005eeaf1738dfdba18e4586d30f
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoMerge "Improve client logging"
Ed Warnicke [Sun, 26 Jan 2014 18:41:43 +0000 (18:41 +0000)]
Merge "Improve client logging"

10 years agoInstance identifier support 75/4575/7
Martin Sunal [Sat, 25 Jan 2014 14:03:11 +0000 (15:03 +0100)]
Instance identifier support

- codec for instance identifier (deserializer, serializer) was added
- instance identifier from XML and JSON files to simple node
- instance identifier from simple node to XML and JSON
- corrected augments with the same names

Change-Id: Iff49aedd209e61fb15e4a7bee61a2c9611c25355
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoFix RPC forwarding related bugs in Binding Independent Connector 50/4650/2
Tony Tkacik [Sun, 26 Jan 2014 17:24:25 +0000 (18:24 +0100)]
Fix RPC forwarding related bugs in Binding Independent Connector

  - Fix for set of small bugs which prevented invocation of RPC via Restconf

Change-Id: I090516187007c5b1411fd6a9aecf25724465228a
Signed-off-by: Robert Gallas <rgallas@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoMerge "Minor fixes in md-sal and config."
Ed Warnicke [Sun, 26 Jan 2014 17:20:26 +0000 (17:20 +0000)]
Merge "Minor fixes in md-sal and config."

10 years agoOne more fix to pass release-prepareonly 31/4831/1
Giovanni Meo [Sun, 26 Jan 2014 15:02:09 +0000 (16:02 +0100)]
One more fix to pass release-prepareonly

Add sanitytest as a dependency of the distribution else release would
fail

Change-Id: I69fa09c7f00b873586def2ba1452def3db3cb10f
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
10 years agoMerge "Turned down some logging from INFO to DEBUG in StatsAdapter"
Giovanni Meo [Sun, 26 Jan 2014 14:53:55 +0000 (14:53 +0000)]
Merge "Turned down some logging from INFO to DEBUG in StatsAdapter"

10 years agoAdded listener registration when not reusing global instance 92/4792/1 jenkins-controller-bulk-release-prepare-only-2-10
Tony Tkacik [Sun, 26 Jan 2014 10:49:54 +0000 (11:49 +0100)]
Added listener registration when not reusing global instance

Change-Id: I90ff74c3d0b35bb44ae328b057de672001ee181d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoResolve the service reference before intantiating proxy for it 90/4790/2
Robert Varga [Sun, 26 Jan 2014 09:27:24 +0000 (10:27 +0100)]
Resolve the service reference before intantiating proxy for it

The original code assumed that if it has a ServiceReference, that
service does not disappear. Now it resolves it before deciding whether
to use a proxy.

Change-Id: I4dfdf886ab1f6fca7cdd523cf3e112af6d9b1411
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoTurned down some logging from INFO to DEBUG in StatsAdapter 87/4787/3
Ed Warnicke [Sun, 26 Jan 2014 06:42:50 +0000 (00:42 -0600)]
Turned down some logging from INFO to DEBUG in StatsAdapter

Change-Id: Ibc5b6b766d99f2044baa147b0985c293778d5041
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoFixed some exceptions in the Adapters 86/4786/2
Ed Warnicke [Sun, 26 Jan 2014 06:13:56 +0000 (00:13 -0600)]
Fixed some exceptions in the Adapters

Change-Id: Icf4c0802a41bc68026117cff38d080aeea87aef1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoDummy commit 85/4785/1
Ed Warnicke [Sun, 26 Jan 2014 05:35:12 +0000 (05:35 +0000)]
Dummy commit

Change-Id: I662e2d15d7fcc26157c963634a3d748974ad006c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
10 years agoMerge "Reduce verbosity/criticality of inconsistent yangstore messages"
Ed Warnicke [Sun, 26 Jan 2014 03:41:33 +0000 (03:41 +0000)]
Merge "Reduce verbosity/criticality of inconsistent yangstore messages"

10 years agoMerge "Add support for identity-ref config attributes to config/netconf subsystem"
Ed Warnicke [Sun, 26 Jan 2014 03:41:08 +0000 (03:41 +0000)]
Merge "Add support for identity-ref config attributes to config/netconf subsystem"

10 years agoMerge "Fix for bug - 369 Minor fix in building NodeConnector for AD-SAL Output action"
Ed Warnicke [Sun, 26 Jan 2014 03:27:28 +0000 (03:27 +0000)]
Merge "Fix for bug - 369 Minor fix in building NodeConnector for AD-SAL Output action"

10 years agoReduce verbosity/criticality of inconsistent yangstore messages 49/4749/6
Robert Varga [Fri, 24 Jan 2014 23:40:04 +0000 (00:40 +0100)]
Reduce verbosity/criticality of inconsistent yangstore messages

Directs yangtools warnings into the logfile and updates yangstore
messages such that we know when the store reaches consistent state after
being inconsistent.

Change-Id: Ica26af53ba7e39329e32014c46564adc793bbdfb
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoAdd support for identity-ref config attributes to config/netconf subsystem 83/4483/16
Robert Varga [Fri, 24 Jan 2014 10:53:13 +0000 (11:53 +0100)]
Add support for identity-ref config attributes to config/netconf subsystem

Change-Id: I79d5147f1d6bb1acd6b5a374bb76f48b6a3aaf55
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoUpdate test to be more careful and add logs 73/4773/2
Robert Varga [Sat, 25 Jan 2014 22:05:25 +0000 (23:05 +0100)]
Update test to be more careful and add logs

Change-Id: I5806fc866ced9b6f67157ad10154239a0b13c5e5
Signed-off-by: Robert Varga <rovarga@cisco.com>
10 years agoFix for bug - 369 79/4779/1
Anil Vishnoi [Sat, 25 Jan 2014 19:36:24 +0000 (01:06 +0530)]
Fix for bug - 369
Minor fix in building NodeConnector for AD-SAL Output action

Change-Id: I9603a864a2f80983b0e5278ab7d36cc3892ac015
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
10 years agoMerge "Turned down some logs in StatisticsProvider from INFO to DEBUG"
Madhu Venugopal [Sat, 25 Jan 2014 23:47:41 +0000 (23:47 +0000)]
Merge "Turned down some logs in StatisticsProvider from INFO to DEBUG"

10 years agoMerge "Fix JMX plugin mismatch with yangtools"
Ed Warnicke [Sat, 25 Jan 2014 23:45:07 +0000 (23:45 +0000)]
Merge "Fix JMX plugin mismatch with yangtools"

10 years agoFix JMX plugin mismatch with yangtools 78/4778/1
Robert Varga [Sat, 25 Jan 2014 23:14:05 +0000 (00:14 +0100)]
Fix JMX plugin mismatch with yangtools

https://git.opendaylight.org/gerrit/#/c/4775/ introduced an incompatible
StaticLoggerBinder to the classpath, so make the same change here.

Change-Id: I6255c0ea46768af9fba1196842253ea78b745f8e
Signed-off-by: Robert Varga <rovarga@cisco.com>
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 agoRemove clustered MD-SAL/datastore from distribution 77/4777/1
Robert Varga [Sat, 25 Jan 2014 22:31:22 +0000 (23:31 +0100)]
Remove clustered MD-SAL/datastore from distribution

It is not being built, so attempting to distribute it would result in
release failure in the controller project.

Change-Id: I4e713c20c6cc9712cbc2baf04dee51812df542ca
Signed-off-by: Robert Varga <rovarga@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 agoImprove client logging 68/4768/2
Robert Varga [Sat, 25 Jan 2014 15:47:26 +0000 (16:47 +0100)]
Improve client logging

This logs the cause of the failure to instantiate client and excalates
it to info if it's not done in 30 attempts.

Change-Id: Ibd5ccd657becb1aafeb816e822708e605cc0144a
Signed-off-by: Robert Varga <rovarga@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"