controller.git
7 years agoImprove logging in NetconfClient, logging-bridge. Increase connection timeout in... 26/5126/4
Tomas Olvecky [Wed, 5 Feb 2014 10:55:39 +0000 (11:55 +0100)]
Improve logging in NetconfClient, logging-bridge. Increase connection timeout in sal-netconf-connector.

Stop polluting log file with unnecessary 'Exception' messages by logging-bridge, print stack trace with exceptions using slf4j.
Increase connection timeout in sal-netconf-client from 5s to 20s.
Include label in NetconfClient exceptions.

Change-Id: If6819029fb79ea6ebead6b6745adf2c439d107da
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
7 years agoFix unintentional breakage 30/5130/3
Robert Varga [Wed, 5 Feb 2014 13:06:39 +0000 (14:06 +0100)]
Fix unintentional breakage

Yangtools commit 6e7a42bd344f5928343ad67328bc8a8a734bea2e introduced a
new method which broke the controller-side proxy. Fix it up by simply
forwarning it through the delegate.

Change-Id: I4582acb3a6987d9d87d422a86283984a38cd31ba
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoMerge "Added resource /streams/stream/<streamName>"
Ed Warnicke [Wed, 5 Feb 2014 06:37:28 +0000 (06:37 +0000)]
Merge "Added resource /streams/stream/<streamName>"

7 years agoMerge "Added support for /modules, /modules/module, /operations resources"
Ed Warnicke [Wed, 5 Feb 2014 06:36:47 +0000 (06:36 +0000)]
Merge "Added support for /modules, /modules/module, /operations resources"

7 years agoMerge "Handle uncaught exceptions from Clustering Services in HostTracker"
Chi-Vien Ly [Wed, 5 Feb 2014 02:43:13 +0000 (02:43 +0000)]
Merge "Handle uncaught exceptions from Clustering Services in HostTracker"

7 years agoHandle uncaught exceptions from Clustering Services in HostTracker 81/5081/5
Maurice Qureshi [Fri, 31 Jan 2014 23:18:44 +0000 (15:18 -0800)]
Handle uncaught exceptions from Clustering Services in HostTracker

There are couple of timer tasks in host tracker which use caches
provided by clustening services. If a container is deleted, then
the cache allocated to that container is also removed. Although
TimerTasks do get cancelled when container is deleted, but if it
happens during the execution of timer thread, then the task will
run to completion (even though it was cancelled) and may try to
access a cache which has already been deallocated.

The accessing of this deallocated cache will result in clustering
service exception which needs to be handled by timer tasks

Also adding toString methods to IPHostId and IPMacHostId for more
readable output when diplaying hosttracker data structures

Change-Id: Id1c481360a4ff71b6eb0afab3c030ef011ca7dcd
Signed-off-by: Maurice Qureshi <maquresh@cisco.com>
7 years agoAdded resource /streams/stream/<streamName> 94/5094/9
Martin Sunal [Sun, 2 Feb 2014 23:26:58 +0000 (00:26 +0100)]
Added resource /streams/stream/<streamName>

- added netty web socket server - port 8181

Subscriber can be registered for notifications in this flow:
1. Subscriber invokes RPC create-data-change-event-subscription with input element regarding to module sal-remote revision "2014-01-14"
2. Subscriber gets sream name as a response from server
3. Subscriber calls GET operation on /streams/stream/<streamName>
4. Subscriber gets response with status code 200 OK and header field Location contains URI of web socket server
5. Subscriber creates web socket http connection to obtained URI in step 4.
6. Subscriber can be unregistered from receiving notifications by sending CloseWebSocketFrame with reasonText containing stream name

Change-Id: I92925f5a50b2ceadf2cc8f0eaee2c99dd6a63d8d
Signed-off-by: Martin Sunal <msunal@cisco.com>
7 years agoAdded support for /modules, /modules/module, /operations resources 47/4847/6
Jozef Gloncak [Mon, 3 Feb 2014 12:56:13 +0000 (13:56 +0100)]
Added support for /modules, /modules/module, /operations resources

support for:
/restconf/modules
/restconf/modules/pathToMountPoint/yang-ext:mount
/restconf/modules/module/moduleName/revision
/restconf/modules/module/pathToMountPoint/yang-ext:mount/moduleName/revision
/restconf/operations
/restconf/operations/pathToMountPoint/yang-ext:mount

revision must be in format "yyyy-MM-dd"

test for URIs:
- /modules
- /modules/module/<module_name>/<module_revision>
- /operations
- /modules/......./yang-ext:mount
- /modules/module/........../yang-ext:mount/<module_name>/<module_revision>
- /operations/........../yang-ext:mount

Change-Id: I7169a25024598dd3b49d7960d1ef90bc40c5d1d5
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
7 years agoMerge "Fix end of TLV in LLDP packet"
Alessandro Boch [Tue, 4 Feb 2014 02:56:44 +0000 (02:56 +0000)]
Merge "Fix end of TLV in LLDP packet"

7 years agoMerge "MD-SAL transaction chaining API"
Ed Warnicke [Mon, 3 Feb 2014 22:51:26 +0000 (22:51 +0000)]
Merge "MD-SAL transaction chaining API"

7 years agoMerge "Removed unused code from md-sal."
Ed Warnicke [Mon, 3 Feb 2014 22:49:16 +0000 (22:49 +0000)]
Merge "Removed unused code from md-sal."

7 years agoMerge "Restrict MD-SAL data operations to a single thread"
Ed Warnicke [Mon, 3 Feb 2014 22:45:17 +0000 (22:45 +0000)]
Merge "Restrict MD-SAL data operations to a single thread"

7 years agoMerge "Clarify the semantics of put{Configuration,Operational}Data()"
Ed Warnicke [Mon, 3 Feb 2014 22:42:40 +0000 (22:42 +0000)]
Merge "Clarify the semantics of put{Configuration,Operational}Data()"

7 years agoClarify the semantics of put{Configuration,Operational}Data() 07/5107/1
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>
7 years agoMake sure transaction applies whole removal list 06/5106/1
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>
7 years agoFixed bug when new childs were ommited during data store merge. 05/5105/1
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>
7 years agoMerge "Yang Changes to include list<actions> to PacketOut - Added list<actions> and...
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"

7 years agoMD-SAL transaction chaining API 54/5054/4
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>
7 years agoRestrict MD-SAL data operations to a single thread 70/5070/3
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>
7 years agoMerge changes I805ec065,Idc9995b1
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.

7 years agoMerge "Fix typo and add more descriptive error"
Ed Warnicke [Sat, 1 Feb 2014 16:08:26 +0000 (16:08 +0000)]
Merge "Fix typo and add more descriptive error"

7 years agoMerge changes Iae4ee2f2,I148c22c4,I1dab84ae
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

7 years agoMerge "updated test coverage for AutodetectDirectoryPersister test coverage raised...
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"

7 years agoMerge "minor test fix"
Ed Warnicke [Sat, 1 Feb 2014 16:00:23 +0000 (16:00 +0000)]
Merge "minor test fix"

7 years agoMerge "Add configurable connection timeout to netconf client."
Ed Warnicke [Sat, 1 Feb 2014 15:59:14 +0000 (15:59 +0000)]
Merge "Add configurable connection timeout to netconf client."

7 years agoMerge "Added description to meter types yang model."
Ed Warnicke [Sat, 1 Feb 2014 15:57:56 +0000 (15:57 +0000)]
Merge "Added description to meter types yang model."

7 years agoFix typo and add more descriptive error 38/5038/3
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>
7 years agoBump yangtools to 0.6.2-SNAPSHOT 23/5023/5
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>
7 years agoYang Changes to include list<actions> to PacketOut 71/5071/2
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

7 years agoAdditional test for instance-identifier 22/5022/4
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>
7 years agoBUG 388: corrected media type in /operations resource 35/5035/3
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>
7 years agoChange unprotected netconf address from 0.0.0.0 to 127.0.0.1 . 66/5066/1
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>
7 years agoupdated test coverage for AutodetectDirectoryPersister 16/5016/8
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>
7 years agoRefactor config-persister: clean up exception handling and netconf client. 65/5065/1
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>
7 years agominor test fix 55/5055/2
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>
7 years agoFix Helper sorting issue 58/5058/1
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>
7 years agoRemoved unused code from md-sal. 32/5032/3
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>
7 years agoDisplay Vlan Priority in Flow Stats in TS GUI 46/5046/3
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>
7 years agoFix end of TLV in LLDP packet 42/5042/1
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>
7 years agoMerge "Handling the case where vlan priority is set to 0."
Alessandro Boch [Thu, 30 Jan 2014 18:16:37 +0000 (18:16 +0000)]
Merge "Handling the case where vlan priority is set to 0."

7 years agoMerge "Double the SSL input packet buffer size"
Alessandro Boch [Thu, 30 Jan 2014 17:02:02 +0000 (17:02 +0000)]
Merge "Double the SSL input packet buffer size"

7 years agoHandling the case where vlan priority is set to 0. 10/5010/3
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>
7 years agoAdd configurable connection timeout to netconf client. 36/5036/1
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>
7 years agoBUG 312: Removed legacy RESTCONF draft 01 syntax 29/5029/1
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>
7 years agoAdded description to meter types yang model. 26/5026/1
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

7 years agoMerge "Add javadoc generation for yang modules in netconf subsystem"
Ed Warnicke [Thu, 30 Jan 2014 11:02:43 +0000 (11:02 +0000)]
Merge "Add javadoc generation for yang modules in netconf subsystem"

7 years agoMerge "Removed javadoc declaration from md-sal to enable parent javadocs settings."
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."

7 years agoMerge "Minor bug fix in stale flow statistics data cleanup"
Ed Warnicke [Thu, 30 Jan 2014 10:28:52 +0000 (10:28 +0000)]
Merge "Minor bug fix in stale flow statistics data cleanup"

7 years agoMerge "BUG 340: Resolved instance-identifier translation in JSON"
Ed Warnicke [Thu, 30 Jan 2014 10:28:04 +0000 (10:28 +0000)]
Merge "BUG 340: Resolved instance-identifier translation in JSON"

7 years agoMerge "Added utility SynchronizedTransaction wrapper implementation."
Ed Warnicke [Thu, 30 Jan 2014 10:27:37 +0000 (10:27 +0000)]
Merge "Added utility SynchronizedTransaction wrapper implementation."

7 years agoMerge "Bug 387 : Fixed Binding Independent Connector to properly serialize output."
Ed Warnicke [Thu, 30 Jan 2014 10:27:13 +0000 (10:27 +0000)]
Merge "Bug 387 : Fixed Binding Independent Connector to properly serialize output."

7 years agoMerge "BUG 392: Resolved translation to JSON behind mount point"
Ed Warnicke [Thu, 30 Jan 2014 10:23:52 +0000 (10:23 +0000)]
Merge "BUG 392: Resolved translation to JSON behind mount point"

7 years agoMerge "Fix of issue 377 for Notifications resolving."
Ed Warnicke [Thu, 30 Jan 2014 10:20:06 +0000 (10:20 +0000)]
Merge "Fix of issue 377 for Notifications resolving."

7 years agoMerge "Added explicit locking of the data change listener / commit handler registration"
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"

7 years agoBUG 340: Resolved instance-identifier translation in JSON 91/4891/5
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>
7 years agoBUG 392: Resolved translation to JSON behind mount point 90/4890/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>
7 years agoDouble the SSL input packet buffer size 13/5013/1
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>
7 years agoAdded utility SynchronizedTransaction wrapper implementation. 97/4997/2
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>
7 years agoMinor bug fix in stale flow statistics data cleanup 88/4888/5
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>
7 years agoBug 387 : Fixed Binding Independent Connector to properly serialize output. 87/4987/2
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>
7 years agoFix of issue 377 for Notifications resolving. 13/4813/5
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>
7 years agoAdded explicit locking of the data change listener / commit handler registration 83/4983/2
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>
7 years agoRemoved javadoc declaration from md-sal to enable parent javadocs settings. 90/4990/2
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>
7 years agoAdd javadoc generation for yang modules in netconf subsystem 95/4995/1
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>
7 years agoTS GUI does not show ToS field in flow stats 88/4988/2
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>
7 years agoMerge "Fix For Bug #335 Bug Description : Remove SW2 property "description" to a...
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."

7 years agoMerge "Fix for bug #343 Have made changes in HostTracker.java Submitting again"
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"

7 years agoMerge "Bug 380 SwitchManager.getHardwareMAC() does not handle empty string case"
Giovanni Meo [Wed, 29 Jan 2014 05:38:31 +0000 (05:38 +0000)]
Merge "Bug 380 SwitchManager.getHardwareMAC() does not handle empty string case"

7 years agoMerge "Backward compatibility change for Configuration Service"
Giovanni Meo [Wed, 29 Jan 2014 05:37:30 +0000 (05:37 +0000)]
Merge "Backward compatibility change for Configuration Service"

7 years agoFix For Bug #335 78/4978/3
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>
7 years agoFix for bug #343 73/4873/5
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>
7 years agoSorting of numeric fields in Troubleshooting module 22/4922/6
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>
7 years agoBug 380 SwitchManager.getHardwareMAC() does not handle empty string case 30/4930/2
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>
7 years agoBackward compatibility change for Configuration Service 20/4920/2
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>
7 years agoTopology misses host(s) if multiple hosts are found on the same port 27/4927/4
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>
7 years agoSimple fix to (hopefully) molify Jenkins 85/4985/1
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>
7 years ago[maven-release-plugin] prepare for next development iteration
jenkins-controller [Mon, 27 Jan 2014 20:51:03 +0000 (20:51 +0000)]
[maven-release-plugin] prepare for next development iteration

7 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

7 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>
7 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"

7 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

7 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>
7 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"

7 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"

7 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>
7 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>
7 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>
7 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"

7 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"

7 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"

7 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>
7 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>
7 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"

7 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"

7 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"

7 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>
7 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>
7 years agoMerge "Instance identifier support"
Ed Warnicke [Sun, 26 Jan 2014 20:56:12 +0000 (20:56 +0000)]
Merge "Instance identifier support"

7 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>
7 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>