Clean up features-mdsal-benchmark 06/89406/4
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 26 Apr 2020 20:24:18 +0000 (22:24 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 27 Apr 2020 09:16:24 +0000 (11:16 +0200)
The benchmark features are not really used anywhere. Repurpose them
as features-controller-testing, so that our testing code has an
isolated feature repository.

Change-Id: I18502d99ef133694ee8bb33685af82209b3f57ad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
artifacts/pom.xml
features/features-controller-testing/pom.xml [moved from features/features-mdsal-benchmark/pom.xml with 57% similarity]
features/features-mdsal/pom.xml
features/odl-benchmark-api/pom.xml [deleted file]
features/odl-dsbenchmark/pom.xml [deleted file]
features/odl-mdsal-benchmark/pom.xml
features/odl-ntfbenchmark/pom.xml [deleted file]
features/pom.xml

index 2311567..0dcc60f 100644 (file)
                 <scope>test</scope>
             </dependency>
 
-            <!-- Features -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-controller-experimental</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-mdsal</artifactId>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+
+            <!-- CSIT and other testing Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller-testing</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-benchmark</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-clustering-test-app</artifactId>
 
             <!-- Benchmarks -->
             <dependency>
-               <groupId>${project.groupId}</groupId>
+                <groupId>${project.groupId}</groupId>
                 <artifactId>benchmark-api</artifactId>
                 <version>1.10.0-SNAPSHOT</version>
             </dependency>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>benchmark-features</artifactId>
+                <artifactId>ntfbenchmark</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>rpcbenchmark</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>odl-controller-test-benchmark</artifactId>
                 <version>1.10.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
+            <!-- Expertimental Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller-experimental</artifactId>
+                <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
+                <scope>runtime</scope>
             </dependency>
 
             <!-- Config remnants -->
similarity index 57%
rename from features/features-mdsal-benchmark/pom.xml
rename to features/features-controller-testing/pom.xml
index 21db10a..6c2fdda 100644 (file)
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-mdsal-benchmark</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <artifactId>features-controller-testing</artifactId>
+    <version>1.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>
+    <name>OpenDaylight :: Controller :: Features to support CSIT testing</name>
+    <description>Controller CSIT Features</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>controller-artifacts</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-benchmark-api</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dsbenchmark</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-clustering-test-app</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-benchmark</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-ntfbenchmark</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-
 </project>
index bf1044c..9c46956 100644 (file)
     <packaging>feature</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-clustering-test-app</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
diff --git a/features/odl-benchmark-api/pom.xml b/features/odl-benchmark-api/pom.xml
deleted file mode 100644 (file)
index 255ad1a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
-        <relativePath>../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>odl-benchmark-api</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Benchmark :: API</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-binding-base</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>benchmark-api</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/odl-dsbenchmark/pom.xml b/features/odl-dsbenchmark/pom.xml
deleted file mode 100644 (file)
index 6caab98..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
-        <relativePath>../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>odl-dsbenchmark</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: dsbenchmark</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-benchmark-api</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>dsbenchmark</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
index 9144c32..264fd7a 100644 (file)
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-benchmark</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
-    <name>OpenDaylight :: MD-SAL :: benchmark</name>
+    <name>OpenDaylight :: Controller :: Benchmarks</name>
+    <description>Controller benchmarks</description>
 
     <dependencies>
         <dependency>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-benchmark-api</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
+            <artifactId>benchmark-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-dsbenchmark</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
+            <artifactId>dsbenchmark</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-ntfbenchmark</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
+            <artifactId>ntfbenchmark</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>rpcbenchmark</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-ntfbenchmark/pom.xml b/features/odl-ntfbenchmark/pom.xml
deleted file mode 100644 (file)
index 867d6e4..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
-        <relativePath>../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>odl-ntfbenchmark</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: ntfbenchmark</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-benchmark-api</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>ntfbenchmark</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
index c64b2a5..ad73a98 100644 (file)
     <module>features-controller-experimental</module>
     <module>odl-controller-exp-netty-config</module>
 
-
+    <!-- CSIT features -->
+    <module>features-controller-testing</module>
+    <module>odl-clustering-test-app</module>
+    <module>odl-mdsal-benchmark</module>
 
     <!-- Single features, to be cleaned up -->
-    <module>odl-benchmark-api</module>
-    <module>odl-clustering-test-app</module>
     <module>odl-controller-blueprint</module>
     <module>odl-controller-mdsal-common</module>
     <module>odl-controller-model-topology</module>
-    <module>odl-dsbenchmark</module>
     <module>odl-jolokia</module>
-    <module>odl-mdsal-benchmark</module>
     <module>odl-mdsal-broker-local</module>
     <module>odl-mdsal-broker</module>
     <module>odl-mdsal-clustering-commons</module>
     <module>odl-mdsal-model-inventory</module>
     <module>odl-mdsal-remoterpc-connector</module>
     <module>odl-message-bus-collector</module>
-    <module>odl-ntfbenchmark</module>
     <module>odl-toaster</module>
 
     <!-- Repositories, to be cleaned up -->
     <module>features-extras</module>
     <module>features-mdsal</module>
-    <module>features-mdsal-benchmark</module>
   </modules>
 </project>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.