From: thomaslees <thomaslee.s@tcs.com>
Date: Fri, 29 Jul 2016 06:37:42 +0000 (+0530)
Subject: Add usecplugin features
X-Git-Tag: release/boron~23
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=36873be22fa895a3889ced338f0b174a7dfef5df

Add usecplugin features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/usecplugin/job/usecplugin-distribution-boron/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=usecplugin.git;a=blob;f=features/src/main/features/features.xml
	a) Feature Names: odl-usecplugin-aaa, odl-usecplugin-openflow
	b) Features Descriptions: Present
	c) Features Start-Levels: NA
3) Features Tested: Features have been tested for functionality with
	a) feature:install odl-usecplugin-aaa odl-usecplugin-openflow
	b) feature:install odl-usecplugin-aaa odl-usecplugin-openflow, feature:install odl-integration-compatible-with-all
4) Integration Test Impact: Nil

Change-Id: Ica9b99f2c1b9026900e96cfd274be396beb0be8a
Signed-off-by: thomaslees <thomaslee.s@tcs.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 8772d3af..1b851ff8 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -488,7 +488,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Commenting due to faulty feature POM file
         <dependency>
             <groupId>org.opendaylight.usecplugin</groupId>
             <artifactId>usecplugin-features</artifactId>
@@ -496,7 +495,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>features-vtn-manager</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index aa8b9d21..f2b90341 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -100,8 +100,7 @@
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
-    <!--issue with adding new features needs to comment out usecplugin features for time being -->
-    <!--repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository-->
+    <repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yang-push/yangpush-features/${feature.yang-push.version}/xml/features</repository>
 </features>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 6d3b68b4..28b99010 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -131,10 +131,8 @@
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
-
-        <!-- Addition of new features mandates existing usecplugin features to be commented out-->
-        <!--feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature-->
-        <!--feature version='${feature.usecplugin.version}'>odl-usecplugin</feature-->
+        <feature version='${feature.usecplugin.version}'>odl-usecplugin-aaa</feature>
+        <feature version='${feature.usecplugin.version}'>odl-usecplugin-openflow</feature>
     </feature>
 
     <!-- Please use alphabetical order for non-compatible features -->