Deprecate legacy netvirt features

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

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 875deaa07b9eec19f503bb864236252b758acfce..648c3466e371e14a8b7b9861acb0dd5ff12bf7c0 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -302,27 +302,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Netvirt -->
-            <dependency>
-                <groupId>org.opendaylight.netvirt</groupId>
-                <artifactId>features-netvirt</artifactId>
-                <version>${netvirt.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netvirt</groupId>
-                <artifactId>openstack.net-virt-sfc-features</artifactId>
-                <version>${netvirt.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netvirt</groupId>
-                <artifactId>openstack.sfc-translator-features</artifactId>
-                <version>${netvirt.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netvirt</groupId>
                 <artifactId>vpnservice-features</artifactId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 92a8402174c1557665f4a5ccecae8d3a56c0c366..a1702947b29001253340060fd06bbe3437995f87 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -266,24 +266,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netvirt</groupId>
-            <artifactId>features-netvirt</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netvirt</groupId>
-            <artifactId>openstack.net-virt-sfc-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netvirt</groupId>
-            <artifactId>openstack.sfc-translator-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>vpnservice-features</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index ef3b3e3c083da81b99f1976e8ebc0fa87819d9d5..811d33930a7589a5256b7f4ad903fad975563e5a 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -71,9 +71,6 @@
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netide/netide-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/features-netvirt/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/openstack.sfc-translator-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
     <!-- Temporay remove because of karaf 4

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index f0b525ee39e3463501fd584e7845075a11a2b8ed..4cb16308f8f677812e604dc2c4e4c89efad5a8a6 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -148,14 +148,11 @@
         <feature>odl-netconf-clustered-topology</feature>
         <feature>odl-netconf-connector-ssh</feature>
         <feature>odl-netvirt-openstack</feature>
-        <feature>odl-netvirt-openstack-sfc-translator</feature>
         <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
             which leads to BindException.
         <feature>odl-nic-core-mdsal</feature>
         -->
         <feature>odl-of-config-all</feature>
-        <feature>odl-ovsdb-openstack</feature>
-        <feature>odl-ovsdb-sfc</feature>
         <!-- Commented out, because it produces OutOfMemoryError in SingleFeature test
         <feature>odl-sfc-ios-xe-renderer</feature>
         -->