From: Thomas Kee <xsited@yahoo.com>
Date: Sun, 7 Sep 2014 03:11:37 +0000 (-0700)
Subject: Adding packetcable feature
X-Git-Tag: release/lithium-sr2~106
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=04101440d27577f99fbb40eb8a0616d70c175b33;p=integration%2Fdistribution.git

Adding packetcable feature

1) Feature Tests Pass: https://jenkins.opendaylight.org/packetcable/job/packetcable-verify/org.opendaylight.packetcable$features-packetcable/35/consoleText
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=packetcable.git;a=blob;f=features-packetcable/src/main/resources/features.xml
	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-packetcable-all
4) Integration Test Impact: none

Change-Id: Iad97cbef8e5faf17ae1527e23c6a02ae9cb41e41
Signed-off-by: Thomas Kee <xsited@yahoo.com>
---

diff --git a/features/pom.xml b/features/pom.xml
index 4c487b61..c8cad3dd 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -149,6 +149,14 @@
       <type>xml</type>
     </dependency>
 
+    <dependency>
+       <groupId>org.opendaylight.packetcable</groupId>
+       <artifactId>features-packetcable</artifactId>
+       <version>${feature.packetcable.version}</version>
+       <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 00797830..345ec8ef 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -63,11 +63,13 @@
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.0.1-SNAPSHOT/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.ttp/features-ttp/${feature.ttp.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>
@@ -85,6 +87,7 @@
         <feature version='0.0.1-SNAPSHOT'>odl-sfc-all</feature>
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
+        <feature version='${feature.packetcable.version}'>odl-packetcable-all</feature>
     </feature>
 
     <!--
diff --git a/pom.xml b/pom.xml
index 3ffa7994..44e09d30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
     <feature.ttp.version>0.0.1-SNAPSHOT</feature.ttp.version>
     <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>
     <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>
@@ -197,7 +198,6 @@
           <type>xml</type>
        </dependency>
 
-
         <dependency>
           <groupId>org.opendaylight.bgpcep</groupId>
           <artifactId>features-bgp</artifactId>
@@ -215,6 +215,16 @@
           <type>xml</type>
         </dependency>
 
+
+        <!-- packetcable Related Features -->
+        <dependency>
+           <groupId>org.opendaylight.packetcable</groupId>
+           <artifactId>features-packetcable</artifactId>
+           <version>${feature.packetcable.version}</version>
+           <classifier>features</classifier>
+          <type>xml</type>
+        </dependency>
+
         <!-- test to validate features.xml -->
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>