Split netvirt from ovsdb

[integration/distribution.git] / features-test / src / main / resources / features.xml

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 6a50d3bf8c83d838052c6bdc64076d8eeae64d4c..173fb9aa143c3d9fb3f38689deb5db9edeb23f4b 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -88,8 +88,6 @@
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
         <feature version='${feature.mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version='${feature.messaging4transport.version}'>odl-messaging4transport-api</feature>
-        <feature version='${feature.messaging4transport.version}'>odl-messaging4transport</feature>
         <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>
@@ -107,7 +105,6 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-library</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>
 <!--
         <feature version="${feature.sdninterfaceapp.version}">odl-sdninterfaceapp-all</feature>
@@ -134,7 +131,6 @@
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
-        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
@@ -166,11 +162,12 @@
         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>
+        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
         <feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>