From: Vijay Anand R <vanandr@cisco.com>
Date: Thu, 21 Jan 2016 07:35:06 +0000 (+0530)
Subject: Adding SNBI features
X-Git-Tag: release/boron~79
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=d11ced44d94e91df1e4a55d3a16cb2dcbd5ef7af

Adding SNBI features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/snbi/job/snbi-merge-beryllium/109/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=snbi.git;a=blob;f=features/src/main/resources/features.xml;h=0bad7bc43d6f1c62004c68848ff9db028b88605d;hb=HEAD
    a) Feature Names (prefixed with 'odl-'): odl-snbi-all
    b) Features Descriptions: Present
    c) Features Start-Levels: No start levels
3) Features Tested: Features have been tested for functionality with
    a) feature:install odl-restconf
    b) feature:install odl-snbi-all
4) Integration Test Impact: None

Change-Id: I8187ad456c47c00df36aec8589374ef983743894
Signed-off-by: Vijay Anand R <vanandr@cisco.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 2eb21f3f..b70dc522 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -348,7 +348,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!--
     <dependency>
       <groupId>org.opendaylight.snbi</groupId>
       <artifactId>features-snbi</artifactId>
@@ -356,7 +355,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
--->
     <dependency>
       <groupId>org.opendaylight.snmp</groupId>
       <artifactId>features-snmp</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 5ee380f7..23dfb32a 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -79,9 +79,7 @@
     <repository>mvn:org.opendaylight.reservation/features-reservation/${feature.reservation.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/1.7.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/${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.sxp/features/${feature.sxp.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 7a89c06c..9fad0eea 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -170,10 +170,8 @@
         <feature version='${feature.nic.version}'>odl-nic-core</feature>
 -->
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-openstack</feature>
-        <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
-<!--
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
--->
+        <feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
         <feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>