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=5ede600d9777917a0df963c01b5a08128057f722;hp=b4f6beaa450b90bf40c800fa1bfee71da19b36a4;hb=ace21ede4027c481d820b40da25b74c73642e5da;hpb=c245145e1e13b6c01d51582cffa6f4f7d07d2f1a 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 b4f6beaa45..5ede600d97 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,10 +1,15 @@ +/* + * 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.repositories; import static org.ops4j.pax.exam.CoreOptions.systemProperty; import org.ops4j.pax.exam.Option; @@ -18,12 +23,11 @@ public class TestHelper { public static final String CONTROLLER_MODELS = "org.opendaylight.controller.model"; public static final String YANGTOOLS_MODELS = "org.opendaylight.yangtools.model"; - private static final String OPENDAYLIGHT_SNAPSHOT = "http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/"; - private static final String OPENDAYLIGHT_RELEASE = "http://nexus.opendaylight.org/content/repositories/opendaylight.release/"; public static Option mdSalCoreBundles() { return new DefaultCompositeOption( // mavenBundle(YANGTOOLS, "concepts").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "util").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-common").versionAsInProject(), // // @@ -38,17 +42,21 @@ public class TestHelper { public static Option configMinumumBundles() { return new DefaultCompositeOption( + mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // // + bindingAwareSalBundles(), mavenBundle("commons-codec", "commons-codec").versionAsInProject(), - mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // // - mavenBundle(CONTROLLER, "protocol-framework").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("commons-io", "commons-io").versionAsInProject(), // - mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // mavenBundle(CONTROLLER, "yang-jmx-generator").versionAsInProject(), // - mavenBundle(CONTROLLER, "yang-store-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "yang-store-impl").versionAsInProject(), // mavenBundle(CONTROLLER, "logback-config").versionAsInProject(), // mavenBundle(CONTROLLER, "config-persister-api").versionAsInProject(), // mavenBundle(CONTROLLER, "netconf-api").versionAsInProject(), // @@ -56,19 +64,19 @@ public class TestHelper { 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 + ".thirdparty", "ganymed", "1.0-SNAPSHOT"), // + 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("io.netty", "netty-handler").versionAsInProject(), // - mavenBundle("io.netty", "netty-codec").versionAsInProject(), // - mavenBundle("io.netty", "netty-buffer").versionAsInProject(), // - mavenBundle("io.netty", "netty-transport").versionAsInProject(), // - mavenBundle("io.netty", "netty-common").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"), @@ -83,12 +91,9 @@ public class TestHelper { 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(CONTROLLER, "sal-binding-util").versionAsInProject(), // + mdSalCoreBundles(), + mavenBundle("org.javassist", "javassist").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-data-api").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-data-impl").versionAsInProject(), // // @@ -96,7 +101,6 @@ public class TestHelper { 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(), // @@ -105,12 +109,20 @@ public class TestHelper { 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(), // - mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // // systemProperty("netconf.tcp.address").value("0.0.0.0"), // systemProperty("netconf.tcp.port").value("18383"), // @@ -122,7 +134,6 @@ public class TestHelper { systemProperty("netconf.config.persister.1.properties.fileStorage") .value(PathUtils.getBaseDir() + "/src/test/resources/controller.xml"), // systemProperty("netconf.config.persister.1.properties.numberOfBackups").value("1") // - //systemProperty("yangstore.blacklist").value(".*controller.model.*") // );