X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-it%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftest%2Fsal%2Fbinding%2Fit%2FTestHelper.java;h=5d9576112823e5ffd31697c513c241a7d385c0b2;hp=344694381a222850fb23ccac0cc8415b3296f472;hb=354ad30e58618b4bdec256d7a78bd80284cccc77;hpb=479196a23d56650ffbb9b6983a18cdc5d6b7ef94 diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index 344694381a..5d95761128 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -10,35 +10,40 @@ package org.opendaylight.controller.test.sal.binding.it; import static org.ops4j.pax.exam.CoreOptions.frameworkProperty; import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.systemPackages; import static org.ops4j.pax.exam.CoreOptions.systemProperty; - import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.options.DefaultCompositeOption; import org.ops4j.pax.exam.util.PathUtils; +/** + * @deprecated Use config-it and/or mdsal-it instead. + */ +@Deprecated public class TestHelper { public static final String CONTROLLER = "org.opendaylight.controller"; + public static final String MDSAL = "org.opendaylight.mdsal"; public static final String YANGTOOLS = "org.opendaylight.yangtools"; public static final String CONTROLLER_MODELS = "org.opendaylight.controller.model"; - public static final String YANGTOOLS_MODELS = "org.opendaylight.yangtools.model"; + public static final String MDSAL_MODELS = "org.opendaylight.mdsal.model"; public static Option mdSalCoreBundles() { return new DefaultCompositeOption( // mavenBundle(YANGTOOLS, "concepts").versionAsInProject(), // // mavenBundle(YANGTOOLS, "util").versionAsInProject(), // // - mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // // + mavenBundle(MDSAL, "yang-binding").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // // mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // // mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-common").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "triemap").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // // mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(), // - mavenBundle("com.google.guava", "guava").versionAsInProject(), // // - mavenBundle(YANGTOOLS + ".thirdparty", "xtend-lib-osgi").versionAsInProject() // + mavenBundle("com.google.guava", "guava").versionAsInProject(), + mavenBundle("com.github.romix", "java-concurrent-hash-trie-map").versionAsInProject() ); } @@ -48,44 +53,21 @@ public class TestHelper { bindingAwareSalBundles(), mavenBundle("commons-codec", "commons-codec").versionAsInProject(), - systemProperty("org.osgi.framework.system.packages.extra").value("sun.nio.ch"), - 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(), // + systemPackages("sun.nio.ch", "sun.misc"), mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // // mavenBundle(CONTROLLER, "config-util").versionAsInProject(), // // mavenBundle("commons-io", "commons-io").versionAsInProject(), // - mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // + mavenBundle(CONTROLLER, "config-manager-facade-xml").versionAsInProject(), // mavenBundle(CONTROLLER, "yang-jmx-generator").versionAsInProject(), // mavenBundle(CONTROLLER, "logback-config").versionAsInProject(), // mavenBundle(CONTROLLER, "config-persister-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "netconf-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "ietf-netconf-monitoring").versionAsInProject(), // - mavenBundle(CONTROLLER, "ietf-netconf-monitoring-extension").versionAsInProject(), // - mavenBundle(CONTROLLER, "netconf-monitoring").versionAsInProject(), // - - mavenBundle(CONTROLLER, "netty-config-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "protocol-framework").versionAsInProject(), // - - mavenBundle(CONTROLLER, "netconf-client").versionAsInProject(), // - mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), // - mavenBundle(CONTROLLER, "netconf-netty-util").versionAsInProject(), // - mavenBundle("org.openexi", "nagasena").versionAsInProject(), // - mavenBundle("org.openexi", "nagasena-rta").versionAsInProject(), // - mavenBundle(CONTROLLER + ".thirdparty", "ganymed").versionAsInProject(), // - mavenBundle(CONTROLLER, "netconf-mapping-api").versionAsInProject(), // mavenBundle(CONTROLLER, "config-persister-impl").versionAsInProject(), // mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces", "2.11.0_1"), mavenBundle("org.eclipse.birt.runtime.3_7_1", "org.apache.xml.resolver", "1.2.0"), - mavenBundle(CONTROLLER, "config-netconf-connector").versionAsInProject(), // - mavenBundle(CONTROLLER, "netconf-impl").versionAsInProject(), // - mavenBundle(CONTROLLER, "config-persister-file-xml-adapter").versionAsInProject().noStart(), mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.moxy").versionAsInProject(), mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.core").versionAsInProject()); @@ -99,39 +81,37 @@ public class TestHelper { mavenBundle("org.javassist", "javassist").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-data-api").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "yang-data-util").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-data-impl").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-model-api").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-model-util").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-parser-api").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(), // // - mavenBundle(YANGTOOLS, "binding-model-api").versionAsInProject(), // // - mavenBundle(YANGTOOLS, "binding-generator-util").versionAsInProject(), // mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-type-provider").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-generator-api").versionAsInProject(), mavenBundle(YANGTOOLS, - "binding-generator-spi").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-generator-impl").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-data-codec").versionAsInProject(), - mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // // + mavenBundle(MDSAL, "mdsal-binding-generator-api").versionAsInProject(), // + mavenBundle(MDSAL, "mdsal-binding-generator-util").versionAsInProject(), // + mavenBundle(MDSAL, "mdsal-binding-generator-impl").versionAsInProject(), + mavenBundle(MDSAL, "mdsal-binding-dom-codec").versionAsInProject(), + mavenBundle("org.antlr", "antlr4-runtime").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), // - mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-binding-util").versionAsInProject(), // mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-inmemory-datastore").versionAsInProject(), // / + mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), // + mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // // + + mavenBundle("com.lmax", "disruptor").versionAsInProject(), // mavenBundle(CONTROLLER, "sal-broker-impl").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-dom-config").versionAsInProject(), // // + + mavenBundle(CONTROLLER, "sal-inmemory-datastore").versionAsInProject(), // + mavenBundle(CONTROLLER, "sal-dom-broker-config").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-core-spi").versionAsInProject().update(), // + mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), // - systemProperty("netconf.tcp.address").value("0.0.0.0"), // - systemProperty("netconf.tcp.port").value("18383"), // - systemProperty("netconf.tcp.client.address").value("127.0.0.1"), // - systemProperty("netconf.tcp.client.port").value("18383"), // systemProperty("netconf.config.persister.active").value("1"), // systemProperty("netconf.config.persister.1.storageAdapterClass").value( "org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter"), // @@ -150,29 +130,53 @@ public class TestHelper { } + public static Option protocolFrameworkBundles() { + return new DefaultCompositeOption( + 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, "netty-config-api").versionAsInProject(), // + mavenBundle(CONTROLLER, "protocol-framework").versionAsInProject() + ); + + } + public static Option flowCapableModelBundles() { return new DefaultCompositeOption( // - mavenBundle(CONTROLLER_MODELS, "model-flow-base").versionAsInProject(), // // - mavenBundle(CONTROLLER_MODELS, "model-flow-service").versionAsInProject(), // // mavenBundle(CONTROLLER_MODELS, "model-inventory").versionAsInProject() // ); } + /** + * @return option containing models for testing purposes + */ + public static Option salTestModelBundles() { + return new DefaultCompositeOption( // + mavenBundle(CONTROLLER, "sal-test-model").versionAsInProject() + ); + + } + public static Option baseModelBundles() { return new DefaultCompositeOption( // - mavenBundle(YANGTOOLS_MODELS, "yang-ext").versionAsInProject(), // // - mavenBundle(YANGTOOLS_MODELS, "ietf-inet-types").versionAsInProject(), // // - mavenBundle(YANGTOOLS_MODELS, "ietf-yang-types").versionAsInProject(), // // - mavenBundle(YANGTOOLS_MODELS, "opendaylight-l2-types").versionAsInProject(), // // - mavenBundle(CONTROLLER_MODELS, "model-inventory").versionAsInProject()); + mavenBundle(MDSAL+".model", "yang-ext").versionAsInProject(), + mavenBundle(MDSAL_MODELS, "ietf-type-util").versionAsInProject(), + mavenBundle(MDSAL_MODELS, "ietf-inet-types").versionAsInProject(), + mavenBundle(MDSAL_MODELS, "ietf-yang-types").versionAsInProject(), + mavenBundle(MDSAL_MODELS, "opendaylight-l2-types").versionAsInProject() + ); } public static Option junitAndMockitoBundles() { return new DefaultCompositeOption( // Repository required to load harmcrest (OSGi-fied version). // Mockito - mavenBundle("org.mockito", "mockito-all", "1.9.5"), junitBundles(), + mavenBundle("org.mockito", "mockito-core", "1.10.19"), + mavenBundle("org.objenesis", "objenesis", "2.2"), + junitBundles(), /* * Felix has implicit boot delegation enabled by default. It