Adding capwap features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/capwap-merge-master/4/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=capwap.git;a=blob;f=features/src/main/features/features.xml;h=7a747ce3bd157bde730c475e5f91c010d6aaf877;hb=HEAD
	a) Feature Names: Prefixed with 'odl-' : odl-capwap-ac-rest
	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-capwap-ac-rest
	b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact - none

Change-Id: I7bd315f3bcaf9fbb21003cf978089b803b356b16
Signed-off-by: Navin Agrawal <anavin@gmail.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index c922332164182793fde74a82c591d19da2c266e6..f75b51f298a9498bcce0b2968d4d947ae6f437d2 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -272,6 +272,14 @@
       <type>xml</type>
     </dependency>
 
       <type>xml</type>
     </dependency>
 

+    <dependency>
+      <groupId>org.opendaylight.capwap</groupId>
+      <artifactId>capwap-features</artifactId>
+      <version>${feature.capwap.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+

     <dependency>
       <groupId>org.opendaylight.snmp</groupId>
       <artifactId>features-snmp</artifactId>
     <dependency>
       <groupId>org.opendaylight.snmp</groupId>
       <artifactId>features-snmp</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index f07bd4137f3b9b211f6ae1ca86853723cdff5252..43e146be7597002cc4da8d183434423c12d92659 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -75,4 +75,5 @@
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>

+    <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>

 </features>
 </features>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 3e4ddcba14dd45f7463e07059b88e62b085230e6..7464287d6195544f9846530ce679d6799984b5b3 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -65,6 +65,7 @@
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</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>
         <feature version='${didm.version}'>odl-didm-drivers-api</feature>
         <feature version='${didm.version}'>odl-didm-identification-api</feature>
         <feature version='${didm.version}'>odl-didm-identification</feature>
         <feature version='${didm.version}'>odl-didm-drivers-api</feature>

diff --git a/pom.xml b/pom.xml
index f34d95f7904bce3b8f61f16894bc4ec8c4e77658..054a924fb69da3bc39ef3294f9a5454b3c0be676 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
     <feature.ttp.version>0.1.0-SNAPSHOT</feature.ttp.version>
     <feature.usc.version>1.0-SNAPSHOT</feature.usc.version>
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
     <feature.ttp.version>0.1.0-SNAPSHOT</feature.ttp.version>
     <feature.usc.version>1.0-SNAPSHOT</feature.usc.version>

+    <feature.capwap.version>0.1.0-SNAPSHOT</feature.capwap.version>

     <feature.vtn-manager.version>0.3.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.bgpcep.version>0.4.0-SNAPSHOT</feature.bgpcep.version>
 <!--
     <feature.vtn-manager.version>0.3.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.bgpcep.version>0.4.0-SNAPSHOT</feature.bgpcep.version>
 <!--