Adding Group Based Policy features.

1) Feature Tests Pass: https://jenkins.opendaylight.org/groupbasedpolicy/job/group-based-policy-merge/36/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/src/main/resources/features.xml;h=1cf84de9e65ce6983bba8ad96a2c20733337ce22;hb=refs/heads/master
	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-groupbasedpolicy-ofoverlay
4) Integration Test Impact: none

Change-Id: I6c820200f2641ae69b898cba00ff3b0f6309c913
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

diff --git a/features/pom.xml b/features/pom.xml
index 5cc084ee4da76a4a0a227c85644feb955178de2a..07f6eef93fe4743ded4779214f7a42c666fe4c61 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -117,6 +117,12 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>features-groupbasedpolicy</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.snbi</groupId>
       <artifactId>features-snbi</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 9b5facfea4987de1d41c0aab693b948227f17625..c5872021983aae8294bc940e2864c842409ad095 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -51,11 +51,13 @@
     
     <!-- Please add new repository in an alphabetical order -->
     <repository>mvn:org.opendaylight.aaa/features-aaa/0.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.4.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${feature.nsf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.1.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
@@ -64,7 +66,6 @@
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgp.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>
@@ -104,6 +105,14 @@
             <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
         </feature>
 
+    <!-- Since Group Based Policy is not compatible with other flow programming apps,
+         and not compatible with other openstack apps,
+         it is appropriate to create compatible feature for Group Based Policy. -->
+        <feature name='odl-integration-compatible-with-groupbasedpolicy' version='${project.version}'>
+            <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+            <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</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. -->

diff --git a/pom.xml b/pom.xml
index 8a1a69bd954a312d7f2a27d3688d327bd909f9e5..6101fd2c404c9ca0a4cb1c8d7db2947470b23705 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
     <feature.nsf.version>0.4.2-SNAPSHOT</feature.nsf.version>
     <feature.ovsdb.version>1.0.0-SNAPSHOT</feature.ovsdb.version>
     <feature.ovsdb.openstack.version>1.0.0-SNAPSHOT</feature.ovsdb.openstack.version>
+    <feature.groupbasedpolicy.version>0.1.0-SNAPSHOT</feature.groupbasedpolicy.version>
     <feature.lispflowmapping.version>1.1.11-SNAPSHOT</feature.lispflowmapping.version>
     <feature.snbi.version>1.0.0-SNAPSHOT</feature.snbi.version>
     <feature.ttp.version>0.0.1-SNAPSHOT</feature.ttp.version>
@@ -176,6 +177,16 @@
           <type>xml</type>
         </dependency>
 
+        <!-- GBP Features -->
+        <dependency>
+          <groupId>org.opendaylight.groupbasedpolicy</groupId>
+          <artifactId>features-groupbasedpolicy</artifactId>
+          <version>${feature.groupbasedpolicy.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+        </dependency>
+
+
         <dependency>
           <groupId>org.opendaylight.bgpcep</groupId>
           <artifactId>features-bgp</artifactId>