Adding library, netvirt-sfc, southbound, hwvtedpsouthbound features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/ovsdb/job/ovsdb-merge-beryllium/
2) Features Comply with Guidelines:  https://git.opendaylight.org/gerrit/gitweb?p=ovsdb.git;a=blob;f=library/features/src/main/features/features.xml;h=07ede6d877df0ad70685d9b5338b3c90ebb9af4e;hb=HEAD
https://git.opendaylight.org/gerrit/gitweb?p=ovsdb.git;a=blob;f=openstack/net-virt-sfc/features/production/src/main/features/features.xml;h=3413bc8d18a02b4a45d38d13aaf1d3b4689ed6b9;hb=HEAD
https://git.opendaylight.org/gerrit/gitweb?p=ovsdb.git;a=blob;f=southbound/southbound-features/src/main/features/features.xml;h=b66393266559ec1f479b6041a4d4346439933b22;hb=HEAD
https://git.opendaylight.org/gerrit/gitweb?p=ovsdb.git;a=blob;f=hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml;h=967a07c36ae80b821bfa68097e494519d100e769;hb=HEAD
	a) Feature Names (prefixed with 'odl-'):
    odl-ovsdb-library
    odl-ovsdb-sfc
    odl-ovsdb-southbound-impl
    odl-ovsdb-hwvtepsouthbound
	b) Features Descriptions: Present
	c) Features Start-Levels: N/A
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-ovsdb-library odl-ovsdb-sfc  odl-ovsdb-southbound-impl odl-ovsdb-hwvtepsouthbound
	b) feature:install odl-ovsdb-library odl-ovsdb-sfc  odl-ovsdb-southbound-impl odl-ovsdb-hwvtepsouthbound odl-integration-compatible-with-all
4) Integration Test Impact: N/A

Change-Id: I631c1ba9ff7f8377c27d594db43cd76868b840ef
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 622f43de874a97c4806c6c219b16aaa898d5b085..99732f09ad4a7a612bfde2924e1ecc1dc5f5ec03 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -235,6 +235,34 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>library-features</artifactId>
+      <version>${feature.ovsdb.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>southbound-features</artifactId>
+      <version>${feature.ovsdb.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>hwvtepsouthbound-features</artifactId>
+      <version>${feature.ovsdb.version}</version>
+      <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 2f4ec8afeca311ccf4718012d4c23e28ae344b74..57e8ef2a56b899dc3baede698ce0c0d64201107d 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -62,6 +62,10 @@
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-li/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
     <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.reservation/features-reservation/${feature.reservation.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/1.6.0-SNAPSHOT/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 293e8244eae749c80821ab3aeaf0a0311d9a195e..d1041af623e59d8cc89cba07c25c2d09e781e06c 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -90,7 +90,10 @@
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-hwvtepsouthbound</feature>
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-library</feature>
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-sfc</feature>
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.reservation.version}'>odl-reservation-models</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
@@ -132,7 +135,7 @@
         <feature version='0.3.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         <feature version='${feature.nic.version}'>odl-nic-core</feature>
-        <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
 <!--
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>

diff --git a/pom.xml b/pom.xml
index c4f053d3f4ac49d038c6152e69467be90ab778c4..ad5bb0f0699bbe70747d64eaae625d1bab7c697e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
     <feature.nsf.version>0.6.0-SNAPSHOT</feature.nsf.version>
     <feature.neutron.version>0.6.0-SNAPSHOT</feature.neutron.version>
     <feature.openflowplugin.version>0.2.0-SNAPSHOT</feature.openflowplugin.version>
-    <feature.ovsdb.openstack.version>1.2.1-SNAPSHOT</feature.ovsdb.openstack.version>
     <feature.ovsdb.version>1.2.1-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.3.0-SNAPSHOT</feature.packetcable.version>
     <feature.reservation.version>1.1.0-SNAPSHOT</feature.reservation.version>