Split netvirt from ovsdb

Change-Id: I3869b6817140507dd4d0e659af49c33170142114
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 5915d05775d46f822390b513379a7349d60b5293..03fbc25f33faa67783c8a41449ef5a653e83587c 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -229,6 +229,20 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.netvirt</groupId>
+       <artifactId>features-netvirt</artifactId>
+       <version>${feature.netvirt.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.netvirt</groupId>
+       <artifactId>openstack.net-virt-sfc-features</artifactId>
+       <version>${feature.netvirt.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
     <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
@@ -315,13 +329,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt-sfc-features</artifactId>
-      <version>${feature.ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.packetcable</groupId>
       <artifactId>features-packetcable-policy</artifactId>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 11cdd55b7b271deebc4940f0af37903ac54ee75b..0408c685dbb3f9c5f8e1aaf15e7af7d98212c79d 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -63,6 +63,8 @@
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${feature.netconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-restconf/${feature.restconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
 <!-- Issue with of-config merge requires this line commented out:
@@ -75,7 +77,6 @@
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/library-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/${feature.ovsdb.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/southbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/${feature.packetcable.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/${feature.sdninterfaceapp.version}/xml/features</repository>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 9d600c054c5fcaf6434610d4a2698f803344ef09..173fb9aa143c3d9fb3f38689deb5db9edeb23f4b 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -162,8 +162,8 @@
         which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
 -->
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-sfc</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-openstack</feature>
+        <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
+        <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>

diff --git a/pom.xml b/pom.xml
index 926b7827b8743a39b1df448ab9857c9834871021..623a06d478a49fe860107fd920baa859b8108942 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
     <feature.nemo.version>1.1.0-SNAPSHOT</feature.nemo.version>
     <feature.netconf.version>1.1.0-SNAPSHOT</feature.netconf.version>
     <feature.netide.version>0.2.0-SNAPSHOT</feature.netide.version>
+    <feature.netvirt.version>1.3.0-SNAPSHOT</feature.netvirt.version>
     <feature.nic.version>1.2.0-SNAPSHOT</feature.nic.version>
     <feature.neutron.version>0.7.0-SNAPSHOT</feature.neutron.version>
     <feature.odlparent.version>1.7.0-SNAPSHOT</feature.odlparent.version>