From: Anandhi <anandhi.manikantan@hpe.com>
Date: Wed, 11 Nov 2015 22:19:50 +0000 (-0800)
Subject: Fixed all feature installation problems for DIDM.Hence uncommented the didm features... 
X-Git-Tag: release/beryllium~45
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6f015fa8d5f9a9ab91179610b291219161051fbe;p=integration%2Fdistribution.git

Fixed all feature installation problems for DIDM.Hence uncommented the didm features from integration and renamed them as needed.
Added required config files to DIDM project
Modified didm artifacts to reflect the right artifact for didm-identification
Added required dependencies in feature pom for didm-identification bundle

Change-Id: I311e118557402a5c3f0b85f7f46a4d342b453fb4
Signed-off-by: Anandhi <anandhi.manikantan@hpe.com>
---

diff --git a/features/index/pom.xml b/features/index/pom.xml
index ef7b3360..ce3727c8 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -123,14 +123,14 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.didm</groupId>
-      <artifactId>didm-features</artifactId>
+      <artifactId>features-didm</artifactId>
       <version>${didm.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.didm.hp</groupId>
-      <artifactId>features-hp</artifactId>
+      <groupId>org.opendaylight.didm</groupId>
+      <artifactId>features-didm-hp</artifactId>
       <version>${didm.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index e4454fdd..fad00ed0 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -44,8 +44,8 @@
     <repository>mvn:org.opendaylight.centinel/centinel-features/${feature.centinel.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/benchmark-features/${feature.benchmark.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm/didm-features/${didm.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm.hp/features-hp/${didm.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.didm/features-didm/${didm.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.didm/features-didm-hp/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.faas/features-faas/${feature.faas.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 9e7711e7..24091c01 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -78,12 +78,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-identification-api</feature>
-        <feature version='${didm.version}'>odl-didm-identification</feature>
-        <feature version='${didm.version}'>odl-didm-drivers-api</feature>
-        <feature version='${didm.version}'>odl-didm-hp3800</feature>
--->
+        <feature version='${didm.version}'>odl-didm-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${feature.benchmark.version}'>odl-dsbenchmark</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-msmr</feature>