Merge "OpenStack Port Chain to Service Function Chain translator"

[netvirt.git] / vpnservice / features / src / main / features / features.xml

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/src/main/features/features.xml
index c5b2b41ba3b08ecbb1f7bdec89a74a9a3800571d..a2416fb5da09bfa4176f09df985548dfc50e2be2 100644 (file)
--- a/vpnservice/features/src/main/features/features.xml
+++ b/vpnservice/features/src/main/features/features.xml
@@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.genius/genius-features/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.infrautils/infrautils-features/{{VERSION}}/xml/features</repository>
 
   <feature name='odl-netvirt-api' version='${project.version}' description='OpenDaylight :: NetVirt :: api'>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
@@ -29,6 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version="${ovsdb.version}">odl-ovsdb-southbound-api</feature>
     <feature version='${ovsdb.version}'>odl-ovsdb-hwvtepsouthbound-api</feature>
     <feature version='${genius.version}'>odl-genius-api</feature>
+    <feature version='${infrautils.version}'>odl-infrautils-counters</feature>
     <bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/model-bgp/{{VERSION}}</bundle>
@@ -39,6 +41,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.netvirt/natservice-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/aclservice-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/ipv6service-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netvirt/elanmanager-api/{{VERSION}}</bundle>
+    <!--<bundle>mvn:org.opendaylight.netvirt/cloud-servicechain-api/{{VERSION}}</bundle>-->
   </feature>
 
   <feature name='odl-netvirt-impl' version='${project.version}' description='OpenDaylight :: NetVirt :: impl'>
@@ -53,18 +57,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.netvirt/bgpmanager-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/bgpmanager-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/vpnmanager-impl/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.genius/interfacemgr-shell/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/fibmanager-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/fibmanager-shell/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/neutronvpn-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/neutronvpn-shell/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/dhcpservice-impl/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.netvirt/elanmanager-api/{{VERSION}}</bundle>
+    <!--<bundle>mvn:org.opendaylight.netvirt/cloud-servicechain-impl/{{VERSION}}</bundle>-->
     <bundle>mvn:org.opendaylight.netvirt/elanmanager-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/natservice-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/aclservice-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/ipv6service-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/ipv6service-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netvirt/statemanager-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
@@ -74,13 +78,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
     <configfile finalname="${configfile.directory}/bgpmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/bgpmanager-impl/{{VERSION}}/xml/config</configfile>
     <configfile finalname="${configfile.directory}/vpnmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/vpnmanager-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="${configfile.directory}/fibmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/fibmanager-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="${configfile.directory}/neutronvpn-impl-default-config.xml">mvn:org.opendaylight.netvirt/neutronvpn-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="${configfile.directory}/dhcpservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/dhcpservice-impl/{{VERSION}}/xml/config</configfile>
     <configfile finalname="${configfile.directory}/elanmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/elanmanager-impl/{{VERSION}}/xml/config</configfile>
     <configfile finalname="${configfile.directory}/natservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/natservice-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="${configfile.directory}/aclservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/aclservice-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="${configfile.directory}/ipv6service-impl-default-config.xml">mvn:org.opendaylight.netvirt/ipv6service-impl/{{VERSION}}/xml/config</configfile>
+    <!--<configfile finalname="${configfile.directory}/cloud-servicechain-impl-default-config.xml">mvn:org.opendaylight.netvirt/cloud-servicechain-impl/{{VERSION}}/xml/config</configfile>-->
   </feature>
 
   <feature name='odl-netvirt-openstack' version='${project.version}' description='OpenDaylight :: NetVirt :: OpenStack'>
@@ -89,4 +89,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version="${restconf.version}">odl-restconf</feature>
   </feature>
 
+  <feature name="odl-netvirt-openstack-it" description="OpenDaylight :: NetVirt :: openStack IT"
+           version='${project.version}'>
+    <feature version="${project.version}">odl-netvirt-openstack</feature>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.ovsdb-it-utils/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netvirt/utils.servicehelper/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netvirt/utils.mdsal-utils/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netvirt/netvirt-it-utils/{{VERSION}}</bundle>
+  </feature>
+
 </features>