Adding VTN features

1) Feature Tests Pass:
https://jenkins.opendaylight.org/vtn/job/vtn-merge/288/org.opendaylight.vtn$features-vtn-manager/testReport/
2) Features Comply with Guidelines:
https://git.opendaylight.org/gerrit/gitweb?p=vtn.git;a=blob;f=manager/features/src/main/resources/features.xml;h=739547ea5b3386631356c2dcf73b5cc1316f40db
    a) Feature Names: Prefixed with 'odl-' :
https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming
    b) Features Descriptions: Present
https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description
    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-vtn-manager-all
    b) feature:install odl-integration-compatible-with-vtn-manager
4) Integration Test Impact: VTN integration tests should work with this.

Change-Id: I230a868221d4894a05bb84a41b8a7015932b5f26
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>

diff --git a/features/pom.xml b/features/pom.xml
index fd67f99d293d1287a2b21dc4f2758aa3b6edda8a..824b031b0e811412c589ab014c6a5e5322fd71dc 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -91,6 +91,12 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.vtn</groupId>
+      <artifactId>features-vtn-manager</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 71de0f5b1d128f45a06bd1f2e4a87dd51fa5d4bb..befee2023e2ccda2293e9a14411d03bca22852c7 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -58,6 +58,8 @@
     <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa/0.1.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
+
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
         <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
         <feature version='1.1-SNAPSHOT'>odl-restconf</feature>
@@ -92,4 +94,12 @@
             <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
            <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
        </feature>
+
+    <!-- Since VTN Manager is not compatible with other flow programming apps,
+         and not compatible with other openstack apps,
+         it is appropriate to create compatible feature for VTN Manager. -->
+    <feature name='odl-integration-compatible-with-vtn-manager' version='${project.version}'>
+        <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+        <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
+    </feature>
 </features>

diff --git a/pom.xml b/pom.xml
index a0340dacab22c2be28e4e7fc9a4377677274d0f4..91ac9283c4a97c2fae253bfb2efc7303aa08784b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
     <feature.ovsdb.version>1.0.0-SNAPSHOT</feature.ovsdb.version>
     <feature.ovsdb.openstack.version>1.0.0-SNAPSHOT</feature.ovsdb.openstack.version>
     <feature.lispflowmapping.version>1.1.11-SNAPSHOT</feature.lispflowmapping.version>
+    <feature.vtn-manager.version>0.2.0-SNAPSHOT</feature.vtn-manager.version>
     <karaf.branding.version>1.0.0-SNAPSHOT</karaf.branding.version>
     <karaf.version>3.0.1</karaf.version>
     <maven.surefire.version>2.16</maven.surefire.version>
@@ -162,6 +163,14 @@
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
+        <!-- VTN Features -->
+        <dependency>
+          <groupId>org.opendaylight.vtn</groupId>
+          <artifactId>features-vtn-manager</artifactId>
+          <version>${feature.vtn-manager.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+        </dependency>
 
         <!-- OVSDB Related Features -->
         <dependency>