From cc7d70b6fa32b99e1013c3b3c26006d9798d2b95 Mon Sep 17 00:00:00 2001
From: Tom Pantelis <tompantelis@gmail.com>
Date: Tue, 23 Jan 2018 11:27:08 -0500
Subject: [PATCH] CONTROLLER-1811: Fix IT hang in startup archetype

The IT uses the local karaf distro which adds the feature to
the featuresBoot which seems to cause an issue as the test code
also installs the feature. I also changed the test to just install
the impl feature and not the rest feature as the latter is not needed
for IT.

Change-Id: I471c1c1bef444f528f2703b0931416fb3dfcf6cd
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---
 .../src/main/resources/archetype-resources/it/pom.xml         | 4 ----
 .../java/__packageInPathFormat__/it/__classPrefix__Test.java  | 3 +--
 .../src/main/resources/archetype-resources/pom.xml            | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
index 6115ec4f13..6bb8e7a645 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
@@ -26,10 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <properties>
     <skipITs>false</skipITs>
-    <karaf.distro.groupId>${groupId}</karaf.distro.groupId>
-    <karaf.distro.artifactId>${artifactId}-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>${version}</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
   </properties>
 
   <dependencies>
diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java
index 6f983957b6..cae79de164 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java
@@ -45,7 +45,7 @@ public class ${classPrefix}Test extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
-        return "odl-${artifactId}-rest";
+        return "odl-${artifactId}";
     }
 
     @Override
@@ -58,7 +58,6 @@ public class ${classPrefix}Test extends AbstractMdsalTestBase {
     }
 
     @Test
-    @Ignore // TODO https://jira.opendaylight.org/browse/CONTROLLER-1810
     public void test${artifactId}FeatureLoad() {
         Assert.assertTrue(true);
     }
diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index 98a8ab6e60..3d6ef2fcce 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -35,7 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <module>features</module>
     <module>artifacts</module>
     <module>cli</module>
-    <!-- TODO CONTROLLER-1811 *and* then CONTROLLER-1810: <module>it</module> -->
+    <module>it</module>
   </modules>
 
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-- 
2.36.6