ovsdb.git
9 years agoPatch to bring us into alignment with skip.karaf.featureTest from odlparent 94/16494/1
Ed Warnicke [Fri, 13 Mar 2015 17:43:30 +0000 (10:43 -0700)]
Patch to bring us into alignment with skip.karaf.featureTest from odlparent

Sam Hague was kind enough to point out the use of skip.karaf, which is a
brilliant idea incorporated into the odlparent by this patch:

https://git.opendaylight.org/gerrit/#/c/16493/

This patch simply makes sure that -Dskip.karaf.featureTest does the right
thing in ovsdb.

Change-Id: I68f047decfb042c5191d4370400e81bf3a792e8c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoAdded convenience method for ops.mutate(TypedTable) 65/16265/2
Ed Warnicke [Tue, 10 Mar 2015 14:15:37 +0000 (07:15 -0700)]
Added convenience method for ops.mutate(TypedTable)

Many other ops methods handled TypedTable, so decided
mutate should too :)

Change-Id: Ib83e086c6e1967e3fdffb79115f7a57acad5aef8
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoAdded convenience method to TyperUtils for creating typed row 64/16264/2
Ed Warnicke [Tue, 10 Mar 2015 14:12:24 +0000 (07:12 -0700)]
Added convenience method to TyperUtils for creating typed row

The existing convenience method would only wrap an existing row,
this method simply wraps around a newly created row.

Change-Id: I6c5604f2494e87bbe4104b3f513c0e0379eabae5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Renaming ovsdb-managed-node-augmentation to ovsdb-bridge-augmentation."
Flavio Fernandes [Tue, 10 Mar 2015 20:30:15 +0000 (20:30 +0000)]
Merge "Renaming ovsdb-managed-node-augmentation to ovsdb-bridge-augmentation."

9 years agoRenaming ovsdb-managed-node-augmentation to ovsdb-bridge-augmentation. 76/16276/1
Sharad Mishra [Tue, 10 Mar 2015 07:57:16 +0000 (00:57 -0700)]
Renaming ovsdb-managed-node-augmentation to ovsdb-bridge-augmentation.

ovsdb yang model was using ovsdb-managed-node for bridges. This was causing confusion and was renamed to ovsdb-bridge.

Change-Id: I73477cd62f4c361738fa5cb10cfbff7e1ebe1cd7
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoRemove sal IInventoryListener from Southboundhandler 22/16222/1
Sam Hague [Tue, 10 Mar 2015 02:14:22 +0000 (22:14 -0400)]
Remove sal IInventoryListener from Southboundhandler

Change-Id: Ia9bf01f5ff13e6bfa164b3e9477cc62927cbe478
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd option to skip karaf tests for southbound 07/16207/3
Sam Hague [Mon, 9 Mar 2015 16:38:43 +0000 (12:38 -0400)]
Add option to skip karaf tests for southbound

The karaf test is enabled by default and can only be disabled by explicitly add -Dskip.karaf=true to the mvn build command.

Change-Id: I524d2494568dae61a5112191cb889e28dfb7a073
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge changes I00b761de,I6b7440b3,Id4a96515
Flavio Fernandes [Mon, 9 Mar 2015 20:29:42 +0000 (20:29 +0000)]
Merge changes I00b761de,I6b7440b3,Id4a96515

* changes:
  Add utils.servicehelper to netvirt
  Add utils.servicehelper to northbound
  Add utils.servicehelper to integration tests

9 years agoUse service dependency injection rather than ServiceHelper. 02/16202/2
Sam Hague [Mon, 9 Mar 2015 16:08:33 +0000 (12:08 -0400)]
Use service dependency injection rather than ServiceHelper.

This removes the need for sal.utils.

Change-Id: I0a0fb611eb1063a00844fc4beab78a16b2e0e16e
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd utils.servicehelper to netvirt 06/16206/3
Sam Hague [Mon, 9 Mar 2015 16:35:19 +0000 (12:35 -0400)]
Add utils.servicehelper to netvirt

Change-Id: I00b761de45f242ced5b1c56740471b8f7b40ab0e
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd utils.servicehelper to northbound 05/16205/3
Sam Hague [Mon, 9 Mar 2015 16:34:32 +0000 (12:34 -0400)]
Add utils.servicehelper to northbound

Change-Id: I6b7440b3e6d7ee165da0faa1d76a494874618816
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd utils.servicehelper to integration tests 04/16204/3
Sam Hague [Mon, 9 Mar 2015 16:33:23 +0000 (12:33 -0400)]
Add utils.servicehelper to integration tests

Change-Id: Id4a96515ee0918f4c713f1cbd906fbc21fbb5621
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoRevert "Revert "Make utils.servicehelper a bundle"" 13/16213/1
Sam Hague [Mon, 9 Mar 2015 18:39:20 +0000 (18:39 +0000)]
Revert "Revert "Make utils.servicehelper a bundle""

This reverts commit b1ac36f07fadb9ce0651714653b8d0817f882760.

Change-Id: I2a9dd7f2afcaa80afee31c92b0614f7a9b8e46d9
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoRevert "Make utils.servicehelper a bundle" 12/16212/2
Sam Hague [Mon, 9 Mar 2015 17:56:55 +0000 (17:56 +0000)]
Revert "Make utils.servicehelper a bundle"

This reverts commit 933dcb0728022a5d20fc1eafea5ed8e83edf83f8.

Change-Id: Iae3d935d926dc206a5c85a20d34dc16ec295fa47
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd ovsdb-features to karaf distribution 10/16210/1
Sam Hague [Mon, 9 Mar 2015 17:33:35 +0000 (13:33 -0400)]
Add ovsdb-features to karaf distribution

The karaf distribution does not currently have any dependencies defined so it is building before some of the ovsdb modules are built. Adding the features dependency ensures that the other modules will build first.

Change-Id: Icc366d7c3decc5bf041babc2bf2f651ed3fa6a17
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMake utils.servicehelper a bundle 03/16203/2
Sam Hague [Mon, 9 Mar 2015 16:31:40 +0000 (12:31 -0400)]
Make utils.servicehelper a bundle

The integration tests had trouble with an inline jar so changed it to a bundle.

Change-Id: I85fdd49b95d8198f6e9e808d1e4608b1228a63ef
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoInitial patch to deprecate sal utils Servicehelper 25/16125/2
Sam Hague [Fri, 6 Mar 2015 03:20:11 +0000 (22:20 -0500)]
Initial patch to deprecate sal utils Servicehelper

Change-Id: I952e22647bf64f0bd889e1151536751f935bc0eb
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd root pom for utils modules. 99/16099/1
Sam Hague [Thu, 5 Mar 2015 22:08:37 +0000 (17:08 -0500)]
Add root pom for utils modules.

Change-Id: Ie79324278f7588a7516c0aa82e0d0e00fe4ccf5c
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMigrate net-virt from adsal Node to mdsal Node 53/16053/2
Sam Hague [Thu, 5 Mar 2015 01:25:23 +0000 (20:25 -0500)]
Migrate net-virt from adsal Node to mdsal Node

Change-Id: I99e437d04e2dedf4f8cbe0b8059f7421177ecae6
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoRe-order feature dependency, so that neutron-service comes before nsf-service for... 43/16043/1
Flavio Fernandes [Wed, 4 Mar 2015 20:54:31 +0000 (15:54 -0500)]
Re-order feature dependency, so that neutron-service comes before nsf-service for ovsdb-openstack

Change-Id: I3a12f3d718aca392abbd54c33525b4db61308832
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoMigrate from adsal Node to mdsal Node 97/15997/3
Sam Hague [Wed, 4 Mar 2015 00:41:13 +0000 (19:41 -0500)]
Migrate from adsal Node to mdsal Node

This is a large commit becuase the sal Node is used all over the code. There is no way to build without doing it all in once shot.

Patch Set 2,3: No changes, just testing openstack integration. Something was broken in controller code causing failures. A rebuild this morning pulled in numerous new artifacts and cleared up the issue.

Change-Id: I9e53f61ad82dc0c6c1c447d9a7d4f2bcf11dbca0
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoSwitch node-id's for ovsdb-managed-nodes 09/15809/2
Ed Warnicke [Fri, 27 Feb 2015 00:30:02 +0000 (17:30 -0700)]
Switch node-id's for ovsdb-managed-nodes

Is now

ovsdb://${ip}:${port}/bridge/${bridgeName}

Change-Id: Ia74b1a51d551648545ceee3662ef4012a4faccba
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Make BridgeName strongly typed"
Sam Hague [Tue, 3 Mar 2015 15:36:30 +0000 (15:36 +0000)]
Merge "Make BridgeName strongly typed"

9 years agoMake BridgeName strongly typed 04/15804/4
Ed Warnicke [Thu, 26 Feb 2015 22:41:30 +0000 (15:41 -0700)]
Make BridgeName strongly typed

Change-Id: I77142202ac42ae1b5cf55cc50e071c14b97db9e4
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRemove <repositories> and <pluginRepositories> sections 61/15861/5
Thanh Ha [Sun, 1 Mar 2015 20:46:02 +0000 (15:46 -0500)]
Remove <repositories> and <pluginRepositories> sections

It is recommended that developers and servers configure this locally via
settings.xml.

https://lists.opendaylight.org/pipermail/discuss/2015-January/004482.html

Change-Id: I9e2b2e640bdc788ee355066c5bf40cc8cf813ac6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoPull Maven surefire plugin for offline builds 47/15947/1
Thanh Ha [Mon, 2 Mar 2015 21:27:24 +0000 (16:27 -0500)]
Pull Maven surefire plugin for offline builds

Change-Id: If6ed6d4f2c37f75dab52f0c30849727cce206493
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoMerge "Fix placement of config file"
Sam Hague [Mon, 2 Mar 2015 16:45:39 +0000 (16:45 +0000)]
Merge "Fix placement of config file"

9 years agoFix placement of config file 26/15926/1
Ed Warnicke [Mon, 2 Mar 2015 15:39:42 +0000 (07:39 -0800)]
Fix placement of config file

Change-Id: I2c7c74898e6d3f3313728c64860bfc2ccf666507
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Bug 2438: No serializer found for class.. BooleanBaseType"
Flavio Fernandes [Mon, 2 Mar 2015 12:31:09 +0000 (12:31 +0000)]
Merge "Bug 2438: No serializer found for class.. BooleanBaseType"

9 years agoBug 2438: No serializer found for class.. BooleanBaseType 81/15881/1
Sam Hague [Mon, 2 Mar 2015 02:40:21 +0000 (21:40 -0500)]
Bug 2438: No serializer found for class.. BooleanBaseType

When using the OVSDB Northbound v3 APIs the below error is returned when GET'ting tables that contain boolean columns.

http://{{controllerHost}}:{{controllerPort}}/ovsdb/nb/v3/node/OVS|192.168.120.31:48161/database/Open_vSwitch/table/Bridge

No serializer found for class org.opendaylight.ovsdb.lib.schema.BaseType$BooleanBaseType and no properties discovered to create BeanSerializer (to avoid exception, disable SerializationFeature.FAIL_ON_EMPTY_BEANS) ) (through reference chain: org.opendaylight.ovsdb.lib.schema.GenericTableSchema["columnSchemas"]->java.util.HashMap["stp_enable"]->org.opendaylight.ovsdb.lib.schema.ColumnSchema["type"]->org.opendaylight.ovsdb.lib.schema.AtomicColumnType["baseType"])

The boolean type does not have a public getter/setter since it doesn't need one but this error comes from that.

Configure the object mapper to safely ignore the error.

Change-Id: I1fc0cca6b48a698f711dc61b4a33763ff2fa521d
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "OVSDB V3 northbound failed to find node"
Sam Hague [Mon, 2 Mar 2015 02:15:52 +0000 (02:15 +0000)]
Merge "OVSDB V3 northbound failed to find node"

9 years agoMerge "getNode fails when id contains |"
Sam Hague [Mon, 2 Mar 2015 02:15:43 +0000 (02:15 +0000)]
Merge "getNode fails when id contains |"

9 years agoMerge "Ovsdb plugin compatibility layer"
Sam Hague [Mon, 2 Mar 2015 00:04:04 +0000 (00:04 +0000)]
Merge "Ovsdb plugin compatibility layer"

9 years agoOVSDB V3 northbound failed to find node 70/15870/2
Sam Hague [Sun, 1 Mar 2015 22:56:43 +0000 (17:56 -0500)]
OVSDB V3 northbound failed to find node

The Node.fromString(id) no longer works with the latest adsal deprecation changes.

A new helper method getNode() was previously created as a workaround but the v3 code was not using it. This commit fixes that.

Also added unit test for the v3 northbound.

Change-Id: I3bdffe52b8ba63b6bd52da482b0a3b1a162b6db8
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agogetNode fails when id contains | 69/15869/1
Sam Hague [Sun, 1 Mar 2015 22:53:04 +0000 (17:53 -0500)]
getNode fails when id contains |

The split delimiter was not used correctly. The | is the OR operater so it needed to be escaped.

Also added getNode unit test

Change-Id: I94623198e1ab10ea6b37ec05f09196e6a298ac0e
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoOvsdb plugin compatibility layer 69/15569/6
Anil Vishnoi [Fri, 20 Feb 2015 20:57:48 +0000 (02:27 +0530)]
Ovsdb plugin compatibility layer

As of now this layer just proxy API calls to plugin and relay the notification back to all the listener.
All the modules who want to consume to existing plugin interfaces, should move to the compatibility layer,
because plugin interface will change due to it's migration to md-sal.

*.* Although this layer is just proxy, but classes are moved under new package name to avoid conflict
with plugin code. As of now net-virt code is changed to depend on compatibility layer.
*.* Add new feature ovsdb-compatibility-layer to karaf-feature
*.* All integration tests are passing

Patch 3: Rebased and addressed reviewers comment
Patch 4: Fix single feature test for compatibility layer
Patch 5: Fixed integration tests
Patch 6: Added api back that was deleted accidently. Comments and pom.xml cleanup.

Change-Id: Id2587914c63651f067dbef1f7ba0bcb22a7a3fd4
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
9 years agoMerge "Fix for failed to parse versions like 2.3.1-git3282e51"
Flavio Fernandes [Fri, 27 Feb 2015 17:42:48 +0000 (17:42 +0000)]
Merge "Fix for failed to parse versions like 2.3.1-git3282e51"

9 years agoMerge "OVSDB SB model for port and interface"
Sam Hague [Fri, 27 Feb 2015 16:56:35 +0000 (16:56 +0000)]
Merge "OVSDB SB model for port and interface"

9 years agoFix for failed to parse versions like 2.3.1-git3282e51 29/15829/1
Sam Hague [Fri, 27 Feb 2015 16:50:52 +0000 (11:50 -0500)]
Fix for failed to parse versions like 2.3.1-git3282e51

Existing code was matching using the pattern major.minor.patch and would fail if anythign extra was in the string. This was because the code used an exact match across the whole string. Chaning to only find the major.minor.patch pattern fixes the issue by ingoring the extra characters.

Change-Id: I1cefb545bdc571a18727851a791a47a6c6158afa
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd Data Change Listeners for Managed Nodes and Ports 06/15806/5
Eric Multanen [Thu, 26 Feb 2015 15:49:15 +0000 (07:49 -0800)]
Add Data Change Listeners for Managed Nodes and Ports

Instantiate data change listeners in the OVSDB
SoutboundProvider for the OVSDB Managed Node and
Port Termination Point augmentations.

v2 - updated against merged OVSDB Termination Point augmentation

v3 - fixed log message in OvsdbTerminationPoint listener

v4 - remove unused imports

Change-Id: I699ed9522a5efef5d209c2361583bf0d248239bb
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
9 years agoOVSDB SB model for port and interface 30/15630/7
Eric Multanen [Mon, 23 Feb 2015 13:19:08 +0000 (05:19 -0800)]
OVSDB SB model for port and interface

Initial augmentation of termination-point to add
OVSDB port and interface support.  No doubt additional
fields will need to be added.

Looking for feedback on the approach.

v2 - flatten out the model so both ovsdb port and interface
attributes will be present in the ovsdb termination-point
augmentation.  More attributes to be added.

v3 - use identity types for the interface type

Change-Id: Ifbff6060c8f6dae3caa49c43fbaf18e5060031b1
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
9 years agoFix critical Sonar Issue: OvsdbConnectionService.java 22/15822/1
Flavio Fernandes [Fri, 27 Feb 2015 12:50:35 +0000 (07:50 -0500)]
Fix critical Sonar Issue: OvsdbConnectionService.java

Fix for the following issue:
- Throwable.printStackTrace(...) should never be called

Ref link on logging:
https://wiki.opendaylight.org/view/Logging_Best_Practices

Change-Id: I283f44deb8822b7f445a7cf48b89bec14d3c7df6
Ref: http://sonar.opendaylight.org/component/index#component=org.opendaylight.ovsdb%3Alibrary%3Asrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Flib%2Fimpl%2FOvsdbConnectionService.java&currentIssue=3c103a64-c1a4-421a-9f4a-17979810815b
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoMinor fix - typo in log. 26/15826/1
Sharad Mishra [Fri, 27 Feb 2015 07:28:43 +0000 (23:28 -0800)]
Minor fix - typo in log.

Change-Id: I67a656d3a16377f76927019d2e9adc2215766368
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoProvide a getter for the dbSchema of a TransactionBuilder 88/15788/2
Ed Warnicke [Thu, 26 Feb 2015 14:28:19 +0000 (07:28 -0700)]
Provide a getter for the dbSchema of a TransactionBuilder

This allows code to know whether or not this is a TransactionBuilder
that is of interest to a piece of code based on the schema it
supports.

Change-Id: I1e9985acf531e7cadd214c37d9f54ae6b06891ea
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoAdd getters for OvsdbConnectionInstance to ConnectionManager 89/15789/2
Ed Warnicke [Thu, 26 Feb 2015 14:41:59 +0000 (07:41 -0700)]
Add getters for OvsdbConnectionInstance to ConnectionManager

Change-Id: Ifcf77fcf423a25b2fcee34b9f95786a3d3ce55bd
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "MD-SAL OVSDB SB - handle update to ovsdb node."
Sam Hague [Thu, 26 Feb 2015 19:49:57 +0000 (19:49 +0000)]
Merge "MD-SAL OVSDB SB - handle update to ovsdb node."

9 years agoMerge "Slight simplification in OvsdbConnectionInstance"
Flavio Fernandes [Thu, 26 Feb 2015 19:43:15 +0000 (19:43 +0000)]
Merge "Slight simplification in OvsdbConnectionInstance"

9 years agoMerge "Minor fix to change log message from OvsdbNodeDataChangeListener to OvsdbManag...
Flavio Fernandes [Thu, 26 Feb 2015 19:39:15 +0000 (19:39 +0000)]
Merge "Minor fix to change log message from OvsdbNodeDataChangeListener to OvsdbManagedNodeDataChangeListener"

9 years agoFix for incorrect generation of NodeId which was preventing cleanup of nodes 90/15790/1
Ed Warnicke [Thu, 26 Feb 2015 17:23:14 +0000 (10:23 -0700)]
Fix for incorrect generation of NodeId which was preventing cleanup of nodes
correctly.

Change-Id: I4344f0a3629350f02958b953bbf7985291cd7a42
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoSlight simplification in OvsdbConnectionInstance 81/15781/1
Ed Warnicke [Thu, 26 Feb 2015 14:21:40 +0000 (07:21 -0700)]
Slight simplification in OvsdbConnectionInstance

Change-Id: If5b2350ec2d2cb228d17add95133cd4cc69602eb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMinor fix to change log message from OvsdbNodeDataChangeListener to OvsdbManagedNodeD... 91/15791/1
Sharad Mishra [Thu, 26 Feb 2015 10:44:21 +0000 (02:44 -0800)]
Minor fix to change log message from OvsdbNodeDataChangeListener to OvsdbManagedNodeDataChangeListener

Change-Id: I6dd2a493b9e709931e52f5c0b452178202c85a35
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoUse neutron from new repo 53/15753/6
Ed Warnicke [Wed, 25 Feb 2015 21:11:37 +0000 (16:11 -0500)]
Use neutron from new repo

Change-Id: I03757e2cebacb3f819e5e8ea7ab0c545ea4053ae
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix TransactionBuilder to take OvsdbClient rather than OvsdbClientImpl 45/15745/1
Ed Warnicke [Wed, 25 Feb 2015 18:41:47 +0000 (11:41 -0700)]
Fix TransactionBuilder to take OvsdbClient rather than OvsdbClientImpl

Change-Id: Ife31f77ca624e25e51bcf9f2e64e198eb136641b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMD-SAL OVSDB SB - handle update to ovsdb node. 57/15157/8
Sharad Mishra [Wed, 11 Feb 2015 18:13:18 +0000 (10:13 -0800)]
MD-SAL OVSDB SB - handle update to ovsdb node.

Patch to handle ovsdb node update.

Change-Id: Ia8a279de1ec17e7149794f4ef6e0b5900e04dccc
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoMoved extract* methods to TyperUtils 86/15686/2
Ed Warnicke [Tue, 24 Feb 2015 23:42:55 +0000 (16:42 -0700)]
Moved extract* methods to TyperUtils

This was discussed with shague on #opendaylight-ovsdb

Change-Id: I5b5eff8eae5644695fe7a6a2eb9e2030621bff35
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoChange signature of TransactionUtils to returns Maps keyed by UUID. 84/15684/2
Ed Warnicke [Tue, 24 Feb 2015 23:01:54 +0000 (16:01 -0700)]
Change signature of TransactionUtils to returns Maps keyed by UUID.

Change-Id: I1e1f47914b91bcb524b76f405d5c7ca76b918659
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMade TransactionUtils easier to use 79/15679/1
Ed Warnicke [Tue, 24 Feb 2015 18:37:41 +0000 (11:37 -0700)]
Made TransactionUtils easier to use

Change-Id: I74da5442f81f40312a62f161a74f303559f16a52
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoIntroducing AbstractTransactionCommand to make it easier to do commands 78/15678/1
Ed Warnicke [Tue, 24 Feb 2015 18:25:59 +0000 (11:25 -0700)]
Introducing AbstractTransactionCommand to make it easier to do commands

I found myself writing a lot of repetative code for TransactionCommands,
and so pulled it up into an AbstractTransactionCommand

Change-Id: Iddd6995146e9ddc4002b7e8c6791b1332198c361
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoAdded Removal of bridges from operational store 77/15677/2
Ed Warnicke [Tue, 24 Feb 2015 17:17:21 +0000 (10:17 -0700)]
Added Removal of bridges from operational store

Change-Id: I48d830e619fe982724d11ca66283bfd77ad5bf15
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoSwitch to command pattern and using transaction chains 75/15675/1
Ed Warnicke [Mon, 23 Feb 2015 21:55:49 +0000 (14:55 -0700)]
Switch to command pattern and using transaction chains

This patch does a few things:

1)  Switch to using command pattern with transaction chains
    to provider robust writing to the operational store
2)  Moved over the existing operational writing to using the command
    pattern
3)  Removed the bridges from the ovsdb node as they need to be
    separate topological nodes.

Change-Id: I9796d90a7cee483271134dc5abbc6097df4ce567
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRevert "Removing ovsdb plugin dependency on sal.utils classes" 41/15641/2
Sam Hague [Tue, 24 Feb 2015 04:06:43 +0000 (04:06 +0000)]
Revert "Removing ovsdb plugin dependency on sal.utils classes"

This reverts commit 9ab94103db38d59905e8706e9848ce992721e0eb.

Change-Id: I34b64fed8b937dde5247fcfdefe13a68882e61f9
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMove to use flow models from openflowplugin 43/15643/1
Sam Hague [Tue, 24 Feb 2015 04:58:32 +0000 (23:58 -0500)]
Move to use flow models from openflowplugin

Change-Id: I7328d44e05cee345e41229b0999c6651de09d83f
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoFix for ovsdb parent pom version mismatch 33/15633/2
Sam Hague [Mon, 23 Feb 2015 21:43:46 +0000 (16:43 -0500)]
Fix for ovsdb parent pom version mismatch

Patch 2: retry

Change-Id: I70a1f7f94f93c928364d0e1d9c7fe97bb271c5dc
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Nit pick: fix spacing in getNode()"
Flavio Fernandes [Fri, 20 Feb 2015 16:44:59 +0000 (16:44 +0000)]
Merge "Nit pick: fix spacing in getNode()"

9 years agoMerge "Fetch managed node (bridge) details and augment to operational data store"
Sam Hague [Fri, 20 Feb 2015 16:35:00 +0000 (16:35 +0000)]
Merge "Fetch managed node (bridge) details and augment to operational data store"

9 years agoNit pick: fix spacing in getNode() 57/15557/1
Flavio Fernandes [Fri, 20 Feb 2015 15:10:11 +0000 (10:10 -0500)]
Nit pick: fix spacing in getNode()

Change-Id: Ia17d027c1f011abdf3783f3c59f1caa04cd68a52
Co-Author: Sam Hague <shague@redhat.com>
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoMerge "Removing ovsdb plugin dependency on sal.utils classes"
Sam Hague [Fri, 20 Feb 2015 14:10:03 +0000 (14:10 +0000)]
Merge "Removing ovsdb plugin dependency on sal.utils classes"

9 years agoMerge "Workaround for Node.fromString"
Sam Hague [Fri, 20 Feb 2015 14:09:57 +0000 (14:09 +0000)]
Merge "Workaround for Node.fromString"

9 years agoRemoving ovsdb plugin dependency on sal.utils classes 20/15520/3
Sam Hague [Fri, 20 Feb 2015 03:05:13 +0000 (22:05 -0500)]
Removing ovsdb plugin dependency on sal.utils classes

This patch copies all the required classes (Status.java & StatusCode.java) from sal.utils and places them in plugin.api package.

Patch set 3: Add review comments.

Change-Id: I7e5ca9ef3480f4c3dcf604e1874f7e980681c2e8
Also-by: Anil Vishnoi <vishnoianil@gmail.com>
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoFetch managed node (bridge) details and augment to operational data store 85/15385/3
Anil Vishnoi [Sun, 15 Feb 2015 23:38:20 +0000 (05:08 +0530)]
Fetch managed node (bridge) details and augment to operational data store

Patch 2: Fixed schema.openvswitch module loading issues

Change-Id: I5a8ab3b4ce73e7ae6b98895684f76bfae816f43d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
9 years agoWorkaround for Node.fromString 19/15519/1
Sam Hague [Fri, 20 Feb 2015 01:43:11 +0000 (20:43 -0500)]
Workaround for Node.fromString

Added getnode(id) API to plugin ConnectionService interface to get the node requested by the id.

Also found some cases in the northbound that were using the fromString so replaced them with getNode.

Change-Id: I47dd6bb6cb432d6309744dd0206412a8a6037281
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMigrate ovsdb to use features-test from odlparent 06/15506/1
Sam Hague [Thu, 19 Feb 2015 16:47:51 +0000 (11:47 -0500)]
Migrate ovsdb to use features-test from odlparent

Change-Id: I1e808c9f98bef104dabecf2d3fe8ae2381b9cc5e
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoRemove IPlugin{in,out}Inventory* interfaces. 83/15483/1
Sam Hague [Thu, 19 Feb 2015 03:04:48 +0000 (22:04 -0500)]
Remove IPlugin{in,out}Inventory* interfaces.

This patch removes ovsdb plugin module's dependency on IPluginInInventory* and IPluginOutInventory* interfaces.

Patch has TODO item's that will be implemented and pushed in upcoming patches.

Change-Id: I69b9bab711d9e346629ede9ff8eec97989af31cc
Also-by: Anil Vishnoi <vishnoianil@gmail.com>
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agofix integration tests 78/15478/2
Flavio Fernandes [Wed, 18 Feb 2015 22:33:26 +0000 (17:33 -0500)]
fix integration tests

patch 2: only re-add pluginRepositories section

Change-Id: If8f31e0ff6e39cda01f49a8250ac492906039c8b
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoMerge "Parsing bridge names on new Southbound, Yang changes"
Flavio Fernandes [Wed, 18 Feb 2015 20:43:45 +0000 (20:43 +0000)]
Merge "Parsing bridge names on new Southbound, Yang changes"

9 years agoParsing bridge names on new Southbound, Yang changes 30/15430/3
Reinaldo Penno [Tue, 17 Feb 2015 19:34:53 +0000 (11:34 -0800)]
Parsing bridge names on new Southbound, Yang changes

Change-Id: I8a0d1802c37c49b812ce5b5b008d7e22169b3655
Signed-off-by: Reinaldo Penno <rapenno@gmail.com>
9 years agoMerge "Fix of ovsdb conneciton listener"
Flavio Fernandes [Wed, 18 Feb 2015 18:15:20 +0000 (18:15 +0000)]
Merge "Fix of ovsdb conneciton listener"

9 years agoFix of ovsdb conneciton listener 46/15346/2
Hsin-Yi Shen [Mon, 16 Feb 2015 02:39:35 +0000 (18:39 -0800)]
Fix of ovsdb conneciton listener

For ssl connection, the notification of connected event to listeners should happen after ssl handshake is complete.

Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
9 years agoClean up pom files. 45/15445/2
Sam Hague [Wed, 18 Feb 2015 03:36:45 +0000 (22:36 -0500)]
Clean up pom files.

- Add missing Copyright headers.
- Remove duplicated properties that are pulled from odlparent

Change-Id: Ia36dd455de988fb6be4f1a2d90cd7291878fe7d5
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Add karaf-based pax-exam so that net-virt can be tested."
Sam Hague [Tue, 17 Feb 2015 00:24:15 +0000 (00:24 +0000)]
Merge "Add karaf-based pax-exam so that net-virt can be tested."

9 years agoAdd karaf-based pax-exam so that net-virt can be tested. 90/15390/1
Sam Hague [Mon, 16 Feb 2015 23:08:48 +0000 (18:08 -0500)]
Add karaf-based pax-exam so that net-virt can be tested.

Use the following command to run the NetVirtIT test:

mvn -Dit.test=NetVirtIT verify -Pintegrationtest -Dovsdbserver.ipaddress=192.168.120.31 -Dovsdbserver.port=6640 -Pkarafit

This will start the test and bring up the ovsdb karaf distribution. You should first build the distribution and install it to your local m2 repo. When the odl-ovsdb-openstack feature is fully loaded you can then manual configure the bridge to connect to odl with ovs-vsctl set-manager tcp:192.168.120.1:6640.

By default the integration tests exclude NetVirtIt. This is because the current test cannot get service interfaces to make use of their services. An example is getting the connect interfce from the plugin to initiate and outgoing connection to an ovsdb node. The usual "ServiceHelper.getGlobalInstance" did not work in the karaf pax-exam container so another workaround needs to be found.

The test will wait for 10s for the connection from the ovsdb node. Look for the output: "Try to connect!" before connecting. This message indicates the odl-ovsdb-openstack feature is active and ready to receive connections. The timeout can be increased if needed.

Change-Id: I17a944542b564f456f841623083635ac9c4304d0
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoRe-enabled southbound 77/15377/1
Ed Warnicke [Mon, 16 Feb 2015 19:21:17 +0000 (12:21 -0700)]
Re-enabled southbound

It appears to be working fine.

Change-Id: I8206a98461efcb344c3322a5aca16ceba759f975
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoUse odlparent for pax-exam dependencies. 74/15374/1
Sam Hague [Mon, 16 Feb 2015 18:55:23 +0000 (13:55 -0500)]
Use odlparent for pax-exam dependencies.

Change-Id: Ie2d44eee629327a3229df189ac9321632d587f4e
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoBug 2707: Pipeline flows are not programmed because of failed onNodeUpdated call 70/15370/1
Sam Hague [Mon, 16 Feb 2015 16:43:24 +0000 (11:43 -0500)]
Bug 2707: Pipeline flows are not programmed because of failed onNodeUpdated call

Cause: we used the onNodeUdpated() OpendaylightInventoryListener interface to receive updates when openflow nodes were updated. If we thought it was the first time and the openflow node was just added we would then program the pipeline flows. ovsdb checked the FlowCapableNode in the datastore for the isPreset flag. It looks like there might have been some race condition where another writer like InventoryManager was updated the FlowCapablNode such that when ovsdb would do the above check isPresent would return true and ignore the update - and not program the pipeline flows.

Solution: replace the deprecated call with an mdsal flowCapablenode DataChangeListener. This ensures ovsdb will get the node when created.

Also added a couple log.info's to track when the nodes are added to help with future debugging.

Change-Id: Ib6867927cb1ce61670d7566ea40b88966243bdca
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoRemove dependency on sfc-model to help with yangtools issues. 41/15341/1
Sam Hague [Sun, 15 Feb 2015 15:29:52 +0000 (10:29 -0500)]
Remove dependency on sfc-model to help with yangtools issues.

Also removed building southbound since it has issue with parent pom. Not sure if it is related to all the other build issues from the recent yangtools commits.

Change-Id: Id18ee252f1e619ee899702b0dadb9284db8310af
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Fix sonar code coverage for BridgeConfigurationManagerImpl.java"
Flavio Fernandes [Fri, 13 Feb 2015 21:23:56 +0000 (21:23 +0000)]
Merge "Fix sonar code coverage for BridgeConfigurationManagerImpl.java"

9 years agoFix sonar code coverage for BridgeConfigurationManagerImpl.java 83/15283/1
Sam Hague [Fri, 13 Feb 2015 20:39:21 +0000 (15:39 -0500)]
Fix sonar code coverage for BridgeConfigurationManagerImpl.java

Change-Id: I6c459945c7f1aac12ab2db8a7d89d1f08ff2272d
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdding adsal todo markers to track needed changes. 53/15253/1
Sam Hague [Fri, 13 Feb 2015 13:25:18 +0000 (08:25 -0500)]
Adding adsal todo markers to track needed changes.

Change-Id: Ib6d40782ff930c034bc1ab8a11a96bba883b04c9
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd copyright header to files missing one 27/15227/1
Eric Multanen [Thu, 12 Feb 2015 16:00:43 +0000 (08:00 -0800)]
Add copyright header to files missing one

Change-Id: I6a65830729e6592e3dce11121cdd0983c553551e
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
9 years agoOVSDB MD-SAL SB - remove extra disconnected call 29/15129/2
Eric Multanen [Tue, 10 Feb 2015 22:52:38 +0000 (14:52 -0800)]
OVSDB MD-SAL SB - remove extra disconnected call

When deleting an active ODL connection to an OVS node
via restconf, the disconnect() call in
OvsdbConnectionManager.java called the disconnected()
method which resulted in two transactions to remove the
operational MD-SAL entry for the node.  Which resulted
in WARNings in the log.

Change-Id: I305be04a9217c03d646b103294e7f0d7eabf7df8
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
9 years agoAdded basic framework for getting requests for OvsdbManagedNodes 18/15118/3
Ed Warnicke [Tue, 10 Feb 2015 18:52:29 +0000 (11:52 -0700)]
Added basic framework for getting requests for OvsdbManagedNodes

Provides basic framework for getting requests for OvsdbManagedNodes so
we can translate them to transacts.

Change-Id: I5fa5e556894a4b542243039868fac6df5d8dc682
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge topics 'mdsal_ovsd_db', 'mdsal_ovsdb_sb'
Sam Hague [Wed, 11 Feb 2015 01:32:45 +0000 (01:32 +0000)]
Merge topics 'mdsal_ovsd_db', 'mdsal_ovsdb_sb'

* changes:
  Provide some simple getters for getting the client from the ConnectionManager
  Switch to using instanceidentifiers for managed-by and manages references

9 years agoMerge "MD-SAL OVSDB SB - handle deletion of Ovsdb Nodes"
Sam Hague [Wed, 11 Feb 2015 01:31:20 +0000 (01:31 +0000)]
Merge "MD-SAL OVSDB SB - handle deletion of Ovsdb Nodes"

9 years agoMerge "Basic wiring for OVSDB updates"
Sam Hague [Wed, 11 Feb 2015 01:26:32 +0000 (01:26 +0000)]
Merge "Basic wiring for OVSDB updates"

9 years agoMerge "Fix ovsdb-ovs-full-integration-daily"
Sam Hague [Tue, 10 Feb 2015 21:49:13 +0000 (21:49 +0000)]
Merge "Fix ovsdb-ovs-full-integration-daily"

9 years agoMerge "Remove ComponentActivatorAbstractBase from net-virt"
Sam Hague [Tue, 10 Feb 2015 21:47:19 +0000 (21:47 +0000)]
Merge "Remove ComponentActivatorAbstractBase from net-virt"

9 years agoFix ovsdb-ovs-full-integration-daily 19/15119/1
Flavio Fernandes [Tue, 10 Feb 2015 20:00:33 +0000 (15:00 -0500)]
Fix ovsdb-ovs-full-integration-daily

Fix issue introduced in https://git.opendaylight.org/gerrit/#/c/15105/
testGetOpenflowVersion() was not accounting for cases when OVS does not support OF13.

Change-Id: If468e0853ab9038a44c976371d1b99c15f589699
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoProvide some simple getters for getting the client from the ConnectionManager 16/15116/2
Ed Warnicke [Tue, 10 Feb 2015 18:11:37 +0000 (11:11 -0700)]
Provide some simple getters for getting the client from the ConnectionManager

Change-Id: I61908c46869a0427e506ac7770b8ec5fcb10dafa
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoSwitch to using instanceidentifiers for managed-by and manages references 15/15115/2
Ed Warnicke [Tue, 10 Feb 2015 18:10:45 +0000 (11:10 -0700)]
Switch to using instanceidentifiers for managed-by and manages references

This is done because instance-indentifiers are easier to work with :)

Change-Id: I7325caa20029a5ad07743d0455f7bc25e193ff5a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix version used for ../commons/parent/commons 09/15109/1
Flavio Fernandes [Tue, 10 Feb 2015 14:12:16 +0000 (09:12 -0500)]
Fix version used for ../commons/parent/commons

Change-Id: I8a52c915073661c6ebcd1ca2404e8705e7e5acf8
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>