Adding plugin2oc features

1) Feature Tests Pass: https://jenkins.opendaylight.org/plugin2oc/job/plugin2oc-merge/9/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=blob;f=features-plugin2oc/src/main/resources/features.xml;h=1a87f27c04568ba288745a031a01b7b5bb382af1;hb=HEAD
	a) Feature Names: odl-plugin2oc
	b) Features Descriptions: OpenDaylight :: plugin2oc :: Plugin
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-plugin2oc
	b) feature:install odl-integration-compatible-with-plugin2oc

Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>
Change-Id: I8272307614e134bf0018f2dfd779df1930399aec

diff --git a/features/pom.xml b/features/pom.xml
index acb71901de651842bcdc08863061c4670ce14fdc..4bd2fae3ce77bb36d9c406fa984801cb9e84a81c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -96,6 +96,15 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <!-- plugin2oc -->
+    <dependency>
+       <groupId>org.opendaylight.plugin2oc</groupId>
+       <artifactId>features-plugin2oc</artifactId>
+       <version>0.1</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+    </dependency>
+
     <!-- AAA -->
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index efef224238b5396d83879edd9e99ae272298726d..edc1a482c0b08b48e22f85b526ada8b78b9d80ad 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -66,6 +66,7 @@
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.plugin2oc/features-plugin2oc/0.1/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/0.0.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/0.1.3-SNAPSHOT/xml/features</repository>
@@ -116,6 +117,14 @@
             <feature version='0.1.0-SNAPSHOT'>odl-l2switch-switch</feature>
         </feature>
 
+    <!--  plugin2oc Policy is not compatible with other flow programming apps,
+          it is appropriate to create compatible feature for plugin2oc.
+    -->
+        <feature name='odl-integration-compatible-with-plugin2oc' description="OpenDaylight :: plugin2oc :: SouthBound Plugin to the OpenContrail Platform" version='0.1'>
+            <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+            <feature version='0.1'>odl-plugin2oc</feature>
+        </feature>
+
     <!--
           Since ODL supports a few Incompatible Openstack integration such as ovs-openstack and vtn-openstack,
           it is appropriate to create compatible feature for each of the incompatible openstack approaches.

diff --git a/pom.xml b/pom.xml
index 44e09d3028358dbace1f450a875eddbc6dee04f9..08947890b1996fcc26dd6c9cb3a3e7513764bbc9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
     <feature.vtn-manager.version>0.2.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.bgp.version>0.3.1-SNAPSHOT</feature.bgp.version>
     <feature.packetcable.version>1.1-SNAPSHOT</feature.packetcable.version>
+    <feature.plugin2oc.version>0.1</feature.plugin2oc.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>
@@ -215,6 +216,14 @@
           <type>xml</type>
         </dependency>
 
+        <!-- Plugin2oc Related Features -->
+        <dependency>
+          <groupId>org.opendaylight.plugin2oc</groupId>
+          <artifactId>features-plugin2oc</artifactId>
+          <version>0.1</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+        </dependency>
 
         <!-- packetcable Related Features -->
         <dependency>