From 73dbc6bf43b0869bb0ae9ed325079285d3a91e5b Mon Sep 17 00:00:00 2001
From: Steve Dean <sdean@hp.com>
Date: Thu, 5 Mar 2015 09:55:49 -0800
Subject: [PATCH] Adding features to main features.xml in integraion repo

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/integration-distribution-verify-master/5/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=snmp.git;a=blob;f=features/src/main/resources/features.xml
   a) Feature Names (prefixed with 'odl-'): odl-snmp-plugin (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-snmp-plugin
   b) feature:install odl-snmp-plugin, odl-integration-compatible-with-all
4) Integration Test Impact: None

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

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 4373b410..869ecccb 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -45,7 +45,7 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.neutron</groupId>
       <artifactId>features-neutron</artifactId>
       <version>${feature.neutron.version}</version>
       <classifier>features</classifier>
@@ -258,6 +258,13 @@
       <type>xml</type>
     </dependency>
 
+    <dependency>
+      <groupId>org.opendaylight.snmp</groupId>
+      <artifactId>features-snmp</artifactId>
+      <version>${snmp.plugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 
     <!-- test to validate features.xml -->
     <dependency>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index ffd45990..13fbe3cf 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -44,7 +44,7 @@
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.2.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-neutron/${feature.neutron.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin.legacy/features-legacy/${feature.openflowplugin.version}/xml/features</repository>
@@ -65,4 +65,5 @@
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/${feature.topoprocessing.version}/xml/features</repository>
     <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>
 </features>
diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 4dc9de78..f42c02b4 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -68,8 +68,7 @@
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
         <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-northbound</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-implementation</feature>
+        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
         <feature version='0.6.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
@@ -86,10 +85,12 @@
         <feature version='0.1.0-SNAPSHOT'>odl-sfclisp</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfcofl2</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-all</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-framework</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
         <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>
 
     <!-- Please use aphabetical order for non-compatible features -->
diff --git a/pom.xml b/pom.xml
index 4c91350e..187172b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
     <maven.surefire.version>2.16</maven.surefire.version>
     <checkstyle.version>2.13</checkstyle.version>
     <enforcer.version>1.3.1</enforcer.version>
+    <snmp.plugin.version>1.0-SNAPSHOT</snmp.plugin.version>
   </properties>
   <modules>
     <module>distributions/</module>
@@ -263,13 +264,6 @@
            <classifier>features</classifier>
           <type>xml</type>
         </dependency>
-
-        <!-- test to validate features.xml -->
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>features-test</artifactId>
-          <version>${feature.yangtools.version}</version>
-        </dependency>
       </dependencies>
   </dependencyManagement>
   <build>
-- 
2.36.6