Adding controller's adsal-compatibility features

1) Feature Tests Pass: https://jenkins.opendaylight.org/controller/job/controller-merge/2669/org.opendaylight.controller$features-adsal-compatibility/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blob;f=features/adsal-compatibility/src/main/resources/features.xml;h=de939f219acc5bf438e4660a77eafaedc405a90a;hb=HEAD
	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-adsal-compatibility
	b) feature:install odl-integration-compatible-with-l2switch
4) Integration Test Impact AD-SAL integration tests *should* work with this now.
Ping tests will need l2switch.

Note: This was tested with odl-integration-compatible-with-l2switch because
it allows us to do pingall and see the resulting stats, topology, etc
with the AD-SAL rest interface.

Change-Id: Ib56b7c1662cad1eab3992b4e6ac602de3b1f2542
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 9e0ab0c009d2a0c52b0e0d8333aaab30d3984ac9..5616c10b79f6fe18151420de5ff769b81d5b2def 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -56,6 +56,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-adsal-compatibility</artifactId>
+      <version>1.4.2-SNAPSHOT</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 e20c8dc750dfc53213ffcca4b003e9d3bdf225c9..1c543a6a4c3bdd655618faca7d67bfcc57f80ad0 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -53,12 +53,14 @@
     <repository>mvn:org.opendaylight.controller/features-nsf/${feature.nsf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.4.2-SNAPSHOT/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='0.0.3-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+        <feature version='${feature.adsal.version}'>odl-adsal-compatibility</feature>
     </feature>
 
     <!--