X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fit%2FOFPaxOptionsAssistant.java;h=75c7f7ad8bd2521c62254ce562435de3249e7aa3;hb=refs%2Fchanges%2F76%2F43976%2F1;hp=d037e36f069dea6b89757eb789d4e33d8acb4895;hpb=028c7003efbf1707cbea288645e41e0f65519ad7;p=openflowplugin.git

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 d037e36f06..75c7f7ad8b 100644
--- 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,13 +9,13 @@
 package org.opendaylight.openflowplugin.openflow.md.it;
 
 
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+
 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;
 
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-
 /**
  * The main wiring is assembled in {@link #ofPluginBundles()}
  * @author mirehak
@@ -28,7 +28,7 @@ public abstract class OFPaxOptionsAssistant {
     public static final String DEBUG_PORT = "6000";
     /** base controller package */
     public static final String CONTROLLER = "org.opendaylight.controller";
-    /** base controller.md package */
+    /** base controller md-sal package */
     public static final String CONTROLLER_MD = "org.opendaylight.controller.md";
     /** OFLibrary package */
     public static final String OFLIBRARY = "org.opendaylight.openflowjava";
@@ -54,10 +54,7 @@ public abstract class OFPaxOptionsAssistant {
         if (System.getProperty(INSPECT_OSGI) != null) {
             option
             .add(CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address="+DEBUG_PORT))
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject())
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell").versionAsInProject())
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject())
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject());
+            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject()));
         }
 
         return option;
@@ -68,7 +65,7 @@ public abstract class OFPaxOptionsAssistant {
      */
     public static Option ofLibraryBundles() {
         return new DefaultCompositeOption(
-                mavenBundle(OFLIBRARY, "util").versionAsInProject(),
+                mavenBundle(OFLIBRARY, "openflowjava-util").versionAsInProject(),
                 mavenBundle(OFLIBRARY, "openflow-protocol-impl").versionAsInProject(),
                 mavenBundle(OFLIBRARY, "openflow-protocol-api").versionAsInProject(),
                 mavenBundle(OFLIBRARY, "openflow-protocol-spi").versionAsInProject(),
@@ -81,19 +78,22 @@ public abstract class OFPaxOptionsAssistant {
      */
     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(),
+                mavenBundle(OFPLUGIN, "openflowplugin-common").versionAsInProject(),
                 mavenBundle(OFPLUGIN, "openflowplugin-api").versionAsInProject(),
                 mavenBundle(OFPLUGIN, "openflowplugin-extension-api").versionAsInProject(),
                 mavenBundle(OFPLUGIN, "openflowplugin").versionAsInProject(),
                 mavenBundle(OFPLUGIN_APPS, "forwardingrules-manager").versionAsInProject(),
                 mavenBundle(OFPLUGIN_APPS, "inventory-manager").versionAsInProject(),
-                mavenBundle("org.openexi", "nagasena").versionAsInProject()
+                mavenBundle("openexi", "nagasena").versionAsInProject()
                 );
     }
 
@@ -108,6 +108,24 @@ public abstract class OFPaxOptionsAssistant {
                 mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject());
     }
 
+    /**
+     * @return sal + dependencymanager
+     */
+    public static Option baseSalBundles() {
+        return new DefaultCompositeOption(
+//                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
+//                mavenBundle(CONTROLLER, "sal").versionAsInProject(),
+                mavenBundle("io.netty", "netty-common").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-buffer").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-handler").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-codec").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-transport").versionAsInProject(), //
+
+                mavenBundle(CONTROLLER, "liblldp").versionAsInProject(),
+                mavenBundle(OFPLUGIN_APPS, "topology-lldp-discovery").versionAsInProject(),
+                mavenBundle("org.antlr", "antlr4-runtime").versionAsInProject());
+    }
+
     /**
      * @return sal + dependencymanager
      */
@@ -116,8 +134,7 @@ public abstract class OFPaxOptionsAssistant {
                 TestHelper.junitAndMockitoBundles(),
                 TestHelper.mdSalCoreBundles(),
                 TestHelper.configMinumumBundles(),
-                mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
-
+                mavenBundle("org.antlr", "antlr4-runtime").versionAsInProject());
     }
 
     private static Option mdSalImplBundles() {