Alessandro Boch [Wed, 29 Jan 2014 19:14:32 +0000 (11:14 -0800)]
Apply configs' name convention to authorization roles and resource groups
- Also include Switch config
Change-Id: If84199a1db6e1fc35c02c4b92493f99aeb8d8af8
Signed-off-by: Alessandro Boch <aboch@cisco.com>
Alessandro Boch [Tue, 4 Feb 2014 02:56:44 +0000 (02:56 +0000)]
Merge "Fix end of TLV in LLDP packet"
Ed Warnicke [Mon, 3 Feb 2014 22:51:26 +0000 (22:51 +0000)]
Merge "MD-SAL transaction chaining API"
Ed Warnicke [Mon, 3 Feb 2014 22:49:16 +0000 (22:49 +0000)]
Merge "Removed unused code from md-sal."
Ed Warnicke [Mon, 3 Feb 2014 22:45:17 +0000 (22:45 +0000)]
Merge "Restrict MD-SAL data operations to a single thread"
Ed Warnicke [Mon, 3 Feb 2014 22:42:40 +0000 (22:42 +0000)]
Merge "Clarify the semantics of put{Configuration,Operational}Data()"
Robert Varga [Mon, 3 Feb 2014 18:40:03 +0000 (19:40 +0100)]
Clarify the semantics of put{Configuration,Operational}Data()
This just adds documentation to how the put operations interact with
pre-existing data.
Change-Id: I01979df6a22f1a6d16c04c2cb0b97d7472d62040
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Mon, 3 Feb 2014 18:33:52 +0000 (19:33 +0100)]
Make sure transaction applies whole removal list
Change-Id: I53d1cf10bce6e444f80b13d9ce57e5f1ef2eb5c9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tony Tkacik [Mon, 3 Feb 2014 18:20:36 +0000 (19:20 +0100)]
Fixed bug when new childs were ommited during data store merge.
Change-Id: I0680d1354614d7597b0079445951d4a6f33d8d5c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Ed Warnicke [Mon, 3 Feb 2014 16:34:53 +0000 (16:34 +0000)]
Merge "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"
Robert Varga [Fri, 31 Jan 2014 09:31:46 +0000 (10:31 +0100)]
MD-SAL transaction chaining API
This API complements the normal MD-SAL transaction API. Applications can
use this API to maintain inter-transaction ordering and data
consistency.
Change-Id: Ia603f7dacf081fb1528d149f4635c2f22101a7a0
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 31 Jan 2014 15:31:05 +0000 (16:31 +0100)]
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>
Ed Warnicke [Sat, 1 Feb 2014 16:09:03 +0000 (16:09 +0000)]
Merge changes I805ec065,Idc9995b1
* changes:
Change unprotected netconf address from 0.0.0.0 to 127.0.0.1 .
Refactor config-persister: clean up exception handling and netconf client.
Ed Warnicke [Sat, 1 Feb 2014 16:08:26 +0000 (16:08 +0000)]
Merge "Fix typo and add more descriptive error"
Ed Warnicke [Sat, 1 Feb 2014 16:07:41 +0000 (16:07 +0000)]
Merge changes Iae4ee2f2,I148c22c4,I1dab84ae
* changes:
Additional test for instance-identifier
BUG 388: corrected media type in /operations resource
BUG 312: Removed legacy RESTCONF draft 01 syntax
Ed Warnicke [Sat, 1 Feb 2014 16:02:09 +0000 (16:02 +0000)]
Merge "updated test coverage for AutodetectDirectoryPersister test coverage raised on config-persister-file-xml-adapter"
Ed Warnicke [Sat, 1 Feb 2014 16:00:23 +0000 (16:00 +0000)]
Merge "minor test fix"
Ed Warnicke [Sat, 1 Feb 2014 15:59:14 +0000 (15:59 +0000)]
Merge "Add configurable connection timeout to netconf client."
Ed Warnicke [Sat, 1 Feb 2014 15:57:56 +0000 (15:57 +0000)]
Merge "Added description to meter types yang model."
Robert Varga [Thu, 30 Jan 2014 18:07:22 +0000 (19:07 +0100)]
Fix typo and add more descriptive error
When comparing keys, also provide a hint to the node which violated the
key constraint.
Change-Id: I02a9ba3c887bcbc3af34fe770f662e627c3a4414
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 30 Jan 2014 10:28:15 +0000 (11:28 +0100)]
Bump yangtools to 0.6.2-SNAPSHOT
This will pick up upcoming yangtools release.
Change-Id: I3c6f8faf8888eaa3a71a9f0e16cc242b6f958832
Signed-off-by: Robert Varga <rovarga@cisco.com>
Gaurav Bhagwani [Fri, 31 Jan 2014 16:11:36 +0000 (21:41 +0530)]
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
Signed-off-by: Gaurav Bhagwani <gaurav.bhagwani@ericsson.com>
Change-Id: I5875f9792f6a036bf2b4060ba377f1565e66d2fd
Jozef Gloncak [Mon, 27 Jan 2014 14:19:35 +0000 (15:19 +0100)]
Additional test for instance-identifier
- test for instance identifier
- correction of ignored test (adding revisions to wrong tests)
- instance identifier with leaflist predicate:
-- serialize codec
-- XML output
-- JSON output
Change-Id: Iae4ee2f2ff3c1b3445958f1d69673df9f56b0e2a
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Martin Sunal [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: I148c22c4c6c28d0d13f2b717fe629b42d5c73f70
Signed-off-by: Martin Sunal <msunal@cisco.com>
Tomas Olvecky [Fri, 31 Jan 2014 14:13:40 +0000 (15:13 +0100)]
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: I805ec065548e017dd2244d37e3275d379761e490
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Martin Bobak [Thu, 30 Jan 2014 09:19:00 +0000 (10:19 +0100)]
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>
Tomas Olvecky [Fri, 31 Jan 2014 13:51:08 +0000 (14:51 +0100)]
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>
Martin Bobak [Fri, 31 Jan 2014 09:26:36 +0000 (10:26 +0100)]
minor test fix
Change-Id: I3dce2b98d5d7452a9363150b91827eb3dcc03e60
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Sapan Shah [Fri, 31 Jan 2014 10:57:03 +0000 (02:57 -0800)]
Fix Helper sorting issue
Fix sorting in tables, for undefined values
Change-Id: Id9c09aa9b9de93f07c4063e21e6dac578d13913f
Signed-off-by: Sapan Shah <sapshah@cisco.com>
Martin Vitez [Thu, 30 Jan 2014 14:15:45 +0000 (15:15 +0100)]
Removed unused code from md-sal.
Change-Id: Ia64a118ec7c75d0abf5800f7eee98ae708b8e50a
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Sapan Shah [Thu, 30 Jan 2014 22:09:42 +0000 (14:09 -0800)]
Display Vlan Priority in Flow Stats in TS GUI
also display Priority values, greater than 32767
Change-Id: Idc067ffe3b9e859c1f2ce2eeec7d5e569f318db6
Signed-off-by: Sapan Shah <sapshah@cisco.com>
Diti Bhatia [Thu, 30 Jan 2014 20:46:22 +0000 (12:46 -0800)]
Fix end of TLV in LLDP packet
Change-Id: Id4bc88bcf792758ff73f9d143481aca2a6ef3c95
Signed-off-by: Diti Bhatia <dibhatia@cisco.com>
Alessandro Boch [Thu, 30 Jan 2014 18:16:37 +0000 (18:16 +0000)]
Merge "Handling the case where vlan priority is set to 0."
Alessandro Boch [Thu, 30 Jan 2014 17:02:02 +0000 (17:02 +0000)]
Merge "Double the SSL input packet buffer size"
Asad Ahmed [Wed, 29 Jan 2014 22:36:16 +0000 (14:36 -0800)]
Handling the case where vlan priority is set to 0.
Change-Id: I0d9735343633c2efc1f6a3a5c768aad3f7c88c90
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
Tomas Olvecky [Thu, 23 Jan 2014 16:03:17 +0000 (17:03 +0100)]
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>
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>
Deepthi V V [Thu, 30 Jan 2014 12:25:46 +0000 (17:55 +0530)]
Added description to meter types yang model.
Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: Iedb115fa2178178d79292705f787502df56ab844
Ed Warnicke [Thu, 30 Jan 2014 11:02:43 +0000 (11:02 +0000)]
Merge "Add javadoc generation for yang modules in netconf subsystem"
Ed Warnicke [Thu, 30 Jan 2014 10:57:52 +0000 (10:57 +0000)]
Merge "Removed javadoc declaration from md-sal to enable parent javadocs settings."
Ed Warnicke [Thu, 30 Jan 2014 10:28:52 +0000 (10:28 +0000)]
Merge "Minor bug fix in stale flow statistics data cleanup"
Ed Warnicke [Thu, 30 Jan 2014 10:28:04 +0000 (10:28 +0000)]
Merge "BUG 340: Resolved instance-identifier translation in JSON"
Ed Warnicke [Thu, 30 Jan 2014 10:27:37 +0000 (10:27 +0000)]
Merge "Added utility SynchronizedTransaction wrapper implementation."
Ed Warnicke [Thu, 30 Jan 2014 10:27:13 +0000 (10:27 +0000)]
Merge "Bug 387 : Fixed Binding Independent Connector to properly serialize output."
Ed Warnicke [Thu, 30 Jan 2014 10:23:52 +0000 (10:23 +0000)]
Merge "BUG 392: Resolved translation to JSON behind mount point"
Ed Warnicke [Thu, 30 Jan 2014 10:20:06 +0000 (10:20 +0000)]
Merge "Fix of issue 377 for Notifications resolving."
Ed Warnicke [Thu, 30 Jan 2014 10:17:53 +0000 (10:17 +0000)]
Merge "Added explicit locking of the data change listener / commit handler registration"
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>
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>
Jason Ye [Thu, 30 Jan 2014 06:14:39 +0000 (22:14 -0800)]
Double the SSL input packet buffer size
Change-Id: I9aabf4e99c55eb788314f02755eb91df7f97a8da
Signed-off-by: Jason Ye <yisye@cisco.com>
Tony Tkacik [Wed, 29 Jan 2014 13:00:22 +0000 (13:00 +0000)]
Added utility SynchronizedTransaction wrapper implementation.
Change-Id: Ic35661a59fde08f0ec0b72121cd2e3dedf1de480
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Anil Vishnoi [Mon, 27 Jan 2014 14:40:10 +0000 (20:10 +0530)]
Minor bug fix in stale flow statistics data cleanup
Change-Id: I72ba43b33a2580bd07c3eef2d4c85a3a8c265a51
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
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>
Tony Tkacik [Wed, 29 Jan 2014 12:06:25 +0000 (12:06 +0000)]
Fix of issue 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: I4e0c644efb72ba0c26c75e9bd7452afbb0f4897c
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tony Tkacik [Tue, 28 Jan 2014 15:21:58 +0000 (16:21 +0100)]
Added explicit locking of the data change listener / commit handler registration
- This locking fixes ConcurrentModificationException in cases
when transaction processing is computing affected commit handlers
and data change listeners.
Change-Id: Icdd9a2ea36102f681a5d82390c3b9d942560b878
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Martin Vitez [Wed, 29 Jan 2014 09:51:04 +0000 (10:51 +0100)]
Removed javadoc declaration from md-sal to enable parent javadocs settings.
Change-Id: Ic0207a98d8755cb1ea12d570e37d55e76c94f4b6
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Maros Marsalek [Wed, 29 Jan 2014 11:48:39 +0000 (12:48 +0100)]
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>
Sapan Shah [Wed, 29 Jan 2014 09:01:32 +0000 (01:01 -0800)]
TS GUI does not show ToS field in flow stats
Change-Id: I4b0bfc1988ea4fcc3eae02a73c3aebae1622f382
Signed-off-by: Sapan Shah <sapshah@cisco.com>
Giovanni Meo [Wed, 29 Jan 2014 05:54:17 +0000 (05:54 +0000)]
Merge "Fix For Bug #335 Bug Description : Remove SW2 property "description" to a node - not working for both OF13 and OF10 mininet."
Giovanni Meo [Wed, 29 Jan 2014 05:39:33 +0000 (05:39 +0000)]
Merge "Fix for bug #343 Have made changes in HostTracker.java Submitting again"
Giovanni Meo [Wed, 29 Jan 2014 05:38:31 +0000 (05:38 +0000)]
Merge "Bug 380 SwitchManager.getHardwareMAC() does not handle empty string case"
Giovanni Meo [Wed, 29 Jan 2014 05:37:30 +0000 (05:37 +0000)]
Merge "Backward compatibility change for Configuration Service"
goyal [Tue, 28 Jan 2014 10:54:31 +0000 (16:24 +0530)]
Fix For Bug #335
Bug Description : Remove SW2 property "description" to a node - not working for both OF13 and OF10 mininet.
Change-Id: Iaa3667d7ca6aa4f27d024d2cfe435b08c1d359f2
Signed-off-by: goyal <sheena.goyal@tcs.com>
SahilShah [Tue, 28 Jan 2014 06:26:19 +0000 (11:56 +0530)]
Fix for bug #343
Have made changes in HostTracker.java
Submitting again
Change-Id: I859b6fcdf384188f2aa276ae0d0482a75a672e36
Signed-off-by: SahilShah <sahil4.s@tcs.com>
Sapan Shah [Mon, 27 Jan 2014 18:41:06 +0000 (10:41 -0800)]
Sorting of numeric fields in Troubleshooting module
Change-Id: I462a8e9279aa40879a6bf662dccaf88dedb25d11
Signed-off-by: Sapan Shah <sapshah@cisco.com>
Alessandro Boch [Mon, 27 Jan 2014 20:42:58 +0000 (12:42 -0800)]
Bug 380 SwitchManager.getHardwareMAC() does not handle empty string case
Change-Id: Iaaaa63eeade69c0e2aac4299297c40fda3016584
Signed-off-by: Alessandro Boch <aboch@cisco.com>
Alessandro Boch [Mon, 27 Jan 2014 18:17:48 +0000 (10:17 -0800)]
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: I6b4404b2280fa923391aeee02cf56ed9a8847552
Signed-off-by: Alessandro Boch <aboch@cisco.com>
Chi-Vien Ly [Mon, 27 Jan 2014 19:35:54 +0000 (11:35 -0800)]
Topology misses host(s) if multiple hosts are found on the same port
Change-Id: Ief8afc9fc9dbdcc768b0fbdc8d4059fef6fd79a9
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
Ed Warnicke [Tue, 28 Jan 2014 20:19:29 +0000 (20:19 +0000)]
Simple fix to (hopefully) molify Jenkins
Change-Id: If2fd7dc4e2366f6df20c4f47ad0fe7ceaa2b8204
Signed-off-by: Ed Warnicke <eaw@cisco.com>
jenkins-controller [Mon, 27 Jan 2014 20:51:03 +0000 (20:51 +0000)]
[maven-release-plugin] prepare for next development iteration
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
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>
Ed Warnicke [Mon, 27 Jan 2014 14:43:33 +0000 (14:43 +0000)]
Merge "Prevent ConfigPusher from killing its thread"
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
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>
Ed Warnicke [Mon, 27 Jan 2014 12:33:27 +0000 (12:33 +0000)]
Merge "Fix RPC forwarding related bugs in Binding Independent Connector"
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"
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>
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>
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>
Alessandro Boch [Mon, 27 Jan 2014 03:40:40 +0000 (03:40 +0000)]
Merge "One more fix to pass release-prepareonly"
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"
Ed Warnicke [Sun, 26 Jan 2014 23:32:49 +0000 (23:32 +0000)]
Merge "Changed multimaps to synchronized multimaps"
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>
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>
Giovanni Meo [Sun, 26 Jan 2014 23:03:38 +0000 (23:03 +0000)]
Merge "Self assign controller MAC when cannot retrieve one from host"
Ed Warnicke [Sun, 26 Jan 2014 22:46:52 +0000 (22:46 +0000)]
Merge "Add a the logger config for debugging schema loading"
Ed Warnicke [Sun, 26 Jan 2014 22:46:43 +0000 (22:46 +0000)]
Merge "Improve logging to indicate when configuration has been pushed"
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>
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>
Ed Warnicke [Sun, 26 Jan 2014 20:56:12 +0000 (20:56 +0000)]
Merge "Instance identifier support"
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>
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>
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>
Ed Warnicke [Sun, 26 Jan 2014 18:41:43 +0000 (18:41 +0000)]
Merge "Improve client logging"
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>
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>
Ed Warnicke [Sun, 26 Jan 2014 17:20:26 +0000 (17:20 +0000)]
Merge "Minor fixes in md-sal and config."
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>
Giovanni Meo [Sun, 26 Jan 2014 14:53:55 +0000 (14:53 +0000)]
Merge "Turned down some logging from INFO to DEBUG in StatsAdapter"
Code Review / controller.git / log