wired sxp-mapper features to gbp distro

Change-Id: I5fc4ab45ff008c68f08b8d3b38362b3dd3e144f7
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index cf610f6d756eb8b8ae06f5a4165abbb5e1b1c27e..07d2a4beb5e4968ed793a293d88b53787bcae46f 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -136,6 +136,14 @@
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>sxp-mapper</artifactId>
+        <version>${project.version}</version>
+        <type>xml</type>
+        <classifier>config</classifier>
+      </dependency>
+
 
       <!-- GBP features -->
       <dependency>

diff --git a/features/pom.xml b/features/pom.xml
index c3544e869d9ba910898edbd29f08185c50c81cf9..037ab315488aec812af1d8ebe655b3f119a92f13 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -36,6 +36,7 @@
     <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <dlux.version>0.4.0-SNAPSHOT</dlux.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
+    <sxp.version>1.3.0-SNAPSHOT</sxp.version>
   </properties>
 
   <dependencyManagement>
@@ -204,6 +205,25 @@
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
     </dependency>
 
+    <!-- sxp -->
+    <dependency>
+      <groupId>org.opendaylight.sxp</groupId>
+      <artifactId>sxp-api</artifactId>
+      <version>${sxp.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sxp</groupId>
+      <artifactId>sxp-core</artifactId>
+      <version>${sxp.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.sxp</groupId>
+      <artifactId>features</artifactId>
+      <version>${sxp.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
+
     <!-- GBP -->
     <dependency>
       <groupId>commons-net</groupId>
@@ -249,6 +269,10 @@
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>groupbasedpolicy-ui-bundle</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>sxp-mapper</artifactId>
+    </dependency>
 
     <!-- GBP configuration -->
     <dependency>
@@ -305,5 +329,11 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
+    <dependency>
+       <groupId>org.opendaylight.groupbasedpolicy</groupId>
+       <artifactId>sxp-mapper</artifactId>
+       <type>xml</type>
+       <classifier>config</classifier>
+    </dependency>
   </dependencies>
 </project>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index e397abad276369069cd95e702fbdf32a4e8e7f68..4b77ef4c3c06da996a85891f9bda92c65a191e51 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -31,6 +31,8 @@
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by IOvisor Renderer -->
     <repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository>
+    <!-- Repos needed by sxp-mapper -->
+    <repository>mvn:org.opendaylight.sxp/features/${sxp.version}/xml/features</repository>
 
     <!-- The common GBP components -->
     <feature name='odl-groupbasedpolicy-base' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Base Copmonents'>
@@ -100,7 +102,7 @@
         This renderer maps GBP service model to agents of the IOVisor Linux Foundation project.
     -->
     <feature name='odl-groupbasedpolicy-iovisor' version='${project.version}'
-        description='OpenDaylight :: groupbasedpolicy :: IOVisor Renderer'>
+             description='OpenDaylight :: groupbasedpolicy :: IOVisor Renderer'>
         <feature>war</feature>
         <feature version='${aaa.version}'>odl-aaa-authn</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
@@ -157,4 +159,15 @@
         <feature version="${project.version}">odl-groupbasedpolicy-uibackend</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ui-bundle/{{VERSION}}</bundle>
     </feature>
+
+    <!--
+        SXP-MAPPER
+    -->
+    <feature name='odl-groupbasedpolicy-sxp-mapper' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: sxp-mapper'>
+        <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
+        <feature version="${sxp.version}">odl-sxp-core</feature>
+        <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-mapper/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-sxp-mapper.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-mapper/{{VERSION}}/xml/config</configfile>
+    </feature>
 </features>