Merge branch 'master' into topic/netvirtsbmerge

[ovsdb.git] / southbound / southbound-it / src / test / java / org / opendaylight / ovsdb / southbound / it / AbstractConfigTestBase.java

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
index 8ae084a4c23ecfafaaf30b600c1049987c95d32e..01043f7da1e20daef3efb93d13d0c79a88e4c646 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
@@ -74,17 +74,25 @@ public abstract class AbstractConfigTestBase {
         return new Option[]{};
     }
 
-    public MavenArtifactUrlReference getKarafDistro() {
-        /*MavenArtifactUrlReference karafUrl = maven()
-                .groupId("org.opendaylight.controller")
-                .artifactId("opendaylight-karaf-empty")
-                .version("1.5.0-SNAPSHOT")
-                .type("zip");*/
-        MavenArtifactUrlReference karafUrl = maven()
-                .groupId("org.opendaylight.ovsdb")
-                .artifactId("southbound-karaf")
-                .version("1.1.0-SNAPSHOT")
-                .type("zip");
+    public MavenArtifactUrlReference getKarafDistro(boolean extras) {
+        MavenArtifactUrlReference karafUrl;
+        if (!extras) {
+            karafUrl = maven()
+                    // karaf-empty is busted
+                    //.groupId("org.opendaylight.controller")
+                    //.artifactId("opendaylight-karaf-empty")
+                    //.version("1.5.0-SNAPSHOT")
+                    .groupId("org.opendaylight.ovsdb")
+                    .artifactId("southbound-karaf")
+                    .version("1.1.0-SNAPSHOT")
+                    .type("zip");
+        } else {
+            karafUrl = maven()
+                    .groupId("org.opendaylight.ovsdb")
+                    .artifactId("karaf")
+                    .version("1.1.0-SNAPSHOT")
+                    .type("zip");
+        }
         return karafUrl;
     }
 
@@ -93,9 +101,9 @@ public abstract class AbstractConfigTestBase {
         LOG.info("Calling config, configTimes: {}", configTimes);
         configTimes++;
         Option[] options = new Option[] {
-                // KarafDistributionOption.debugConfiguration("5005", true),
+                //KarafDistributionOption.debugConfiguration("5005", true),
                 karafDistributionConfiguration()
-                        .frameworkUrl(getKarafDistro())
+                        .frameworkUrl(getKarafDistro(extras))
                         .unpackDirectory(new File("target/exam"))
                         .useDeployFolder(false),
                 keepRuntimeFolder(),