Modifying the distributions to use the latest OVSDB bundles.

OVSDB project undertook a major re-architecture at the library layer to provide schema-independent OVS management capability
and it was completed recently. Please refer to  : https://lists.opendaylight.org/pipermail/integration-dev/2014-July/001295.html

This commit brings in the latest bundles that reflects the exact same functionality as in Hydrogen timeframe.

As mentioned in the above email announcement and the prior call for action, VTN project must upgrade their dependencies to the
latest OVSDB bundle versions and use the newer APIs. Without that, the VTN neutron bundle will fail to load due to the missing
dependencies.

Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
index 00ce061992c190b34d7d684aa279662368ea52b7..1d0df25f3ca69da8efe34db36e3c2b1bcb8510ce 100644 (file)
--- a/distributions/base/pom.xml
+++ b/distributions/base/pom.xml
@@ -27,13 +27,28 @@ see https://git.opendaylight.org/gerrit/#/c/390/
     <!-- ovsdb -->
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <artifactId>library</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb.northbound</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <artifactId>plugin</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>northbound</artifactId>
+      <version>0.6.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>schema.openvswitch</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>schema.hardwarevtep</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     
     <!-- openflowplugin -->

diff --git a/distributions/virtualization/pom.xml b/distributions/virtualization/pom.xml
index 5f6e2851d51caf8c06d694368cdd2f98cf6b414d..c71c69b844aaed02457c64bc05a308b15389d181 100644 (file)
--- a/distributions/virtualization/pom.xml
+++ b/distributions/virtualization/pom.xml
@@ -32,8 +32,8 @@ see https://git.opendaylight.org/gerrit/#/c/390/
     <!-- ovsdb --> 
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb.neutron</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <artifactId>neutron</artifactId>
+      <version>0.7.0-SNAPSHOT</version>
     </dependency>
 
     <!-- vtn -->

diff --git a/distributions/virtualization/src/assemble/resources/run.sh b/distributions/virtualization/src/assemble/resources/run.sh
index 1b08fdf0b1462143f54dad3286fc010fd5be9931..fdb56267492048e743bb870419a453c37a24c16e 100755 (executable)
--- a/distributions/virtualization/src/assemble/resources/run.sh
+++ b/distributions/virtualization/src/assemble/resources/run.sh
@@ -30,11 +30,11 @@ if [ "${virt}" == "" ]; then
     usage
 else
     if [ "${virt}" == "ovsdb" ]; then
-        ODL_VIRT_FILTER="opendove|vtn"
+        ODL_VIRT_FILTER="opendove|vtn|affinity"
     elif [ "${virt}" == "opendove" ]; then
         ODL_VIRT_FILTER="ovsdb|vtn"
     elif [ "${virt}" == "vtn" ]; then
-        ODL_VIRT_FILTER="affinity|opendove|ovsdb.ovsdb.neutron|controller.(arphandler|samples)"
+        ODL_VIRT_FILTER="affinity|opendove|ovsdb.neutron|controller.(arphandler|samples)"
     elif [ "${virt}" == "affinity" ]; then
         ODL_VIRT_FILTER="vtn|opendove|controller.samples"
     else