Adding vpnservice features

1) Feature Tests Pass:
https://jenkins.opendaylight.org/releng/job/vpnservice-merge-master/org.opendaylight.vpnservice$vpnservice-features/5/testReport/
2) Features Comply with Guidelines:
https://git.opendaylight.org/gerrit/gitweb?p=vpnservice.git;a=blob;f=features/src/main/features/features.xml;hb=HEAD
        a) Feature Names (prefixed with 'odl-'): odl-vpnservice-core
        b) Features Descriptions: Present
        c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
        a) feature:install odl-vpnservice-core
        b) feature:install odl-vpnservice-core,odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: I77d9187e7f5139dabbec698e7b92bcabfd84ecd6
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 30f2891666a09e5d5d7689e4c11dde27dfd1b1dd..5d36135f1f98ce70dd5015343dd8b82decfb8c63 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -282,6 +282,14 @@
       <type>xml</type>
     </dependency>
 
       <type>xml</type>
     </dependency>
 

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

     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 69060a82f4e305756e383f10b5dedb5997c1894d..79fe085790eb126771f2df1650a954c9a4908587 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -68,4 +68,5 @@
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/didm-features/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/didm-features/${didm.version}/xml/features</repository>

+    <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.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 8e6b1d24dbe0978487f0ffb89042d7beb45bcdac..9cd4040e3c0659b85e3a5b1035ecff8a744f94e7 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -94,6 +94,7 @@
         <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>

+        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>

     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->

diff --git a/pom.xml b/pom.xml
index 732d0d4a257ac5e5801ad0fc8ea5545127bc4321..274dc9015517d64baf7d3cde1556f6aa3495973e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
     <enforcer.version>1.3.1</enforcer.version>
     <snmp.plugin.version>1.0-SNAPSHOT</snmp.plugin.version>
     <didm.version>0.1.0-SNAPSHOT</didm.version>
     <enforcer.version>1.3.1</enforcer.version>
     <snmp.plugin.version>1.0-SNAPSHOT</snmp.plugin.version>
     <didm.version>0.1.0-SNAPSHOT</didm.version>

+    <feature.vpnservice.version>1.0-SNAPSHOT</feature.vpnservice.version>

   </properties>
   <modules>
     <module>distributions/</module>
   </properties>
   <modules>
     <module>distributions/</module>