Remove ADSAL dependent features from the test repository

They generate delays and memory errors in the SingleFeature test
while they are already deprecated.

On the other hand we cannot remove them from the index repository
because VTN people are currently writing system test and they need
a distribution to verify it.

We will get rid of all ADSAL definitions by M4 offset 2, when VTN
will have their new features migrated to MDSAL.

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

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index e6d02fbd04f36e7e8d14f673b02af29a3fda806e..d20b32dc44e166519217c0a7fe97627022a9a863 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -62,7 +62,9 @@
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-authz</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
+<!--
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
+-->
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
@@ -87,7 +89,9 @@
         <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>
+<!--
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
+-->
         <feature version='0.7.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
@@ -109,9 +113,7 @@
         <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.sxp.version}'>odl-sxp-controller</feature>
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
@@ -147,8 +149,10 @@
 -->
         <feature version='${feature.tsdr.version}'>odl-tsdr-h2-all</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>
+-->
     </feature>
 
 </features>