Adding features-bgp features

1) Feature Tests Pass: https://jenkins.opendaylight.org/bgpcep/job/bgpcep-verify/org.opendaylight.bgpcep$features-bgp/3144/testReport/
2) Features Comply with Guidelines: bgp/feature/src/main/resources/feature.xml
	a) Feature Names: odl-bgpcep-all - which includes the following: odl-bgpcep-dependencies, odl-bgpcep-controller-config, odl-bgpcep-util, odl-bgpcep-concepts, odl-bgpcep-linkstate, odl-bgpcep-pcep-impl, odl-bgpcep-parser, odl-bgpcep-rib, odl-bgpcep-testtool
	b) Features Descriptions: Present https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description
	c) Features Start-Levels: No start-level
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-bgpcep-all
	b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact: none

Change-Id: I4d78e0a550ad9b1c86e94f5a769de38e4be9b1c0
Signed-off-by: Heath Kesler <hkesler@savoirtech.com>

diff --git a/features/pom.xml b/features/pom.xml
index 824b031b0e811412c589ab014c6a5e5322fd71dc..bb5ecdf8c627f4059b46502acff1864008aa4cac 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -48,6 +48,12 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+       <groupId>org.opendaylight.bgpcep</groupId>
+       <artifactId>features-bgp</artifactId>
+       <classifier>features</classifier>
+       <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index befee2023e2ccda2293e9a14411d03bca22852c7..9a3125d20ebae707f0a74d5a61a5aabba03b3dc8 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -59,22 +59,23 @@
     <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>
-
+    <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>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
-        <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
         <feature version='0.0.3-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+        <feature version='0.5-SNAPSHOT'>odl-openflowjava-protocol</feature>
+        <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
         <feature version='0.0.3-SNAPSHOT'>odl-openflow-nxm-extensions</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-compatibility</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-aaa-all</feature>
-        <feature version='0.5-SNAPSHOT'>odl-openflowjava-protocol</feature>
+        <feature version='${feature.bgp.version}'>odl-bgpcep-all</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
     </feature>
 
-    <!-- 
+    <!--
         * Reason why l2switch has compatibility issues with others:
             l2switch simply provides a simple l2switch among all ports
             this is great for seeing basic functionality like pingall,

diff --git a/pom.xml b/pom.xml
index 91ac9283c4a97c2fae253bfb2efc7303aa08784b..68151d0373e82b25503a880a5c50258dd7af526c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
     <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>
+    <feature.bgp.version>0.3.1-SNAPSHOT</feature.bgp.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>
@@ -172,6 +173,14 @@
           <type>xml</type>
         </dependency>
 
+        <dependency>
+          <groupId>org.opendaylight.bgpcep</groupId>
+          <artifactId>features-bgp</artifactId>
+          <version>${feature.bgp.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+        </dependency>
+
         <!-- OVSDB Related Features -->
         <dependency>
           <groupId>org.opendaylight.ovsdb</groupId>