Enable DIDM in odl-integration-all

[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 6d3b68b40fd5bc76b4181653f13b9686cc35ce1a..050cd60da5ee25023af846efeea073a077e8bfdc 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -81,8 +81,12 @@
         <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-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
@@ -95,9 +99,7 @@
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
         <feature version='${feature.netide.version}'>odl-netide-app</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.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>
@@ -131,20 +133,13 @@
         <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>
-
-        <!-- Addition of new features mandates existing usecplugin features to be commented out-->
-        <!--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.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>