From: Marko <marko.ch.lai@foxconn.com>
Date: Thu, 12 May 2016 03:00:38 +0000 (+0800)
Subject: Adding ocpplugin features
X-Git-Tag: release/boron~60
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=c67e1ddcafd80c46d2a10c8f43533d87eba0f2d6

Adding ocpplugin features
1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/ocpplugin/job/ocpplugin-merge-boron/9/
2) Features Comply with Guidelines:
	https://git.opendaylight.org/gerrit/gitweb?p=ocpplugin.git;a=blob;f=features/src/main/features/features.xml
	a) Feature Names: Prefixed with 'odl-' : odl-ocpplugin-all
	b) Features Descriptions: Present
	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-ocpplugin-all
	b) feature:install odl-restconf-all odl-l2switch-switch odl-mdsal-apidocs odl-dlux-core odl-dlux-all
4) Integration Test Impact - none

Change-Id: I8cddcd3863fafe18eee8d48cd93dc4f8a1bfd54e
Signed-off-by: Marko <marko.ch.lai@foxconn.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 6b657e44..b97ed782 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -264,6 +264,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ocpplugin</groupId>
+      <artifactId>features-ocpplugin</artifactId>
+      <version>${feature.ocpplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 <!-- Issue with of-config merge requires this line commented out:
     <dependency>
       <groupId>org.opendaylight.of-config</groupId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 3e792c73..b9de378e 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -67,6 +67,7 @@
     <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
 <!-- Issue with of-config merge requires this line commented out:
     <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
 -->
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index a848a730..11159f1a 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -93,6 +93,7 @@
         <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
+        <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
 <!-- Issue with of-config merge requires this line commented out
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
 -->
diff --git a/pom.xml b/pom.xml
index 623a06d4..0a690cda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
     <feature.netvirt.version>1.3.0-SNAPSHOT</feature.netvirt.version>
     <feature.nic.version>1.2.0-SNAPSHOT</feature.nic.version>
     <feature.neutron.version>0.7.0-SNAPSHOT</feature.neutron.version>
+    <feature.ocpplugin.version>0.1.0-SNAPSHOT</feature.ocpplugin.version>
     <feature.odlparent.version>1.7.0-SNAPSHOT</feature.odlparent.version>
     <feature.of-config.version>1.1.0-SNAPSHOT</feature.of-config.version>
     <feature.openflowplugin.version>0.3.0-SNAPSHOT</feature.openflowplugin.version>