BUG-2661:Sonar issue

[openflowplugin.git] / openflowplugin-it / src / test / java / org / opendaylight / openflowplugin / openflow / md / it / OFPaxOptionsAssistant.java

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 eba4b87e47b98557e7a84fb8b3703b77b8b09343..0ebcd0116764e9709f8100c4f8efcf51a1d922df 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
@@ -20,13 +20,15 @@ import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
  *
  */
 public abstract class OFPaxOptionsAssistant {
-    
+
     /** system property required to enable osgi console and remote debugging, only presence matters */
     private static final String INSPECT_OSGI = "inspectOsgi";
     /** default remote debug port */
     public static final String DEBUG_PORT = "6000";
     /** base controller package */
     public static final String CONTROLLER = "org.opendaylight.controller";
+    /** base controller.md package */
+    public static final String CONTROLLER_MD = "org.opendaylight.controller.md";
     /** OFLibrary package */
     public static final String OFLIBRARY = "org.opendaylight.openflowjava";
     /** OFLibrary package */
@@ -36,10 +38,10 @@ public abstract class OFPaxOptionsAssistant {
 
     public static final String YANGTOOLS = "org.opendaylight.yangtools";
 
-    
+
     /**
      * Works only if property -DinspectOsgi is used
-     * @return equinox console setup (in order to inspect running IT through osgi console (telnet)) 
+     * @return equinox console setup (in order to inspect running IT through osgi console (telnet))
      * and remote debugging on port {@link #DEBUG_PORT}
      */
     public static Option osgiConsoleBundles() {
@@ -52,7 +54,7 @@ public abstract class OFPaxOptionsAssistant {
             .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject())
             .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject());
         }
-            
+
         return option;
     }
 
@@ -76,7 +78,11 @@ public abstract class OFPaxOptionsAssistant {
                 baseSalBundles(),
                 ofLibraryBundles(),
                 mavenBundle(CONTROLLER_MODEL, "model-flow-statistics").versionAsInProject(),
+                mavenBundle(OFPLUGIN, "openflowplugin-api").versionAsInProject(),
+                mavenBundle(OFPLUGIN, "openflowplugin-extension-api").versionAsInProject(),
                 mavenBundle(OFPLUGIN, "openflowplugin").versionAsInProject(),
+                mavenBundle(CONTROLLER_MD, "forwardingrules-manager").versionAsInProject(),
+                mavenBundle(CONTROLLER_MD, "inventory-manager").versionAsInProject(),
                 mavenBundle("org.openexi", "nagasena").versionAsInProject()
                 );
     }
@@ -86,7 +92,7 @@ public abstract class OFPaxOptionsAssistant {
      */
     public static Option loggingBudles() {
         return new DefaultCompositeOption(
-                mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), 
+                mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
                 mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(),
                 mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(),
                 mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject());
@@ -97,8 +103,8 @@ public abstract class OFPaxOptionsAssistant {
      */
     public static Option baseSalBundles() {
         return new DefaultCompositeOption(
-                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
-                mavenBundle(CONTROLLER, "sal").versionAsInProject(),
+//                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
+//                mavenBundle(CONTROLLER, "sal").versionAsInProject(),
                 mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
 
     }