From a89958c401cd01a4c26bd3833c42750e7582cf60 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 17 Oct 2017 18:05:21 +0200
Subject: [PATCH] Bug 9307: Split features to avoid incompatiblities

Netconf has two implementations of netconf topology service
which can lead to failing SingleFeatureTest if installed together.

Change-Id: I9c80c4dd5c43365d4d46f2b5bf89dd1f0f22f57f
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 artifacts/distribution/pom.xml                |  14 +++
 features/repos/test/pom.xml                   |  12 ++
 features/singles/odl-integration-all/pom.xml  |   5 +-
 .../pom.xml                                   |  91 ++++++++++++++
 .../pom.xml                                   | 119 ++++++++++++++++++
 .../pom.xml                                   |  69 ++--------
 features/singles/pom.xml                      |   2 +
 7 files changed, 251 insertions(+), 61 deletions(-)
 create mode 100644 features/singles/odl-integration-compatible-with-1node/pom.xml
 create mode 100644 features/singles/odl-integration-compatible-with-3node/pom.xml

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index a9bfe1b6..2518793b 100644
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -70,6 +70,20 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-integration-compatible-with-1node</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-integration-compatible-with-3node</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-integration-all</artifactId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 27286f0c..46f1665a 100644
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -57,6 +57,18 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-integration-compatible-with-1node</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-integration-compatible-with-3node</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-integration-all</artifactId>
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index a907c1eb..6380e200 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -24,7 +24,10 @@
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Single feature containing all features separately compatible with odl-integration-compatible-with-all.</description>
+    <description>
+        Single feature containing all features separately compatible with odl-integration-compatible-with-all.
+        TODO: Split out 1node and 3node compatibility classes.
+    </description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
         <license>
diff --git a/features/singles/odl-integration-compatible-with-1node/pom.xml b/features/singles/odl-integration-compatible-with-1node/pom.xml
new file mode 100644
index 00000000..a9301e2a
--- /dev/null
+++ b/features/singles/odl-integration-compatible-with-1node/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
+
+ 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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.0.5</version>
+        <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <artifactId>odl-integration-compatible-with-1node</artifactId>
+    <!-- TODO: Shorter name? -->
+    <version>0.8.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+         build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: integration :: ${project.artifactId}</name>
+    <description>
+        Single feature containing all features compatible with most and with 1node legacy deployments.
+        This should consist of odl-integration-compatible-with-all
+        and additional features which are not compatible with 3node deployments.
+        Typical bundle which should not be installed: org.opendaylight.netconf:netconf-topology-singleton.
+    </description>
+    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <!-- FIXME: Add developers section -->
+    <scm>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-integration-compatible-with-all;hb=HEAD</url>
+        <tag>HEAD</tag>
+    </scm>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>all-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-integration-compatible-with-all</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <!-- User facing single features. Alphabetical order -->
+
+        <!-- Netconf -->
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-callhome-ssh</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-console</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <!-- Unimgr -->
+        <dependency>
+            <groupId>org.opendaylight.unimgr</groupId>
+            <artifactId>odl-unimgr</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/features/singles/odl-integration-compatible-with-3node/pom.xml b/features/singles/odl-integration-compatible-with-3node/pom.xml
new file mode 100644
index 00000000..10182994
--- /dev/null
+++ b/features/singles/odl-integration-compatible-with-3node/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
+
+ 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.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.0.5</version>
+        <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.integration</groupId>
+    <artifactId>odl-integration-compatible-with-3node</artifactId>
+    <!-- TODO: Shorter name? -->
+    <version>0.8.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+         build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: integration :: ${project.artifactId}</name>
+    <description>
+        Single feature containing all features compatible with most and with 3node deployments.
+        This should consist of odl-integration-compatible-with-all
+        and additional features which are not compatible with 1node legacy deployments.
+        Typical bundle which should not be installed: org.opendaylight.netconf:netconf-topology-config.
+    </description>
+    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <!-- FIXME: Add developers section -->
+    <scm>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features/singles/odl-integration-compatible-with-all;hb=HEAD</url>
+        <tag>HEAD</tag>
+    </scm>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>all-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-integration-compatible-with-all</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <!-- User facing single features. Alphabetical order -->
+
+        <!-- GROUPBASEDPOLICY or GBP-->
+        <!-- Commenting this feature because SFT memory issues
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-ios-xe</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-neutron-vpp-mapper</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.groupbasedpolicy</groupId>
+            <artifactId>odl-groupbasedpolicy-vpp</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        -->
+
+        <!-- Honeycomb/VBD -->
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd-rest</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.honeycomb.vbd</groupId>
+            <artifactId>odl-vbd-ui</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <!-- Netconf -->
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-clustered-topology</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index f7f9d61d..8862f28d 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -24,7 +24,13 @@
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Single feature containing all features compatible together.</description>
+    <description>
+        Single feature containing all features compatible with most.
+        If a feature is known to be incompatible with any typical use case,
+        for 1node or 3node deployment, it should not be listed here.
+        See other feature definitions for compatibility details.
+        Note: Even commented-out features should be moved to their appropriate compatibility class.
+    </description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
         <license>
@@ -124,7 +130,7 @@
 
         <!-- Daexim -->
         <dependency>
-	    <groupId>org.opendaylight.daexim</groupId>
+        <groupId>org.opendaylight.daexim</groupId>
             <artifactId>odl-daexim-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
@@ -196,18 +202,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-vpp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-neutron-vpp-mapper</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.groupbasedpolicy</groupId>
             <artifactId>odl-groupbasedpolicy-ui</artifactId>
@@ -226,12 +220,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>odl-groupbasedpolicy-ios-xe</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.groupbasedpolicy</groupId>
             <artifactId>odl-groupbasedpolicy-sxp-ep-provider</artifactId>
@@ -246,26 +234,6 @@
         </dependency>
         -->
 
-        <!-- Honeycomb/VBD -->
-        <dependency>
-            <groupId>org.opendaylight.honeycomb.vbd</groupId>
-            <artifactId>odl-vbd</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.honeycomb.vbd</groupId>
-            <artifactId>odl-vbd-rest</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.honeycomb.vbd</groupId>
-            <artifactId>odl-vbd-ui</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <!-- InfraUtils -->
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
@@ -283,6 +251,7 @@
         </dependency>
 
         <!-- Netconf -->
+        <!-- odl-netconf-callhome-ssh and odl-netconf-console are not compatible with 3node deployment. -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-mdsal</artifactId>
@@ -295,18 +264,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-callhome-ssh</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-console</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf</artifactId>
@@ -456,13 +413,5 @@
             <type>xml</type>
         </dependency>
 
-        <!-- Unimgr -->
-        <dependency>
-            <groupId>org.opendaylight.unimgr</groupId>
-            <artifactId>odl-unimgr</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
     </dependencies>
 </project>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 137d0b91..f472cb0e 100644
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -43,6 +43,8 @@
         <!-- Keep distribution-atrifacts updated. -->
         <module>odl-distribution-version</module>
         <module>odl-integration-compatible-with-all</module>
+        <module>odl-integration-compatible-with-1node</module>
+        <module>odl-integration-compatible-with-3node</module>
         <module>odl-integration-all</module>
     </modules>
 </project>
-- 
2.36.6