X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=08a4fc0d4f7a6fc00c9fe7de36e70d8cfe30e559;hb=c0763b99cfb5922258a3356608f3ad2349d583a8;hp=02848e8f7c7e23452c45e8ba2cd9ae32b3adaa5e;hpb=bc80de1d83ff5d41d3f3989d2a7b4c798d286d54;p=integration%2Fdistribution.git

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 02848e8f..08a4fc0d 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -57,11 +57,11 @@
 
     <!-- Please use alphabetical order to add a compatible with all features -->
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-api</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-authn</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-authz</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-api</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-authn</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-authz</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <!-- Remove Armoury from Beryllium release as per as committers consent:
         https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
@@ -87,7 +87,7 @@
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-neutron</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
-        <feature version='1.4.0-SNAPSHOT'>odl-mdsal-broker</feature>
+        <feature version='${feature.mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${feature.messaging4transport.version}'>odl-messaging4transport-api</feature>
         <feature version='${feature.messaging4transport.version}'>odl-messaging4transport</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
@@ -96,21 +96,21 @@
         <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>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
         <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>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
 <!--
-        <feature version="1.7.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>
+        <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>
@@ -118,10 +118,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>
@@ -137,7 +134,6 @@
         <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>
-        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
@@ -147,17 +143,18 @@
         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>
         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
-        <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>
+        <feature version='${feature.l2switch.version}'>odl-l2switch-switch</feature>
+        <feature version='${feature.l2switch.version}'>odl-l2switch-switch-rest</feature>
+        <feature version='${feature.l2switch.version}'>odl-l2switch-switch-ui</feature>
 <!--
         Commented out, because LACP brings in Li designed OpenFlowPlugin
         which leads to BindException.
@@ -166,14 +163,14 @@
 <!--
         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.tsdr.version}'>odl-tsdr-h2-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-core</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>