Adding sxp features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-stable-lithium/org.opendaylight.sxp$features/6/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

Signed-off-by: Martin Sunal <msunal@cisco.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index c2e0d8cf7091ed95b50144e0d3df1c2445d2f034..54bc364c549a27cfa3314ac698f6383e9c0f5ebd 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -310,6 +310,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 81cd67dbef92f6f12a4b5faf6419f8aa59718d50..4f1823439495d197e6b2b621178dd625b2d92771 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -71,6 +71,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.snmp4sdn/features-snmp4sdn/${feature.snmp4sdn.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 2e0a4cb795da1ba12727db7b05ba445b5087abeb..a3cf7cc8425b2b443a1522c5fd94fc83506650cb 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -96,6 +96,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.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>

diff --git a/pom.xml b/pom.xml
index 365389224b457a8235e5234c6b4ec10a1e74e4fb..2f9ce09dfec4e1648f7ec9bf047c05ac2a13c424 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     <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.sxp.version>1.1-SNAPSHOT</feature.sxp.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>