From: subhash kumar singh <subh.singh007@gmail.com>
Date: Thu, 28 Jul 2016 12:10:00 +0000 (+0530)
Subject: Enable DIDM in odl-integration-all
X-Git-Tag: release/boron~20
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=2416b1d6647cc1ef663824560cc145916c5174e2

Enable DIDM in odl-integration-all

Enable DIDM in odl-integration-compatible-with-all and
odl-integration-all.

Change-Id: Ie3b149b473c4ac3d7fd898e159c7257fcafae6ca
Signed-off-by: subhash kumar singh <subh.singh007@gmail.com>
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 0ee87f30..050cd60d 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -81,6 +81,7 @@
         <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>
@@ -139,11 +140,6 @@
     <!-- 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>