From b40ad6bf857e213e85416484409f864bc4d06900 Mon Sep 17 00:00:00 2001
From: Steve Dean <sdean@hp.com>
Date: Wed, 11 Mar 2015 15:49:12 -0700
Subject: [PATCH] Adding features to main features.xml in integration repo

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/didm/job/didm-merge-master/lastBuild/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=didm.git;a=blob;f=features/src/main/features/features.xml
   a) Feature Names (prefixed with 'odl-'): odl-didm-identification-api, odl-didm-identification, odl-didm-drivers-api (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming)
   b) Features Descriptions: Present (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
   c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
   a) feature:install odl- didm-identification-api
   b) feature:install odl- didm-identification
   c) feature:install odl- didm-drivers-api
   d) feature:install odl- didm-identification-api, didm-identification, didm-drivers-api, odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: Ieb2617a5c44396630bab7a3a792fcec189dfe2b8
Signed-off-by: Steve Dean <sdean@hp.com>
---
 features/index/pom.xml                         | 8 ++++++++
 features/index/src/main/resources/features.xml | 1 +
 features/test/src/main/resources/features.xml  | 3 +++
 pom.xml                                        | 1 +
 4 files changed, 13 insertions(+)

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 869ecccb..bacb55ac 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -266,6 +266,14 @@
       <type>xml</type>
     </dependency>
 
+    <dependency>
+      <groupId>org.opendaylight.didm</groupId>
+      <artifactId>didm-features</artifactId>
+      <version>${didm.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+
     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 13fbe3cf..2951ed11 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -66,4 +66,5 @@
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.didm/didm-features/${didm.version}/xml/features</repository>
 </features>
diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index f45b0e1d..3c821d69 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -90,6 +90,9 @@
         <feature version='0.2.0-SNAPSHOT'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</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>
 
     <!-- Please use aphabetical order for non-compatible features -->
diff --git a/pom.xml b/pom.xml
index 187172b8..61ba3e6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
     <checkstyle.version>2.13</checkstyle.version>
     <enforcer.version>1.3.1</enforcer.version>
     <snmp.plugin.version>1.0-SNAPSHOT</snmp.plugin.version>
+    <didm.version>0.1.0-SNAPSHOT</didm.version>
   </properties>
   <modules>
     <module>distributions/</module>
-- 
2.36.6