Add Reservation to Integration

Patch Set 1: Index
Patch Set 2: Test

Change-Id: Id477199fa01242e43a57ad7b640ce5e462b0e4bc
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 2fb48d3f2c947db8350a4c4ddd89b728ee993b13..3b052137b1de31a4174289846f5c7185c606bd4c 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -227,11 +227,18 @@
        <type>xml</type>
     </dependency>
     <dependency>
-       <groupId>org.opendaylight.packetcable</groupId>
-       <artifactId>features-packetcable-policy</artifactId>
-       <version>${feature.packetcable.version}</version>
-       <classifier>features</classifier>
-       <type>xml</type>
+      <groupId>org.opendaylight.packetcable</groupId>
+      <artifactId>features-packetcable-policy</artifactId>
+      <version>${feature.packetcable.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.reservation</groupId>
+      <artifactId>features-reservation</artifactId>
+      <version>${feature.reservation.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.sdninterfaceapp</groupId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 5d2340ff92601d2e6cbfa22a76816d710ee4d668..2c13eb7c3342a307dece380e635f7d62ba26b120 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -60,6 +60,7 @@
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/${feature.packetcable.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.reservation/features-reservation/${feature.reservation.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/1.5.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc-netconf/${feature.sfc.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index f136811d5f9da3ae38f5b6dde96046a767637dbe..39ac19dfdd53ab87f0ccc651d438820f9c5ba64a 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -87,6 +87,7 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-all</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
+        <feature version='${feature.reservation.version}'>odl-reservation-models</feature>
         <feature version='1.2.0-SNAPSHOT'>odl-restconf</feature>
         <feature version="1.5.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-core</feature>

diff --git a/pom.xml b/pom.xml
index e6665de09f5552fba0cb24fe581a580894659722..cbbe033d7ca30dff34fac42bdc0cfc4a7b44f309 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
     <feature.ovsdb.openstack.version>1.1.0-SNAPSHOT</feature.ovsdb.openstack.version>
     <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.2.0-SNAPSHOT</feature.packetcable.version>
+    <feature.reservation.version>1.0.0-SNAPSHOT</feature.reservation.version>
     <feature.sfc.version>0.1.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
     <feature.tcpmd5.version>1.1.0-SNAPSHOT</feature.tcpmd5.version>