- added missing bundles (md-sal impls)
Change-Id: I7f6227ca7781abcdb0e2bf61f4c7c7e9e39a9a84
Signed-off-by: Michal Rehak <mirehak@cisco.com>
package org.opendaylight.openflowplugin.openflow.md.it;
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;
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;
/**
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
/**
+ * The main wiring is assembled in {@link #ofPluginBundles()}
*/
public abstract class OFPaxOptionsAssistant {
*/
public abstract class OFPaxOptionsAssistant {
+ * Here we construct whole wiring
* @return OFLibrary + OFPlugin bundles
*/
public static Option ofPluginBundles() {
return new DefaultCompositeOption(
* @return OFLibrary + OFPlugin bundles
*/
public static Option ofPluginBundles() {
return new DefaultCompositeOption(
+ mdSalApiBundles(),
+ mdSalImplBundles(),
+ mdSalBaseModelBundles(),
- 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_MODEL, "model-flow-statistics").versionAsInProject(),
mavenBundle(OFPLUGIN_MODEL, "model-flow-base").versionAsInProject(),
mavenBundle(OFPLUGIN_MODEL, "model-flow-service").versionAsInProject(),
/**
* @return sal + dependencymanager
*/
/**
* @return sal + dependencymanager
*/
- public static Option baseSalBundles() {
+ public static Option mdSalApiBundles() {
return new DefaultCompositeOption(
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());
}
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()
+ );
+ }
+
OFPaxOptionsAssistant.osgiConsoleBundles(),
OFPaxOptionsAssistant.loggingBudles(),
OFPaxOptionsAssistant.osgiConsoleBundles(),
OFPaxOptionsAssistant.loggingBudles(),
-
- TestHelper.junitAndMockitoBundles(),
- TestHelper.mdSalCoreBundles(),
- TestHelper.configMinumumBundles(),
- TestHelper.baseModelBundles(),
-
OFPaxOptionsAssistant.ofPluginBundles());
}
OFPaxOptionsAssistant.ofPluginBundles());
}
OFPaxOptionsAssistant.osgiConsoleBundles(),
OFPaxOptionsAssistant.loggingBudles(),
OFPaxOptionsAssistant.osgiConsoleBundles(),
OFPaxOptionsAssistant.loggingBudles(),
-
- TestHelper.junitAndMockitoBundles(),
- TestHelper.mdSalCoreBundles(),
- TestHelper.configMinumumBundles(),
- TestHelper.baseModelBundles(),
-
OFPaxOptionsAssistant.ofPluginBundles());
}
OFPaxOptionsAssistant.ofPluginBundles());
}
*/
@Configuration
public Option[] config() {
*/
@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(),
OFPaxOptionsAssistant.osgiConsoleBundles(),
OFPaxOptionsAssistant.loggingBudles(),
-
- TestHelper.junitAndMockitoBundles(),
- TestHelper.mdSalCoreBundles(),
- TestHelper.configMinumumBundles(),
- TestHelper.baseModelBundles(),
- OFPaxOptionsAssistant.ofLibraryBundles(),
- OFPaxOptionsAssistant.ofPluginBundles()
- );
+ OFPaxOptionsAssistant.ofPluginBundles());
}
private static class TestInventoryListener implements OpendaylightInventoryListener {
}
private static class TestInventoryListener implements OpendaylightInventoryListener {