X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=69c81dec8e73c45498fda8ce4991fafc0dfe2fb5;hb=7d51fc92f1325e272dbb7ba2bf508fac6c5fbb7a;hp=0a3bed4fc66c7f01c13235f723517d4de2e7bf4f;hpb=861a0bf4746d934793e217ac0c0823690a60ff56;p=integration%2Fdistribution.git

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 0a3bed4f..69c81dec 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -57,49 +57,42 @@
 
     <!-- Please use alphabetical order to add a compatible with all features -->
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
-        <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.aaa.version}'>odl-aaa-shiro</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
-        <!-- Remove Armoury from Beryllium release as per as committers consent:
-            https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
-            Needs to be uncommented once in Boron
-        <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
-        -->
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-rsvp</feature>
         <feature version='${feature.capwap.version}'>odl-capwap-ac-rest</feature>
+        <feature version='${feature.cardinal.version}'>odl-cardinal</feature>
         <!-- Commented out because two of the features lead to Yang pares errors.
         <feature version='${feature.centinel.version}'>odl-centinel-core</feature>
         <feature version='${feature.centinel.version}'>odl-centinel-laas</feature>
         <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>
+        <feature version='${feature.eman.version}'>odl-eman</feature>
+        <feature version='${feature.eman.version}'>odl-eman-rest</feature>
+        <feature version='${feature.eman.version}'>odl-eman-ui</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-msmr</feature>
-        <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='${feature.mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
-        <feature version='${feature.natapp.version}'>odl-natapp</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
-        <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
+        <!-- Failed netide merge job makes distribution fail
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
-        <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
-        <!-- Issue with of-config merge requires this line commented out
-        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
+        <feature version='${feature.netide.version}'>odl-netide-app</feature>
         -->
+        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
+        <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-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>
@@ -109,39 +102,37 @@
         <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>
+        <!-- No snapshot artifacts available due to Bug 7404
         <feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
+        -->
+        <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
+        <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
+        <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</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>
-        <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>
+        <feature version='${feature.sfc.version}'>odl-sfclisp</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>
+        -->
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-i2rs</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory-rendering</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
-        <feature version='${feature.unimgr.version}'>odl-unimgr</feature>
         <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>
+        <feature version='${feature.usecplugin.version}'>odl-usecplugin-aaa</feature>
+        <feature version='${feature.usecplugin.version}'>odl-usecplugin-openflow</feature>
     </feature>
 
     <!-- Please use alphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
-        <!-- Commented out, because DIDM brings in Li designed OpenFlowPlugin
-            which leads to BindException.
-            Also, DIDM merge jobs are currently failing.
-        <feature version='${didm.version}'>odl-didm-all</feature>
-        -->
+        <feature version='${feature.atrium.version}'>odl-atrium-all</feature>
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
@@ -165,21 +156,34 @@
             which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         -->
-        <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
+        <!-- The following two Netconf features are incompatible with each other.
+        As CSIT jobs may use either of them, none of them can be in odl-integration-compatible-with-all. -->
+        <feature version='${feature.netconf.version}'>odl-netconf-clustered-topology</feature>
+        <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
+        <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-openstack</feature>
+        <feature version='${feature.netvirt.version}'>odl-netvirt-openstack-sfc-translator</feature>
         <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
             which leads to BindException.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
         -->
+        <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
         <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
+        <!-- Commented out, because it produces OutOfMemoryError in SingleFeature test
         <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.unimgr.version}'>odl-unimgr</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>
         <feature version='${feature.yang-push.version}'>odl-yangpush</feature>
+        <feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>
     </feature>
 
 </features>