X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=353daf78dfdcd7d76466d59b55be04c88cf91c16;hb=39eb80214a1b75c4f97c735b06111e95a09befe0;hp=aefcf94c7520d7ff27e05065c6dd332074336b13;hpb=a473b9d0114ab48384659524617d0f14f472568c;p=integration%2Fdistribution.git

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index aefcf94c..353daf78 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -96,7 +96,9 @@
         <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
+<!-- Issue with of-config merge requires this line commented out
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
+-->
         <feature version='0.8.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>
@@ -104,7 +106,6 @@
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-hwvtepsouthbound</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-library</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-sfc</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>
@@ -118,10 +119,7 @@
         <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>
-<!--
-        Commented out as it leads to Yang parser errors.
         <feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
--->
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
         <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
@@ -147,9 +145,10 @@
         which leads to BindException.
         <feature version='${didm.version}'>odl-didm-all</feature>
 -->
-<!--
+        <!-- FAAS has disabled odl-faas-all feature due to timeouts in SingleFeatureTest
         <feature version='${feature.faas.version}'>odl-faas-all</feature>
--->
+        -->
+        <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ui</feature>
@@ -166,13 +165,12 @@
 <!--
         Commented out, because NIC brings in Li designed OpenFlowPlugin
         which leads to BindException.
-        <feature version='${feature.nic.version}'>odl-nic-core</feature>
+        <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.sfc.version}'>odl-sfcofl2</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-openstack</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>