move vpnservice back to compatible list

[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 4ad2ba66cc17bee09df2fcbf3ccbf16dbed96736..f30c00211330bdb80affcb0e34d021932d5df662 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -70,6 +70,7 @@
         <feature version='${didm.version}'>odl-didm-identification</feature>
         <feature version='${didm.version}'>odl-didm-drivers-api</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
+        <feature version='${feature.coretutorials.version}'>odl-dsbenchmark-impl</feature>
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
@@ -106,6 +107,7 @@
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
+        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
@@ -123,8 +125,8 @@
         <!--<feature version='0.1.0-SNAPSHOT'>odl-ovsdb-ovssfc</feature>-->
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
-        <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
-        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
+        <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
+        <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
     </feature>
 
 </features>