From: Claudio D. Gasparini <cgaspari@cisco.com>
Date: Mon, 19 Oct 2015 14:34:34 +0000 (+0200)
Subject: Bug-2230: RSVP plugin integration
X-Git-Tag: release/beryllium~63
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6fb5d3a67fb762f59d407e46a25c4778dba79798;p=integration%2Fdistribution.git

Bug-2230: RSVP plugin integration

-integrate RSVP with ODL karaf distribution
-added "odl-bgppcep-rsvp" feature

Change-Id: I576d01f850bc5076afd73eb75cf040751dd72e66
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>
---

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 15dc3655..4fb41630 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -86,6 +86,13 @@
        <version>${feature.bgpcep.version}</version>
        <type>xml</type>
     </dependency>
+    <dependency>
+       <groupId>org.opendaylight.bgpcep</groupId>
+       <artifactId>features-rsvp</artifactId>
+       <classifier>features</classifier>
+       <version>${feature.bgpcep.version}</version>
+       <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.capwap</groupId>
       <artifactId>capwap-features</artifactId>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 7b30a66b..fb0fe6c5 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -39,6 +39,7 @@
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/${feature.bgpcep.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bgpcep/features-rsvp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 48000fff..d6488b2f 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -68,6 +68,7 @@
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
+        <feature version='${feature.bgpcep.version}'>odl-bgpcep-rsvp</feature>
         <feature version='${feature.capwap.version}'>odl-capwap-ac-rest</feature>
         <feature version='${didm.version}'>odl-didm-identification-api</feature>
         <feature version='${didm.version}'>odl-didm-identification</feature>