Add odl-faas-base feature into distribution.

[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 68d9dedda1c50a71968afdaba00dfcba2413180a..7a89c06c5df921fc8f6b35d5d057931beb47c2fd 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -147,9 +147,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>
@@ -158,7 +159,11 @@
         <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch</feature>
         <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
         <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
+<!--
+        Commented out, because LACP brings in Li designed OpenFlowPlugin
+        which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
+-->
 <!--
         Commented out, because NIC brings in Li designed OpenFlowPlugin
         which leads to BindException.
@@ -169,7 +174,7 @@
 <!--
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
 -->
-        <feature version='${feature.tsdr.version}'>odl-tsdr-h2-all</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>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>