Adding neutron features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/neutron/job/neutron-merge-master/org.opendaylight.neutron$features-neutron/22/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=neutron.git;a=blob;f=features/src/main/features/features.xml;h=e54a8068d41e81e9075512e980682c1b39be55fc;hb=HEAD
  a) Feature Names (prefixed with 'odl-'): odl-neutron-service (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming)
  b) Features Descriptions: Present (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
  c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
  a) feature:install odl-neutron-service
  b) feature:install odl-neutron-service, odl-integration-compatible-with-all
4) Integration Test Impact: None

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

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 4373b410b3e2255826d355902181970e574a9792..a9ea0448f68b6310a11edc2b6b7eceae773e9b8d 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -45,7 +45,7 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.neutron</groupId>
       <artifactId>features-neutron</artifactId>
       <version>${feature.neutron.version}</version>
       <classifier>features</classifier>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index ffd45990accdbdb5b6fc4bec77ac41735dc453a7..68a84eff1fabb75bbffe27cfdef1d1f544377238 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -44,7 +44,7 @@
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.2.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-neutron/${feature.neutron.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin.legacy/features-legacy/${feature.openflowplugin.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 4dc9de784dd32ac32d8bc85cce4cc12d93e41bf4..6f35df38361f9343cbcc18a43e9bb449f6287be8 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -68,8 +68,7 @@
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
         <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-northbound</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-implementation</feature>
+        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
         <feature version='0.6.0-SNAPSHOT'>odl-openflowjava-protocol</feature>