X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=fd382774983c11fee9bb893b7474db7092458551;hb=da679dfbbc62ba1c33b965ff3ddae39326f5b9a4;hp=47f502a127d3a10d3f39c03d9887342887048e90;hpb=79d0517e3678be391f0b5102a4734e5959292039;p=integration%2Fdistribution.git

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 47f502a1..fd382774 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -116,7 +116,9 @@
         <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>
+        <!-- Issues with yang parser show up in aaa distribution-check
         <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
+        -->
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
@@ -128,8 +130,10 @@
         <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.usecplugin.version}'>odl-usecplugin-api</feature>
-        <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
+
+        <!-- Addition of new features mandates existing usecplugin features to be commented out-->
+        <!--feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature-->
+        <!--feature version='${feature.usecplugin.version}'>odl-usecplugin</feature-->
     </feature>
 
     <!-- Please use alphabetical order for non-compatible features -->
@@ -144,6 +148,9 @@
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-iovisor</feature>
+        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
+        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-and-ofoverlay</feature>
+        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-vpp-mapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ne-location-provider</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-sxp-mapper</feature>
@@ -162,7 +169,7 @@
         -->
         <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
         <feature version='${feature.natapp.version}'>odl-natapp</feature>
-        <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
+        <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-openstack</feature>
         <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
             which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
@@ -172,7 +179,9 @@
         <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>
+        <!-- Issues with yang parser show up in aaa distribution-check
         <feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
+        -->
         <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>