controller.git
8 years agoMerge "Fixed major sonar warnings in Binding Aware Broker"
Ed Warnicke [Sun, 1 Dec 2013 14:34:41 +0000 (14:34 +0000)]
Merge "Fixed major sonar warnings in Binding Aware Broker"

8 years agoFixed major sonar warnings in Binding Aware Broker 93/3293/1
Tony Tkacik [Sun, 1 Dec 2013 13:30:02 +0000 (14:30 +0100)]
Fixed major sonar warnings in Binding Aware Broker

Change-Id: I3c5721372778bc963d4fb1d5ff38585a7aa133af
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Fixed bug in Data store where multiple readers could overwrite other augmentat...
Ed Warnicke [Sun, 1 Dec 2013 12:25:12 +0000 (12:25 +0000)]
Merge "Fixed bug in Data store where multiple readers could overwrite other augmentations"

8 years agoFixed bug in Data store where multiple readers could overwrite 74/3274/2
Tony Tkacik [Sun, 1 Dec 2013 01:39:43 +0000 (02:39 +0100)]
Fixed bug in Data store where multiple readers could overwrite
other augmentations

  - Added configuration / operational data validation - Commit
    with operational data stored in configuration store will fail.
  - Added initial data change event.

Change-Id: I5383cc28286bff98b95b11b63c56cd175ea2c7e9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Fixed PersisterAggregatorTest."
Ed Warnicke [Sat, 30 Nov 2013 16:33:07 +0000 (16:33 +0000)]
Merge "Fixed PersisterAggregatorTest."

8 years agoMerge "Fix equals and add hashcode to generated abstract module."
Ed Warnicke [Sat, 30 Nov 2013 16:32:32 +0000 (16:32 +0000)]
Merge "Fix equals and add hashcode to generated abstract module."

8 years agoMerge "modified meter and group enum from leaf to typedef."
Ed Warnicke [Sat, 30 Nov 2013 16:24:31 +0000 (16:24 +0000)]
Merge "modified meter and group enum from leaf to typedef."

8 years agoMerge "Make sure config.yang is MD-SAL enabled"
Ed Warnicke [Sat, 30 Nov 2013 16:18:56 +0000 (16:18 +0000)]
Merge "Make sure config.yang is MD-SAL enabled"

8 years agomodified meter and group enum from leaf to typedef. 64/3264/2
Prasanna Huddar [Sat, 30 Nov 2013 14:35:55 +0000 (20:05 +0530)]
modified meter and group enum from leaf to typedef.

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I5cb3d27519818979d9c5559bd834480b831d8049

8 years agoFix persister bug introduced in last commit. 68/3268/1
Tomas Olvecky [Sat, 30 Nov 2013 15:54:15 +0000 (16:54 +0100)]
Fix persister bug introduced in last commit.

Registering to JMX failed due to previous bugfix.

Change-Id: I8be8751e299d7f10c7ed691b9bcefbd62308fcae
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoMerge "Fix bug in persister causing to persist last configuration in a loop."
Ed Warnicke [Fri, 29 Nov 2013 15:23:13 +0000 (15:23 +0000)]
Merge "Fix bug in persister causing to persist last configuration in a loop."

8 years agoMerge "Finding data nodes in choices and cases."
Ed Warnicke [Fri, 29 Nov 2013 14:20:34 +0000 (14:20 +0000)]
Merge "Finding data nodes in choices and cases."

8 years agoFix bug in persister causing to persist last configuration in a loop. 52/3252/1
Tomas Olvecky [Fri, 29 Nov 2013 14:16:25 +0000 (15:16 +0100)]
Fix bug in persister causing to persist last configuration in a loop.

Change-Id: Ie2c35d5bb4aba19783b4c37d250e575fae2c50cc
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoFix equals and add hashcode to generated abstract module. 46/3246/1
Tomas Olvecky [Fri, 29 Nov 2013 13:28:09 +0000 (14:28 +0100)]
Fix equals and add hashcode to generated abstract module.

Equals and hashcode should evaluate just identifier. For change detection between commits, new method
isSame has been added. Fields that are arrays now use Arrays.equals instead of wrong equals.

Change-Id: I63cb29027c07b9737532d7faa75729ea026ffe20
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoFixed PersisterAggregatorTest. 47/3247/1
Milos Fabian [Fri, 29 Nov 2013 11:46:26 +0000 (12:46 +0100)]
Fixed PersisterAggregatorTest.

Change-Id: Iefc264ddc026df33f5a8124c17835f177627cd50
Signed-off-by: Milos Fabian <milfabia@cisco.com>
8 years agoMerge "Fix race conditions between config-manager and persister."
Ed Warnicke [Fri, 29 Nov 2013 12:25:31 +0000 (12:25 +0000)]
Merge "Fix race conditions between config-manager and persister."

8 years agoMake sure config.yang is MD-SAL enabled 08/3208/5
Robert Varga [Thu, 28 Nov 2013 13:30:54 +0000 (14:30 +0100)]
Make sure config.yang is MD-SAL enabled

In the controller-controlling-controllers scenario we need to be able to
generate MD-SAL bindings against config subsystem models. In order to do
that, we need the base definitions provided by config.yang.

This patch subjects all config components to MD-SAL binding generation
and introduces a new parent, which adds another execution to generate
JMX bindings. Infrastructure components continue to use config-subsystem
parent while the various config plugins (netty et al.) switch to the new
config-plugin-parent.

Change-Id: Id243d658a95ccfee0dbfe70044867f8de09cc20e
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
8 years agoMerge "Resolved namespace from input data"
Ed Warnicke [Fri, 29 Nov 2013 12:18:33 +0000 (12:18 +0000)]
Merge "Resolved namespace from input data"

8 years agoFix race conditions between config-manager and persister. 42/3242/1
Tomas Olvecky [Fri, 29 Nov 2013 11:17:06 +0000 (12:17 +0100)]
Fix race conditions between config-manager and persister.

Config-manager commits a blank transaction each time new ModuleFactory is discovered. At the same time
persister might try to push configuration. Add retries to both routines to overcome optimistic lock failure.

Change-Id: Ia45505d285b2eb6cc7fa949289a3fbeb4c62f9e7
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoFinding data nodes in choices and cases. 43/3243/1
Jozef Gloncak [Fri, 29 Nov 2013 09:46:51 +0000 (10:46 +0100)]
Finding data nodes in choices and cases.

Feature was rewritten. It is no more taken into account if schemas for data
nodes at the same level are in the same case for concrete choice. This check should be done in system which takes Json as input

Change-Id: I12e9d2dd9bba21e5ec59a6864a41c4b82cb4f43f
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoResolved namespace from input data 41/3241/1
msunal [Fri, 29 Nov 2013 11:34:23 +0000 (12:34 +0100)]
Resolved namespace from input data

Data of POST and PUT operations can contain namespace/module name:
- xml element can contain yang namespace
- json element can contain yang module name

Change-Id: I503c36de5cf76d6e7ca852d4b4e54e93d171920c
Signed-off-by: Martin Sunal <msunal@cisco.com>
8 years agoMerge "removed config-util from pax-exam minimum bundles as this is not a bundle"
Ed Warnicke [Fri, 29 Nov 2013 11:19:00 +0000 (11:19 +0000)]
Merge "removed config-util from pax-exam minimum bundles as this is not a bundle"

8 years agoMerge "Add support for enums as configuration attributes in config and netconf subsys...
Ed Warnicke [Fri, 29 Nov 2013 11:18:20 +0000 (11:18 +0000)]
Merge "Add support for enums as configuration attributes in config and netconf subsystem."

8 years agoMerge changes Ia268965a,Iefa79f99
Ed Warnicke [Fri, 29 Nov 2013 11:17:38 +0000 (11:17 +0000)]
Merge changes Ia268965a,Iefa79f99

* changes:
  Add running configuration data to get netconf operation response
  Add support for configuration attributes based on yang leaves with custom types (typedef) to netconf.

8 years agoMerge "Choice and case resolving in JSON output"
Ed Warnicke [Fri, 29 Nov 2013 11:16:05 +0000 (11:16 +0000)]
Merge "Choice and case resolving in JSON output"

8 years agoMerge "Add config-persister-directory-adapter. This implementation reads initial...
Ed Warnicke [Fri, 29 Nov 2013 11:12:31 +0000 (11:12 +0000)]
Merge "Add config-persister-directory-adapter. This implementation reads initial configuration from a directory. It can combine multiple files into one snapshot to be sent to netconf. It does not support writing when configuration changes."

8 years agoMerge "Refactor persister to handle multiple storage engines. Allow persister to...
Ed Warnicke [Fri, 29 Nov 2013 11:12:16 +0000 (11:12 +0000)]
Merge "Refactor persister to handle multiple storage engines. Allow persister to load and save configuration snapshots from/to multiple storage instances. Loading works by iterating list of storages backwards and pushing first non-empty response to netconf. This allows having a default (initial) configuration for the controller that will never be overwrittern. Saving configuration will be propagated to all storage engines except those configured as read only."

8 years agoMerge "Refactor persister: require only capabilities referenced by the xml snapshot...
Ed Warnicke [Fri, 29 Nov 2013 11:11:59 +0000 (11:11 +0000)]
Merge "Refactor persister: require only capabilities referenced by the xml snapshot. Also repair logback bug preventing it from taking snapshot configuration."

8 years agoAdd config-persister-directory-adapter. 12/3212/5
Tomas Olvecky [Wed, 27 Nov 2013 12:52:20 +0000 (13:52 +0100)]
Add config-persister-directory-adapter.
This implementation reads initial configuration from a directory. It can combine multiple files into one snapshot to be
sent to netconf. It does not support writing when configuration changes.

Change-Id: I6d92ce6a7221c424f64b2fe07b61fee30e9590f0
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoRefactor persister to handle multiple storage engines. 27/3227/4
Tomas Olvecky [Wed, 27 Nov 2013 12:52:20 +0000 (13:52 +0100)]
Refactor persister to handle multiple storage engines.
Allow persister to load and save configuration snapshots from/to multiple storage instances.
Loading works by iterating list of storages backwards and pushing first non-empty response to netconf.
This allows having a default (initial) configuration for the controller that will never be overwrittern.
Saving configuration will be propagated to all storage engines except those configured as read only.

Change-Id: If4cdbb9e0c303d5ebb2a3d04a316c74ff76dfb91
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoMerge "Revert "Fix bug 171. EchoReply payload must be the same as the correspoding...
Giovanni Meo [Fri, 29 Nov 2013 10:01:49 +0000 (10:01 +0000)]
Merge "Revert "Fix bug 171. EchoReply payload must be the same as the correspoding EchoRequest payload" because is causing the switches to periodically disconnect."

8 years agoRevert "Fix bug 171. EchoReply payload must be the same as the correspoding EchoReque... 33/3233/1
Giovanni Meo [Fri, 29 Nov 2013 09:05:27 +0000 (09:05 +0000)]
Revert "Fix bug 171. EchoReply payload must be the same as the correspoding EchoRequest payload" because is causing the switches to periodically disconnect.

This reverts commit e4f47d259077775ceeb1554c807eed8841263865.

Change-Id: I0aa07d67ca6e6651e4d29a03c4282d5d6d2168da
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years agoAdd running configuration data to get netconf operation response 82/3182/3
Maros Marsalek [Thu, 28 Nov 2013 09:09:24 +0000 (10:09 +0100)]
Add running configuration data to get netconf operation response

Change-Id: Ia268965a9ef64944138c3b6eb7313fd1ca606da4
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoChoice and case resolving in JSON output 06/3206/2
Jozef Gloncak [Thu, 28 Nov 2013 14:00:45 +0000 (15:00 +0100)]
Choice and case resolving in JSON output

Searching via choices and cases which are defined in YANG when resolving
composite node to find elements with corresponding name.

Change-Id: I4b62b323676a2cdd8212f102bcd0dbbbaf9b6c10
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoMerge "Re-Enable the pax-exam execution in Eclipse"
Alessandro Boch [Thu, 28 Nov 2013 21:18:14 +0000 (21:18 +0000)]
Merge "Re-Enable the pax-exam execution in Eclipse"

8 years agoRefactor persister: require only capabilities referenced by the xml snapshot. 44/3144/4
Tomas Olvecky [Wed, 27 Nov 2013 17:04:40 +0000 (18:04 +0100)]
Refactor persister: require only capabilities referenced by the xml snapshot.
Also repair logback bug preventing it from taking snapshot configuration.

Change-Id: I48c0383441bfaee3c192159f5158f833e7e1d938
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoMerge "Refactor persister. Remove obsolete TLS netconf configuration. Prefix all...
Ed Warnicke [Thu, 28 Nov 2013 20:37:31 +0000 (20:37 +0000)]
Merge "Refactor persister. Remove obsolete TLS netconf configuration. Prefix all ServiceAdaptor configurations with common namespace."

8 years agoMerge "Fix bug 171. EchoReply payload must be the same as the correspoding EchoReques...
Ed Warnicke [Thu, 28 Nov 2013 20:28:26 +0000 (20:28 +0000)]
Merge "Fix bug 171. EchoReply payload must be the same as the correspoding EchoRequest payload"

8 years agoRefactor persister. 23/3123/6
Tomas Olvecky [Wed, 27 Nov 2013 12:52:20 +0000 (13:52 +0100)]
Refactor persister.
Remove obsolete TLS netconf configuration. Prefix all ServiceAdaptor configurations with common namespace.

Change-Id: Ief5fc0a9b62bd9857f77e934d8097543c2fc7a65
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
8 years agoMerge "Fixed import of annotations for models."
Ed Warnicke [Thu, 28 Nov 2013 18:12:12 +0000 (18:12 +0000)]
Merge "Fixed import of annotations for models."

8 years agoFixed import of annotations for models. 15/3215/1
Tony Tkacik [Thu, 28 Nov 2013 17:42:33 +0000 (18:42 +0100)]
Fixed import of annotations for models.

Change-Id: I7fc3d45a12a8c281cacd0396aa79de486d1d91bd
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoFix bug 171. EchoReply payload must be the same as the correspoding EchoRequest payload 43/3143/3
Artur Downar [Wed, 27 Nov 2013 16:53:47 +0000 (17:53 +0100)]
Fix bug 171. EchoReply payload must be the same as the correspoding EchoRequest payload

Change-Id: I096f8389068948faad734ae1fef4b9b40b0f3cb9
Signed-off-by: Artur Downar <adownar@advaoptical.com>
8 years agoAdd support for enums as configuration attributes in config and netconf subsystem. 02/3202/3
Maros Marsalek [Thu, 28 Nov 2013 12:54:50 +0000 (13:54 +0100)]
Add support for enums as configuration attributes in config and netconf subsystem.

Change-Id: Ieb6054e2136a2eaf834105f9c1cff6db8668d507
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoAdd support for configuration attributes based on yang leaves with custom types ... 24/3124/6
Maros Marsalek [Wed, 27 Nov 2013 09:16:43 +0000 (10:16 +0100)]
Add support for configuration attributes based on yang leaves with custom types (typedef) to netconf.

Change-Id: Iefa79f99772eaa6a0974d6e7a106cd8c14dc648f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoMerge "Fixed handshake issues with SSH Netconf client"
Ed Warnicke [Thu, 28 Nov 2013 14:51:34 +0000 (14:51 +0000)]
Merge "Fixed handshake issues with SSH Netconf client"

8 years agoFixed handshake issues with SSH Netconf client 05/3205/1
Tony Tkacik [Thu, 28 Nov 2013 14:23:25 +0000 (15:23 +0100)]
Fixed handshake issues with SSH Netconf client

Change-Id: I979d64e529337a3bf1cd84f82684c5ce822a5514
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Modified Group, Meter and Table. Xpath pointing to Flows,Groups and Tables."
Ed Warnicke [Thu, 28 Nov 2013 12:15:46 +0000 (12:15 +0000)]
Merge "Modified Group, Meter and Table. Xpath pointing to Flows,Groups and Tables."

8 years agoremoved config-util from pax-exam minimum bundles as this is not a bundle 92/3192/1
Michal Rehak [Thu, 28 Nov 2013 12:05:30 +0000 (13:05 +0100)]
removed config-util from pax-exam minimum bundles as this is not a bundle

Change-Id: I20537487d7067d7b0052769b2e443732fa9847df
Signed-off-by: Michal Rehak <mirehak@cisco.com>
8 years agoMerge "MD-SAL StatisticsManager- Stopping statistics thread until i fix all the relev...
Ed Warnicke [Thu, 28 Nov 2013 11:50:52 +0000 (11:50 +0000)]
Merge "MD-SAL StatisticsManager- Stopping statistics thread until i fix all the relevant issue from openflowplugin"

8 years agoModified Group, Meter and Table. Xpath pointing to Flows,Groups and Tables. 88/3188/2
Prasanna Huddar [Thu, 28 Nov 2013 11:27:46 +0000 (16:57 +0530)]
Modified Group, Meter and Table. Xpath pointing to Flows,Groups and Tables.

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I6c94d92ba2bfde3f4503a4da589c4a3d0b5f870b

8 years agoMerge "- netconf SSH bridge bundle - Implement bridge using socket - standard netconf...
Ed Warnicke [Thu, 28 Nov 2013 11:34:00 +0000 (11:34 +0000)]
Merge "- netconf SSH bridge bundle - Implement bridge using socket - standard netconf configuration added to netconf-ssh - NetconfClietnSession no longer needs to propagate channel - introducet IOThread class for stream copy - serversession closed when -1 received - NetconfSSHActivator throws Exception where no valid configuration   is found - ganymed bundle fixed to propagate whole package ch.ethz.ssh2.signature - netconf-ssh bundle added to distribution pom - netconf ssh server starting in separate thread in order to finis   activator's start method"

8 years agoMerge "- introduced netconf ssh wrapper bundle - incorporation of Tomas's notes ...
Ed Warnicke [Thu, 28 Nov 2013 11:33:47 +0000 (11:33 +0000)]
Merge "- introduced netconf ssh wrapper bundle - incorporation of Tomas's notes - CRLF removed - introduced KeyStoreHandler for providing server keys - netconf server connection is created when subsystem 'netconf' received - data forwarding to netconf server on requestShell - netconfClientSession exposes channel - removed star imports in SocketThread - integration tests for netconf SSH - introduced SSHChannelInboudnHandler which forwards data from pipeline to SSH serer session - resolved dependencies - tests changed due netconf client sending hello message on session create, added netconf-it to main pom.xml - added logging for integration tests"

8 years agoMD-SAL StatisticsManager- Stopping statistics thread until i fix all the relevant 86/3186/1
Anil Vishnoi [Thu, 28 Nov 2013 11:05:41 +0000 (16:35 +0530)]
MD-SAL StatisticsManager- Stopping statistics thread until i fix all the relevant
issue from openflowplugin

Change-Id: I477d0bdd00f2e6c188cac4ccc65a69a8a18e18dc
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
8 years agoMerge "Fixed Group and Meter RPC model to use MD-SAL routing correctly"
Ed Warnicke [Thu, 28 Nov 2013 10:49:40 +0000 (10:49 +0000)]
Merge "Fixed Group and Meter RPC model to use MD-SAL routing correctly"

8 years agoMerge changes I178e467a,Ia8720c2c
Ed Warnicke [Thu, 28 Nov 2013 10:28:01 +0000 (10:28 +0000)]
Merge changes I178e467a,Ia8720c2c

* changes:
  Mark deprecated methods in DataModification as such
  Remove executable permissions from pom.xml

8 years agoMerge "Removed POST, PUT for /restconf/operational"
Ed Warnicke [Thu, 28 Nov 2013 10:27:19 +0000 (10:27 +0000)]
Merge "Removed POST, PUT for /restconf/operational"

8 years agoRe-Enable the pax-exam execution in Eclipse 84/3184/1
Giovanni Meo [Thu, 28 Nov 2013 10:20:35 +0000 (11:20 +0100)]
Re-Enable the pax-exam execution in Eclipse

- Make sure the pax-exam plugin is executed in the IDE so IT can be
executed via Junit runner, ability that got lost during the change to
use target-ide

Change-Id: Id270027fe54d8bb4391dd2c60f11a299defe4efb
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
8 years ago- netconf SSH bridge bundle 38/3138/2
Martin Bobak [Mon, 25 Nov 2013 17:54:16 +0000 (18:54 +0100)]
- netconf SSH bridge bundle
- Implement bridge using socket
- standard netconf configuration added to netconf-ssh
- NetconfClietnSession no longer needs to propagate channel
- introducet IOThread class for stream copy
- serversession closed when -1 received
- NetconfSSHActivator throws Exception where no valid configuration
  is found
- ganymed bundle fixed to propagate whole package ch.ethz.ssh2.signature
- netconf-ssh bundle added to distribution pom
- netconf ssh server starting in separate thread in order to finis
  activator's start method

Change-Id: I46eac8106a0f222e432d3d8e81c85239ed04ac42
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years ago- introduced netconf ssh wrapper bundle 82/2982/3
Martin Bobak [Wed, 20 Nov 2013 13:03:33 +0000 (14:03 +0100)]
- introduced netconf ssh wrapper bundle
- incorporation of Tomas's notes
- CRLF removed
- introduced KeyStoreHandler for providing server keys
- netconf server connection is created when subsystem 'netconf' received
- data forwarding to netconf server on requestShell
- netconfClientSession exposes channel
- removed star imports in SocketThread
- integration tests for netconf SSH
- introduced SSHChannelInboudnHandler which forwards data from pipeline to SSH serer session
- resolved dependencies
- tests changed due netconf client sending hello message on session create, added netconf-it to main pom.xml
- added logging for integration tests

Change-Id: I357a7118f2a34c445b0ce8cc9cbe4a7eff27a3a9
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years agoRemoved POST, PUT for /restconf/operational 79/3179/1
msunal [Thu, 28 Nov 2013 09:47:36 +0000 (10:47 +0100)]
Removed POST, PUT for /restconf/operational

- regarding to RFC the operations POST and PUT do not have to be allowed for client on /restconf/operational

Change-Id: Ie0e8cb07154e4a1a016090fef9645aa38b790b41
Signed-off-by: Martin Sunal <msunal@cisco.com>
8 years agoMerge "Table features : modified yang model. Patch set 2: Modified match types as...
Ed Warnicke [Thu, 28 Nov 2013 09:45:10 +0000 (09:45 +0000)]
Merge "Table features : modified yang model. Patch set 2: Modified match types as identity for extensibility."

8 years agoFixed Group and Meter RPC model to use MD-SAL routing correctly 75/3175/1
Tony Tkacik [Thu, 28 Nov 2013 08:36:49 +0000 (09:36 +0100)]
Fixed Group and Meter RPC model to use MD-SAL routing correctly

  - Changed RPCs in Group and Meter to use node-context-ref
    instead of node for routing information (same pattern as
    in flow-services).

  - Updated statistics manager to use updated code.

Change-Id: I7e6b156665008fea5814f6cdb16ed8de2511759a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMark deprecated methods in DataModification as such 71/3171/1
Robert Varga [Thu, 28 Nov 2013 07:30:23 +0000 (08:30 +0100)]
Mark deprecated methods in DataModification as such

Change-Id: I178e467a3885841175755e3e9ff8f977a4276e85
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
8 years agoRemove executable permissions from pom.xml 70/3170/1
Robert Varga [Tue, 26 Nov 2013 10:36:02 +0000 (11:36 +0100)]
Remove executable permissions from pom.xml

Change-Id: Ia8720c2c29e4cc1f2ac3c0d69827fe4010c5870a
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
8 years agoMerge "Fixes - config-registry registered to OSGi, used modules's factory bundle...
Ed Warnicke [Wed, 27 Nov 2013 22:14:08 +0000 (22:14 +0000)]
Merge "Fixes - config-registry registered to OSGi, used modules's factory bundle context for module instance registration."

8 years agoMerge "Fixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods."
Ed Warnicke [Wed, 27 Nov 2013 22:12:43 +0000 (22:12 +0000)]
Merge "Fixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods."

8 years agoMerge "Fixes for MD-FRM"
Kalvin Hom [Wed, 27 Nov 2013 21:48:01 +0000 (21:48 +0000)]
Merge "Fixes for MD-FRM"

8 years agoMerge "Flow Topology Exporter"
Ed Warnicke [Wed, 27 Nov 2013 21:38:12 +0000 (21:38 +0000)]
Merge "Flow Topology Exporter"

8 years agoMerge "Moved Schema Aware logic from DataStore to SchemaAwareDataStore adapter"
Ed Warnicke [Wed, 27 Nov 2013 21:34:49 +0000 (21:34 +0000)]
Merge "Moved Schema Aware logic from DataStore to SchemaAwareDataStore adapter"

8 years agoMerge "Fixed typo in group service. Modified Group and Meter flow Impl"
Ed Warnicke [Wed, 27 Nov 2013 21:26:45 +0000 (21:26 +0000)]
Merge "Fixed typo in group service. Modified Group and Meter flow Impl"

8 years agoMerge "Enabled documentation generator for models."
Ed Warnicke [Wed, 27 Nov 2013 21:16:42 +0000 (21:16 +0000)]
Merge "Enabled documentation generator for models."

8 years agoEnabled documentation generator for models. 08/3108/2
Tony Tkacik [Tue, 26 Nov 2013 18:29:13 +0000 (19:29 +0100)]
Enabled documentation generator for models.

Generated docs can be found in
opendaylight/md-sal/models/*/target/site/restconf/*.html

Change-Id: Ia85b61548d33a4b74248cbf6e72cec9e229e4a7b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoFixes - config-registry registered to OSGi, used modules's factory bundle context... 64/3064/5
Milos Fabian [Mon, 25 Nov 2013 12:52:19 +0000 (13:52 +0100)]
Fixes - config-registry registered to OSGi, used modules's factory bundle context for module instance registration.

Change-Id: Iaae34d47c7a8515ea68f2d8d3629edd0b073152e
Signed-off-by: Milos Fabian <milfabia@cisco.com>
8 years agoFixed typo in group service. Modified Group and Meter flow Impl 49/3149/1
Prasanna Huddar [Wed, 27 Nov 2013 18:55:05 +0000 (00:25 +0530)]
Fixed typo in group service. Modified Group and Meter flow Impl

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: Ie77e9f6ac4dead4a337dd16cf5cd5c891b5981bd

8 years agoMoved Schema Aware logic from DataStore to SchemaAwareDataStore adapter 33/3133/2
Tony Tkacik [Wed, 27 Nov 2013 14:45:51 +0000 (15:45 +0100)]
Moved Schema Aware logic from DataStore to SchemaAwareDataStore adapter

    All YANG schema logic necessary for proper function of DataStore
    for all components was moved to separate component which
    provides this functionality unified from one place for multiple
    datastores.

Change-Id: I840f752b03e22047e8a7f3d2b7dbe3026fb087c9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge changes I6ff6c55c,I92b7e285
Ed Warnicke [Wed, 27 Nov 2013 17:08:36 +0000 (17:08 +0000)]
Merge changes I6ff6c55c,I92b7e285

* changes:
  Bug 165 and changed operations
  Json with prefix for augmented elements

8 years agoBug 165 and changed operations 34/3134/1
msunal [Wed, 27 Nov 2013 15:15:58 +0000 (16:15 +0100)]
Bug 165 and changed operations

Main changes according to corresponding RFC draft 01 and 02:
- corrected media types (used application/yang.data and application/vnd.yang.data)
- PUT operation was changed to POST
- POST operation was changed to PUT

There was also added media types due to Bug 165 :
- application/json
- application/xml
- text/xml

Change-Id: I6ff6c55c272cef0b63d5795d5b9842db83f1b627
Signed-off-by: Martin Sunal <msunal@cisco.com>
8 years agoFixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods. 28/3128/2
Milos Fabian [Wed, 27 Nov 2013 13:51:55 +0000 (14:51 +0100)]
Fixed GlobalEventExecutorCloseable - override "unsupported opearaion" methods.

Change-Id: Ic0c65cc596bdf6ba1bbbada576052f11805a202e
Signed-off-by: Milos Fabian <milfabia@cisco.com>
8 years agoMerge "Switched SAL Netconf Connector to config subsystem"
Ed Warnicke [Wed, 27 Nov 2013 12:11:54 +0000 (12:11 +0000)]
Merge "Switched SAL Netconf Connector to config subsystem"

8 years agoMerge "Fixed bug with multiple DataReaders participating in one read operation"
Ed Warnicke [Wed, 27 Nov 2013 12:11:24 +0000 (12:11 +0000)]
Merge "Fixed bug with multiple DataReaders participating in one read operation"

8 years agoFixes for MD-FRM 16/3116/12
Ed Warnicke [Wed, 27 Nov 2013 02:30:52 +0000 (18:30 -0800)]
Fixes for MD-FRM

Patch 1:  Fix MD-FRM to listen to the correct portion of the data tree.
Currently we listen to /flows/flow/ for which we would need to specify a
key to indicate which flow in the tree we wanted to listen to.  Changing to
listen to /flows/ and thus hear commits involving all flows.

Patch 2:  Unpack Entry... we need the value of the entry which is a DataObject.
Otherwise, the cast fails.

Patch 3: NodeFlow is only used as an input to rpcs towards the
openflowplugin, it does not get filed in the data tree.  Flow gets
filed in the data tree.  Addtionally, commits can come in with multiple
objects, so if we get a commit with other things, we either need to ignore
them or handle them... but blindly casting them will not work.

Patch 4: Change to cope with moving from NodeFlow to Flow.  Fortunately,
NodeFlow is just Flow plus a NodeRef plus a TableRef, so it pretty much just
worked (at least at the typing level... not to running yet).

Patch 5: Fixed an NPE by providing a Collections.<RpcError>emptySet() for
RpcErrors instead of null.

Patch 6: Fixed a failure due to attempt to check with the old AD-SAL
infra for the Node.  This will not work correctly.  Added TODO for
validation of the node.  Also cleaned up substantially handling of
error conditions while I was in the neighborhood.

Patch 7: Something in the current use of ClusteringServices for
validation is breaking things.  At first it looked like
we were just trying to allocate caches before we initialized
out clustering services variable, and thus failing... but at
the end of the day there is more wrong here than make sense
to debug at this time... so commented out.

Patch 8: Get the modifications from the transaction and
deal with the create, updated, removed.  Also handled the
cast to Flow.  Put a small null check around handling of
instructions in FRMUtil.

Patch 9: Something in the current use of ClusteringServices
is breaking things. Commenting out in order to get things working.

Patch 10: Correctly sorted out the creates from the removes
from the *true* updates.  Note, both creates and updates appear
as updates... so you have to do a little setwise subtraction.
Also note, the Collections you get back are immutable, so
you have to do that subtraction with care.

Victory!  As of Patch 10 I can confirm using
https://git.opendaylight.org/gerrit/#/c/3118/

That flows being added, removed, or updated are being
correctly wired to an RPC that is registered for them.

Change-Id: Iee020938d201f3df0629b2df13a85ad023c808ac
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoMD-SAL Statistics Manager - Did temporary fix for avoiding CSIT test failure. 20/3120/1
Anil Vishnoi [Wed, 27 Nov 2013 11:30:51 +0000 (17:00 +0530)]
MD-SAL Statistics Manager - Did temporary fix for avoiding CSIT test failure.
This code has dependency on openflowplugin code that is not yet merged.
http://git.opendaylight.org/gerrit/3037

Change-Id: Ia54a911d12f7a484a3475d93dc1b344478121006
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
8 years agoSwitched SAL Netconf Connector to config subsystem 54/2854/8
Tony Tkacik [Tue, 19 Nov 2013 07:33:02 +0000 (08:33 +0100)]
Switched SAL Netconf Connector to config subsystem

    Switched Programmatic APIs to configuration APIs
    for mounting Netconf southbound devices as a providers
    inside MD-SAL.

    Netconf Southbound Device is not exposed as top-level
    provider, but rather as an mountpoint with explicit
    namespace defined by it's location in overal data tree.

Change-Id: I916e5cde75d15c5d1bcbe6aae9f448833ddaad2b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoFixed bug with multiple DataReaders participating in one read operation 07/3107/2
Tony Tkacik [Tue, 26 Nov 2013 18:01:08 +0000 (19:01 +0100)]
Fixed bug with multiple DataReaders participating in one read operation

Change-Id: I562c070acb0b16b1ffe41abb014c22319e1b5f2a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoJson with prefix for augmented elements 05/3105/2
Jozef Gloncak [Tue, 26 Nov 2013 15:32:47 +0000 (16:32 +0100)]
Json with prefix for augmented elements

Json elements which are created via augmentation are written with
prefix which is equal to module name from where augmentation was defined.

Change-Id: I92b7e2854cea3abf052f9fadc2783d29f1e82391
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoTable features : modified yang model. 97/3097/2
Deepthi V V [Tue, 26 Nov 2013 12:51:26 +0000 (18:21 +0530)]
Table features : modified yang model.
Patch set 2: Modified match types as identity for extensibility.

Signed-off-by: Deepthi V V <deepthi.v.v@ericsson.com>
Change-Id: I12f9f99ccc40162951889acc5515940e56e9f211

8 years agoMD-SAL Statistics Manager - Minor bug fixing 14/3114/1
Anil Vishnoi [Tue, 26 Nov 2013 21:39:13 +0000 (03:09 +0530)]
MD-SAL Statistics Manager - Minor bug fixing

Change-Id: I038195b03ac9f5abea9d23f793f69c2f307629c1
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
8 years agoAdded MD-SAL statistics-manager to dependendy in pom.xml 12/3112/1
Anil Vishnoi [Tue, 26 Nov 2013 19:28:17 +0000 (00:58 +0530)]
Added MD-SAL statistics-manager to dependendy in pom.xml

Change-Id: I5bfed655b9db48161f862488a29ba363ef515d1d
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
8 years agoMerge "Fixed quote issue in flow-types.yang and table-types.yang"
Giovanni Meo [Tue, 26 Nov 2013 19:54:36 +0000 (19:54 +0000)]
Merge "Fixed quote issue in flow-types.yang and table-types.yang"

8 years agoFixed quote issue in flow-types.yang and table-types.yang 09/3109/1
Ed Warnicke [Tue, 26 Nov 2013 19:11:02 +0000 (11:11 -0800)]
Fixed quote issue in flow-types.yang and table-types.yang

This should resolve the errors on startup:

2013-11-26 07:49:17.846 PST [Start Level Event Dispatcher] ERROR o.o.y.y.p.util.ParserListenerUtils - Syntax error in module opendaylight-table-types at line 7: missing '"'.
2013-11-26 07:49:17.856 PST [Start Level Event Dispatcher] ERROR o.o.y.y.p.util.ParserListenerUtils - Syntax error in module opendaylight-flow-types at line 7: missing '"'

Change-Id: I93511100e323c920bc65576576d082d535516717
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoMerge "Added transaction parameter in Port RPC"
Ed Warnicke [Tue, 26 Nov 2013 17:46:09 +0000 (17:46 +0000)]
Merge "Added transaction parameter in Port RPC"

8 years agoMerge "Fix bug 153: change the key container-config to ContainerConfig in the contain...
Giovanni Meo [Tue, 26 Nov 2013 15:55:15 +0000 (15:55 +0000)]
Merge "Fix bug 153: change the key container-config to ContainerConfig in the container manager module"

8 years agoMerge changes I0f752636,Idd154499,Ic35fa3e8
Ed Warnicke [Tue, 26 Nov 2013 14:35:34 +0000 (14:35 +0000)]
Merge changes I0f752636,Idd154499,Ic35fa3e8

* changes:
  Updated xml generated by get netconf operation to conform to yang schema in config-api
  Add logback as a default config module.
  Fix logging of yang parsing problems in yang-parser-impl

8 years agoMerge "Queue yang model"
Ed Warnicke [Tue, 26 Nov 2013 14:30:22 +0000 (14:30 +0000)]
Merge "Queue yang model"

8 years agoMerge "Better exception message in persister. Split information about missing capabil...
Ed Warnicke [Tue, 26 Nov 2013 14:23:32 +0000 (14:23 +0000)]
Merge "Better exception message in persister. Split information about missing capabilities into log message, and exception that only contains missing capabilities."

8 years agoMerge "Fixed default configuration to not reference unused capabilities"
Ed Warnicke [Tue, 26 Nov 2013 14:06:32 +0000 (14:06 +0000)]
Merge "Fixed default configuration to not reference unused capabilities"

8 years agoMerge "Update context-instance xpath format according to latest changes in config...
Ed Warnicke [Tue, 26 Nov 2013 14:06:16 +0000 (14:06 +0000)]
Merge "Update context-instance xpath format according to latest changes in config-api yang."

8 years agoMerge "Null data from XML"
Ed Warnicke [Tue, 26 Nov 2013 14:04:46 +0000 (14:04 +0000)]
Merge "Null data from XML"

8 years agoMerge changes I50218f21,I6bc2631b
Ed Warnicke [Tue, 26 Nov 2013 14:03:22 +0000 (14:03 +0000)]
Merge changes I50218f21,I6bc2631b

* changes:
  Serialization to Json improvement
  Union type processing added to JsonMapper

8 years agoMerge "Bug 164"
Ed Warnicke [Tue, 26 Nov 2013 14:02:25 +0000 (14:02 +0000)]
Merge "Bug 164"