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=82ad7cffe24d16b42c046b7b1978336d52e43e96;hp=3e3ee3a8742e1af5ca3a14a30382217064e1d931;hb=93d9831455fe58997aa1e70f9e4789f9b76fd8ca;hpb=17796822dcc6f7a00adb60e4e507b40f342d39ec 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 3e3ee3a874..c389618f2e 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 @@ -1,12 +1,20 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ 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.repository; +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; public class TestHelper { @@ -18,33 +26,116 @@ public class TestHelper { public static Option mdSalCoreBundles() { return new DefaultCompositeOption( // - mavenBundle(YANGTOOLS, "concepts").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-common").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // - - mavenBundle("com.google.guava", "guava").versionAsInProject(), // + mavenBundle(YANGTOOLS, "concepts").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "util").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-common").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() // ); } public static Option configMinumumBundles() { return new DefaultCompositeOption( - mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // - mavenBundle("commons-io", "commons-io").versionAsInProject() - ); + mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // // + 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(), // + + mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // // + mavenBundle(CONTROLLER, "config-util").versionAsInProject(), // // + mavenBundle("commons-io", "commons-io").versionAsInProject(), // + mavenBundle(CONTROLLER, "config-manager").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()); + } - + public static Option bindingAwareSalBundles() { return new DefaultCompositeOption( // - mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), - mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // - mavenBundle("org.javassist", "javassist").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject() // + mdSalCoreBundles(), + + mavenBundle("org.javassist", "javassist").versionAsInProject(), // // + + mavenBundle(YANGTOOLS, "yang-data-api").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 + ".thirdparty", "antlr4-runtime-osgi-nohead").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-broker-impl").versionAsInProject(), // // + mavenBundle(CONTROLLER, "sal-core-spi").versionAsInProject().update(), // + + + 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"), // + systemProperty("netconf.config.persister.1.properties.fileStorage") + .value(PathUtils.getBaseDir() + "/src/test/resources/controller.xml"), // + systemProperty("netconf.config.persister.1.properties.numberOfBackups").value("1") // + ); } @@ -58,8 +149,8 @@ public class TestHelper { 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-flow-base").versionAsInProject(), // // + mavenBundle(CONTROLLER_MODELS, "model-flow-service").versionAsInProject(), // // mavenBundle(CONTROLLER_MODELS, "model-inventory").versionAsInProject() // ); @@ -67,22 +158,18 @@ public class TestHelper { 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(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()); } public static Option junitAndMockitoBundles() { return new DefaultCompositeOption( - // Repository required to load harmcrest (OSGi-fied version). - repository("http://repository.springsource.com/maven/bundles/external").id( - "com.springsource.repository.bundles.external"), - - // Mockito - mavenBundle("org.mockito", "mockito-all", "1.9.5"), - junitBundles(), + // Repository required to load harmcrest (OSGi-fied version). + // Mockito + mavenBundle("org.mockito", "mockito-all", "1.9.5"), junitBundles(), /* * Felix has implicit boot delegation enabled by default. It @@ -101,7 +188,7 @@ public class TestHelper { * org/mockito/cglib/proxy/Factory have different Class objects * for the type org/mockito/cglib/ proxy/Callback used in the * signature - * + * * So we disable the bootdelegation. this property has no effect * on the other OSGi implementation. */