Adding sxp features

1) Pass: https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-master/68/org.opendaylight.sxp$features/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=sxp.git;a=blob;f=features/src/main/resources/features.xml;
	a) Feature Names (prefixed with 'odl-'): odl-sxp-controller
	b) Features Descriptions: Present
	c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-sxp-controller
	b) feature:install odl-sxp-controller, odl-integration-compatible-with-all
4) Integration Test Impact: none

Change-Id: Idae227e46da0bc57dc4802e71c286652b0144ada
Signed-off-by: Martin Mihálek <martin.mihalek@pantheon.sk>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index e4c1ab93be05158f1971af36b50ce4f520099896..b5563de7c6f994bce0601f19df36f5cdc5c31e58 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -316,6 +316,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sxp</groupId>
+      <artifactId>features</artifactId>
+      <version>${feature.sxp.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 22f57723986f8e2439a3195e0fcf680ba57e4229..252b5df9c32af73be27bb3c6e83b31e854986dfe 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -77,6 +77,7 @@
     <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.sxp/features/${feature.sxp.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 6a45cb1043dfbfb63d046deb0224a0466635cd6b..5a24504c691a2e7ea39784dae5796d3de993b94c 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -102,6 +102,7 @@
         <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
+        <feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-framework</feature>

diff --git a/pom.xml b/pom.xml
index 30e61c2246f840919c4141610c8683b7292d7268..815c1889a608fc143d6f21e035966802b0e5977f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
     <feature.reservation.version>1.1.0-SNAPSHOT</feature.reservation.version>
     <feature.sfc.version>0.2.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.2.0-SNAPSHOT</feature.snbi.version>
+    <feature.sxp.version>1.2.0-SNAPSHOT</feature.sxp.version>
     <feature.tcpmd5.version>1.2.0-SNAPSHOT</feature.tcpmd5.version>
     <feature.topoprocessing.version>0.1.0-SNAPSHOT</feature.topoprocessing.version>
     <feature.tsdr.version>1.1.0-SNAPSHOT</feature.tsdr.version>