From: Anil Vishnoi <vishnoianil@gmail.com>
Date: Tue, 16 Aug 2016 01:36:57 +0000 (-0700)
Subject: Added netvirt sfc translator layer feature from netvirt project
X-Git-Tag: release/carbon~71
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=fb534e242780b851b296ec1fd9b724cca9cfd9af

Added netvirt sfc translator layer feature from netvirt project
to the distribution

Also sort features in features-test.

Change-Id: Id50d666b2365c3ca4e9de0df7fbfb29158977342
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 3a3e2d41d35926ffb07cb8a9b979a0e1ef92fc02)

Change-Id: I0c92f2f5b31521cc9267676a6e8ab2c26bdd2e51
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 2b16ae3d..cbd6a24d 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -74,17 +74,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Remove Armoury from Beryllium release as per as committers consent:
-            https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
-            Need to be uncommented once in Boron
-        <dependency>
-            <groupId>org.opendaylight.armoury</groupId>
-            <artifactId>armoury-features</artifactId>
-            <version>${feature.armoury.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.atrium</groupId>
             <artifactId>atrium-features</artifactId>
@@ -316,6 +305,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netvirt</groupId>
+            <artifactId>openstack.sfc-translator-features</artifactId>
+            <version>${feature.netvirt.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netvirt</groupId>
             <artifactId>vpnservice-features</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index c3f29b28..fe372f8b 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -31,13 +31,9 @@
 
     <!-- Please add new repository in an alphabetical order -->
     <repository>mvn:org.opendaylight.aaa/features-aaa/${feature.aaa.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-authz/${feature.aaa.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-api/${feature.aaa.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-authz/${feature.aaa.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
-    <!-- Remove Armoury from Beryllium release as per as committers consent:
-    https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
-    Need to be uncommented once in Boron -->
-    <!-- <repository>mvn:org.opendaylight.armoury/armoury-features/${feature.armoury.version}/xml/features</repository> -->
     <repository>mvn:org.opendaylight.atrium/atrium-features/${feature.atrium.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>
@@ -73,6 +69,7 @@
     <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.netvirt/openstack.sfc-translator-features/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.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>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 9827b500..c383c457 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -62,11 +62,6 @@
         <feature version='${feature.aaa.version}'>odl-aaa-authz</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
-        <!-- Remove Armoury from Beryllium release as per as committers consent:
-            https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
-            Needs to be uncommented once in Boron
-        <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
-        -->
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
@@ -92,12 +87,12 @@
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <!-- Failed netide merge job makes distribution fail
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
         <feature version='${feature.netide.version}'>odl-netide-app</feature>
         -->
+        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
@@ -109,22 +104,22 @@
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
         <feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
+        <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
+        <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
+        <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
-        <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
-        <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
+        <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
         <feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
         <!-- Issues with yang parser show up in aaa distribution-check
         <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
         -->
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-i2rs</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory-rendering</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
         <feature version='${feature.unimgr.version}'>odl-unimgr</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
@@ -161,16 +156,17 @@
             which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         -->
-        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
         <feature version='${feature.natapp.version}'>odl-natapp</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
         <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-openstack</feature>
+        <feature version='${feature.netvirt.version}'>odl-netvirt-openstack-sfc-translator</feature>
         <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
             which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
         -->
+        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
-        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ios-xe-renderer</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-openflow-renderer</feature>
@@ -179,8 +175,8 @@
         -->
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
-        <feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>
         <feature version='${feature.yang-push.version}'>odl-yangpush</feature>
+        <feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>
     </feature>
 
 </features>