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=e8a52d069d72825c1cf71a6e9511abc70e900edd;hp=0eace4daaca15973e76e056cb1b923627dfd51b6;hb=6958a923b6da4fb9e74c4050f8d38a7360e03f6d;hpb=4bf903ba60c5bb2b5cdde1c7282e9a93e27e49c8 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 0eace4daac..e8a52d069d 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,8 +23,6 @@ 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( // @@ -38,55 +41,54 @@ public class TestHelper { public static Option configMinumumBundles() { return new DefaultCompositeOption( - mavenBundle("org.opendaylight.bgpcep", "framework").versionAsInProject(), // - mavenBundle("org.opendaylight.bgpcep", "util").versionAsInProject(), // - mavenBundle("commons-codec", "commons-codec").versionAsInProject(), - mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // // + bindingAwareSalBundles(), + mavenBundle("commons-codec", "commons-codec").versionAsInProject(), + + mavenBundle(CONTROLLER, "protocol-framework").versionAsInProject(), // mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // // mavenBundle("commons-io", "commons-io").versionAsInProject(), // - mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // - mavenBundle(CONTROLLER, "config-util").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(), // - + mavenBundle(CONTROLLER, "ietf-netconf-monitoring").versionAsInProject(), // + mavenBundle(CONTROLLER, "ietf-netconf-monitoring-extension").versionAsInProject(), // + mavenBundle(CONTROLLER, "netconf-monitoring").versionAsInProject(), // + mavenBundle(CONTROLLER, "netconf-client").versionAsInProject(), // mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), // - mavenBundle(CONTROLLER + ".thirdparty", "ganymed", "1.0-SNAPSHOT"), // + 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.opendaylight.controller.thirdparty", "exificient", "0.9.2-SNAPSHOT"), // - + 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-adapter").versionAsInProject().noStart()); - + + 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(), // // + mdSalCoreBundles(), + mavenBundle("org.javassist", "javassist").versionAsInProject(), // // - mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-data-api").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-data-impl").versionAsInProject(), // // @@ -94,7 +96,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(), // @@ -103,19 +104,31 @@ 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-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"), // - systemProperty("netconf.config.persister.storageAdapterClass").value( - "org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter"), // - systemProperty("fileStorage").value(PathUtils.getBaseDir() + "/src/test/resources/controller.config"), // - systemProperty("numberOfBackups").value("1") // + 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") // //systemProperty("yangstore.blacklist").value(".*controller.model.*") // ); @@ -170,7 +183,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. */