Add snmp4sdn back to integration

Change-Id: Idd33c65177958ef0148539096f59e1464841bece
Signed-off-by: George Zhao <george.y.zhao@huawei.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 3b052137b1de31a4174289846f5c7185c606bd4c..c2e0d8cf7091ed95b50144e0d3df1c2445d2f034 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -303,6 +303,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.snmp4sdn</groupId>
+      <artifactId>features-snmp4sdn</artifactId>
+      <version>${feature.snmp4sdn.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.tcpmd5</groupId>
       <artifactId>features-tcpmd5</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 2c13eb7c3342a307dece380e635f7d62ba26b120..81cd67dbef92f6f12a4b5faf6419f8aa59718d50 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -70,6 +70,7 @@
     <repository>mvn:org.opendaylight.sfc/features-sfcofl2/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/${feature.snmp4sdn.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/${feature.tcpmd5.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/${feature.topoprocessing.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.tsdr/features-tsdr/${feature.tsdr.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 39ac19dfdd53ab87f0ccc651d438820f9c5ba64a..ae8df9a1c2a672a3d87c9c5f0c322f3e94f5b67a 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -99,6 +99,7 @@
         <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
+        <feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-framework</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>

diff --git a/pom.xml b/pom.xml
index cbbe033d7ca30dff34fac42bdc0cfc4a7b44f309..365389224b457a8235e5234c6b4ec10a1e74e4fb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
     <feature.reservation.version>1.0.0-SNAPSHOT</feature.reservation.version>
     <feature.sfc.version>0.1.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
+    <feature.snmp4sdn.version>0.2.0-SNAPSHOT</feature.snmp4sdn.version>
     <feature.tcpmd5.version>1.1.0-SNAPSHOT</feature.tcpmd5.version>
     <feature.topoprocessing.version>0.0.1-SNAPSHOT</feature.topoprocessing.version>
     <feature.tsdr.version>1.0-SNAPSHOT</feature.tsdr.version>