X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fit%2Fpax%2FIdentityRefNetconfTest.java;h=c54285bc908c817157287022d5dcc92011b0d145;hb=566366999b698db162e61b034750e798f133b2ac;hp=4e536c43bd4d3b792d7f7abcc6283bf5cdc3cf90;hpb=c0c97bdca0c42607e8034bc91f51edf96d9e72a9;p=controller.git diff --git a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java index 4e536c43bd..c54285bc90 100644 --- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java +++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java @@ -1,12 +1,13 @@ /* - * Copyright (c) 2013 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 - */ +* Copyright (c) 2013 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.netconf.it.pax; +import static org.junit.Assert.fail; import static org.opendaylight.controller.test.sal.binding.it.TestHelper.baseModelBundles; import static org.opendaylight.controller.test.sal.binding.it.TestHelper.bindingAwareSalBundles; import static org.opendaylight.controller.test.sal.binding.it.TestHelper.configMinumumBundles; @@ -15,20 +16,27 @@ import static org.opendaylight.controller.test.sal.binding.it.TestHelper.junitAn import static org.opendaylight.controller.test.sal.binding.it.TestHelper.mdSalCoreBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.streamBundle; +import static org.ops4j.pax.exam.CoreOptions.systemPackages; import static org.ops4j.pax.exam.CoreOptions.systemProperty; +import io.netty.channel.nio.NioEventLoopGroup; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; -import javax.inject.Inject; import javax.xml.parsers.ParserConfigurationException; -import com.google.common.base.Preconditions; -import io.netty.channel.nio.NioEventLoopGroup; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.matchers.JUnitMatchers; import org.junit.runner.RunWith; import org.opendaylight.controller.netconf.api.NetconfMessage; -import org.opendaylight.controller.netconf.client.NetconfClient; import org.opendaylight.controller.netconf.client.NetconfClientDispatcher; +import org.opendaylight.controller.netconf.client.test.TestingNetconfClient; +import org.opendaylight.controller.netconf.util.test.XmlFileLoader; import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.ops4j.pax.exam.Configuration; @@ -36,22 +44,25 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.options.DefaultCompositeOption; import org.ops4j.pax.exam.util.Filter; -import org.w3c.dom.Document; +import org.ops4j.pax.tinybundles.core.TinyBundles; +import org.osgi.framework.Constants; import org.xml.sax.SAXException; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetSocketAddress; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; +import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; +@Ignore @RunWith(PaxExam.class) public class IdentityRefNetconfTest { - public static final int CLIENT_CONNECTION_TIMEOUT_MILLIS = 5000; + public static final int CLIENT_CONNECTION_TIMEOUT_MILLIS = 15000; // Wait for controller to start - @Inject + + // FIXME move this (pax) test to different module + // pax jars contain guava classes that clash with real guava dependencies in non-pax tests + // + //@Inject @Filter(timeout = 60 * 1000) BindingAwareBroker broker; @@ -61,12 +72,30 @@ public class IdentityRefNetconfTest { systemProperty("osgi.console").value("2401"), systemProperty("osgi.bundles.defaultStartLevel").value("4"), systemProperty("pax.exam.osgi.unresolved.fail").value("true"), + systemPackages("sun.nio.ch"), testingModules(), loggingModules(), mdSalCoreBundles(), bindingAwareSalBundles(), configMinumumBundles(), baseModelBundles(), flowCapableModelBundles(), - junitAndMockitoBundles()); + junitAndMockitoBundles(), + + // Classes from test-jars bundled for pax-exam test + streamBundle(TinyBundles.bundle() + .add(TestingNetconfClient.class) + .add(XmlFileLoader.class) + + .add("/netconfMessages/editConfig_identities.xml", + XmlFileLoader.class.getResource("/netconfMessages/editConfig_identities.xml")) + .add("/netconfMessages/commit.xml", + XmlFileLoader.class.getResource("/netconfMessages/commit.xml")) + .add("/netconfMessages/getConfig.xml", + XmlFileLoader.class.getResource("/netconfMessages/getConfig.xml")) + + .set(Constants.BUNDLE_SYMBOLICNAME, "TestingClient_bundle") + .set(Constants.EXPORT_PACKAGE, "org.opendaylight.controller.netconf.client.test, " + + "org.opendaylight.controller.netconf.util.test") + .build(TinyBundles.withBnd()))); } private Option loggingModules() { @@ -74,7 +103,11 @@ public class IdentityRefNetconfTest { mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), - mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject()); + mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), + mavenBundle("org.opendaylight.controller.thirdparty", "nagasena").versionAsInProject(), + mavenBundle("org.opendaylight.controller.thirdparty", "nagasena-rta").versionAsInProject()); + + } private Option testingModules() { @@ -96,20 +129,22 @@ public class IdentityRefNetconfTest { NetconfMessage commit = xmlFileToNetconfMessage("netconfMessages/commit.xml"); NetconfMessage getConfig = xmlFileToNetconfMessage("netconfMessages/getConfig.xml"); - try (NetconfClient netconfClient = new NetconfClient("client", tcpAddress, CLIENT_CONNECTION_TIMEOUT_MILLIS, clientDispatcher)) { + try (TestingNetconfClient netconfClient = new TestingNetconfClient("client", tcpAddress, CLIENT_CONNECTION_TIMEOUT_MILLIS, clientDispatcher)) { sendMessage(edit, netconfClient); sendMessage(commit, netconfClient); sendMessage(getConfig, netconfClient, "id-test", - "prefix:test-identity1", - "prefix:test-identity2", - "prefix:test-identity2", - "prefix:test-identity1"); + "prefix:test-identity1", + "prefix:test-identity2", + "prefix:test-identity2", + "prefix:test-identity1"); + + clientDispatcher.close(); + } catch (Exception e) { + fail(Throwables.getStackTraceAsString(e)); } - - clientDispatcher.close(); } - private void sendMessage(NetconfMessage edit, NetconfClient netconfClient, String... containingResponse) + private void sendMessage(NetconfMessage edit, TestingNetconfClient netconfClient, String... containingResponse) throws ExecutionException, InterruptedException, TimeoutException { NetconfMessage response = netconfClient.sendRequest(edit).get(); if (containingResponse == null) { @@ -123,16 +158,6 @@ public class IdentityRefNetconfTest { public static NetconfMessage xmlFileToNetconfMessage(final String fileName) throws IOException, SAXException, ParserConfigurationException { - return new NetconfMessage(xmlFileToDocument(fileName)); - } - - public static Document xmlFileToDocument(final String fileName) throws IOException, SAXException, - ParserConfigurationException { - // TODO xml messages from netconf-util test-jar cannot be loaded here(in OSGi), since test jar is not a bundle - try (InputStream resourceAsStream = IdentityRefNetconfTest.class.getClassLoader().getResourceAsStream(fileName)) { - Preconditions.checkNotNull(resourceAsStream); - final Document doc = XmlUtil.readXmlToDocument(resourceAsStream); - return doc; - } + return XmlFileLoader.xmlFileToNetconfMessage(fileName); } }