Rename benchmark feature and repository

This is to reflect Change 30046 (Beryllium controller).
Higher-level odl-mdsal-benchmark feature is referenced now.

Change-Id: I5b3b70a173178a40d0d4ce0acc417894e267544a
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 310ea16f0ef3041b65868b41b2621c6d77a78700..264e9dc1deb888d4a3246f678c2ffea6146d7d5a 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -109,7 +109,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>benchmark-features</artifactId>
+      <artifactId>features-mdsal-benchmark</artifactId>
       <version>${feature.benchmark.version}</version>
       <classifier>features</classifier>
       <type>xml</type>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index da7a2c5a6df77a0a4cfe36fd076a80bbba576a40..4f32fd3c1150eee988a81bfd4aaeaa3d33ac63bc 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -43,7 +43,7 @@
     <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.centinel/centinel-features/${feature.centinel.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/benchmark-features/${feature.benchmark.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/${feature.benchmark.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm-hp/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index bcf5ebfff33a582b2c510908e18259a5e8f4f424..5fc1c37b6469c5099137ed3ad0c165fa9ae179b7 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -80,10 +80,10 @@
         <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
         <feature version='${didm.version}'>odl-didm-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
-        <feature version='${feature.benchmark.version}'>odl-dsbenchmark</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-msmr</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-neutron</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
+        <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
         <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
 <!--
         <feature version='${feature.messaging4transport.version}'>odl-messaging4transport-api</feature>