BUG-837: it unstable (added missing bundles)

 - added missing bundles (md-sal impls)

Change-Id: I7f6227ca7781abcdb0e2bf61f4c7c7e9e39a9a84
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
index 2aa70fb1a2651ff14777de451fc65cd571ae2360..d037e36f069dea6b89757eb789d4e33d8acb4895 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
@@ -9,6 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.it;
 
 
+import org.opendaylight.controller.test.sal.binding.it.TestHelper;
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.options.DefaultCompositeOption;
@@ -16,8 +17,8 @@ import org.ops4j.pax.exam.options.DefaultCompositeOption;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 
 /**
+ * The main wiring is assembled in {@link #ofPluginBundles()}
  * @author mirehak
- *
  */
 public abstract class OFPaxOptionsAssistant {
 
@@ -75,13 +76,15 @@ public abstract class OFPaxOptionsAssistant {
     }
 
     /**
+     * Here we construct whole wiring
      * @return OFLibrary + OFPlugin bundles
      */
     public static Option ofPluginBundles() {
         return new DefaultCompositeOption(
-                baseSalBundles(),
+                mdSalApiBundles(),
+                mdSalImplBundles(),
+                mdSalBaseModelBundles(),
                 ofLibraryBundles(),
-                mavenBundle(CONTROLLER_MODEL, "model-inventory").versionAsInProject(),
                 mavenBundle(OFPLUGIN_MODEL, "model-flow-statistics").versionAsInProject(),
                 mavenBundle(OFPLUGIN_MODEL, "model-flow-base").versionAsInProject(),
                 mavenBundle(OFPLUGIN_MODEL, "model-flow-service").versionAsInProject(),
@@ -108,12 +111,26 @@ public abstract class OFPaxOptionsAssistant {
     /**
      * @return sal + dependencymanager
      */
-    public static Option baseSalBundles() {
+    public static Option mdSalApiBundles() {
         return new DefaultCompositeOption(
-//                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
-//                mavenBundle(CONTROLLER, "sal").versionAsInProject(),
+                TestHelper.junitAndMockitoBundles(),
+                TestHelper.mdSalCoreBundles(),
+                TestHelper.configMinumumBundles(),
                 mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
 
     }
 
+    private static Option mdSalImplBundles() {
+        return new DefaultCompositeOption(
+                TestHelper.bindingAwareSalBundles()
+        );
+    }
+
+    private static Option mdSalBaseModelBundles() {
+        return new DefaultCompositeOption(
+                TestHelper.baseModelBundles(),
+                mavenBundle(CONTROLLER_MODEL, "model-inventory").versionAsInProject()
+        );
+    }
+
 }

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
index 60a8002bf60ae2cb53e228dd2928a1614ef71f76..c91c1374a61df41e95e5984f4b3fd9917a76a181 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
@@ -248,12 +248,6 @@ public class OFPluginFlowTest {
 
                 OFPaxOptionsAssistant.osgiConsoleBundles(),
                 OFPaxOptionsAssistant.loggingBudles(),
-
-                TestHelper.junitAndMockitoBundles(),
-                TestHelper.mdSalCoreBundles(),
-                TestHelper.configMinumumBundles(),
-                TestHelper.baseModelBundles(),
-
                 OFPaxOptionsAssistant.ofPluginBundles());
     }
 

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
index a565e7a4fc8e9622721d8c4edd65a5ef490b45a8..bc02caee38a92584be98da6eb0a7d9349fa3fc89 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
@@ -229,12 +229,6 @@ public class OFPluginToLibraryTest {
 
                 OFPaxOptionsAssistant.osgiConsoleBundles(),
                 OFPaxOptionsAssistant.loggingBudles(),
-
-                TestHelper.junitAndMockitoBundles(),
-                TestHelper.mdSalCoreBundles(),
-                TestHelper.configMinumumBundles(),
-                TestHelper.baseModelBundles(),
-
                 OFPaxOptionsAssistant.ofPluginBundles());
     }
 

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
index 9f9b41e23e565d464a43f97dd1f4a0e67cc548a8..f7483aa3b2c834885b61dd3848da729c3b81e572 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
@@ -143,17 +143,14 @@ public class SalIntegrationTest {
      */
     @Configuration
     public Option[] config() {
-        return options(systemProperty("osgi.console").value("2401"),
+        return options(
+                systemProperty("osgi.console").value("2401"),
+                systemProperty("osgi.bundles.defaultStartLevel").value("4"),
+                systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+
                 OFPaxOptionsAssistant.osgiConsoleBundles(),
                 OFPaxOptionsAssistant.loggingBudles(),
-
-                TestHelper.junitAndMockitoBundles(),
-                TestHelper.mdSalCoreBundles(),
-                TestHelper.configMinumumBundles(),
-                TestHelper.baseModelBundles(),
-                OFPaxOptionsAssistant.ofLibraryBundles(),
-                OFPaxOptionsAssistant.ofPluginBundles()
-                );
+                OFPaxOptionsAssistant.ofPluginBundles());
     }
 
     private static class TestInventoryListener implements OpendaylightInventoryListener {