X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=a07d460481e59c406e7a9d41627abf07b6abdabf;hb=7b18887c40711c98e04c1d0517533fc11ed705c8;hp=e72697b63202efe216af6d8c415405dcf7342265;hpb=5aebfd678d053feadd73e3736170709e09f33b02;p=integration%2Fdistribution.git

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index e72697b6..a07d4604 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -80,9 +80,6 @@
         <feature version='${feature.centinel.version}'>odl-centinel-streamhandler</feature>
         <feature version='${feature.centinel.version}'>odl-centinel-ui</feature>
         -->
-        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
-        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
-        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
         <feature version='${didm.version}'>odl-didm-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${project.version}'>odl-distribution-version</feature>
@@ -103,7 +100,6 @@
         <feature version='${feature.netide.version}'>odl-netide-app</feature>
         -->
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
-        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
@@ -113,7 +109,9 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
+        <!-- Latest change misses a dependency in the feature pom.xml file
         <feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
+        -->
         <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
         <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
@@ -172,8 +170,11 @@
             which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
         -->
+        <!-- netvirt is breaking distribution-check
         <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
+        -->
+        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <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>