From: Tony Tkacik Date: Mon, 12 May 2014 16:35:07 +0000 (+0000) Subject: Merge "BUG-704 Remove pax from netconf identity-ref test." X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~99 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=1c79202684429691381362a27303514f8d2cb59f;hp=89d7fe2df7cef882f71e1fcdb46d2a44811f0ad3 Merge "BUG-704 Remove pax from netconf identity-ref test." --- diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml index ce52032320..66106075d3 100644 --- a/opendaylight/netconf/netconf-it/pom.xml +++ b/opendaylight/netconf/netconf-it/pom.xml @@ -15,18 +15,6 @@ - - ${project.groupId} - sal-binding-it - - - - - org.ops4j.pax.url - pax-url-aether - - - org.opendaylight.controller commons.logback_settings @@ -144,12 +132,6 @@ yang-test test - - org.ops4j.pax.tinybundles - tinybundles - ${tinybundles.version} - test - @@ -161,10 +143,6 @@ 1 false false - - com.google.collections:google-collections - org.ops4j.pax.url:pax-url-aether - diff --git a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java index e99e51e92f..cd53995bce 100644 --- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java +++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java @@ -11,7 +11,8 @@ package org.opendaylight.controller.netconf.it; import static java.util.Collections.emptyList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -32,21 +33,19 @@ import java.util.concurrent.TimeoutException; import javax.management.ObjectName; import javax.xml.parsers.ParserConfigurationException; -import junit.framework.Assert; - -import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.junit.matchers.JUnitMatchers; import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver; import org.opendaylight.controller.config.spi.ModuleFactory; import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; import org.opendaylight.controller.config.yang.test.impl.DepTestImplModuleFactory; +import org.opendaylight.controller.config.yang.test.impl.IdentityTestModuleFactory; import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplModuleFactory; import org.opendaylight.controller.config.yang.test.impl.NetconfTestImplModuleMXBean; import org.opendaylight.controller.config.yang.test.impl.TestImplModuleFactory; -import org.opendaylight.controller.netconf.StubUserManager; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.client.NetconfClientDispatcherImpl; @@ -60,11 +59,13 @@ import org.opendaylight.controller.netconf.impl.osgi.NetconfOperationServiceFact import org.opendaylight.controller.netconf.impl.osgi.NetconfOperationServiceSnapshotImpl; import org.opendaylight.controller.netconf.mapping.api.NetconfOperationProvider; import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.controller.netconf.ssh.NetconfSSHServer; -import org.opendaylight.controller.netconf.ssh.authentication.AuthProvider; import org.opendaylight.controller.netconf.util.test.XmlFileLoader; import org.opendaylight.controller.netconf.util.xml.XmlElement; import org.opendaylight.controller.netconf.util.xml.XmlUtil; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.test.types.rev131127.TestIdentity1; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.test.types.rev131127.TestIdentity2; +import org.opendaylight.yangtools.yang.data.impl.codec.CodecRegistry; +import org.opendaylight.yangtools.yang.data.impl.codec.IdentityCodec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -73,9 +74,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.xml.sax.SAXException; -import ch.ethz.ssh2.Connection; -import ch.ethz.ssh2.Session; - +import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import io.netty.channel.ChannelFuture; @@ -177,7 +176,7 @@ public class NetconfITTest extends AbstractNetconfConfigTest { static List getModuleFactoriesS() { return Lists.newArrayList(new TestImplModuleFactory(), new DepTestImplModuleFactory(), - new NetconfTestImplModuleFactory()); + new NetconfTestImplModuleFactory(), new IdentityTestModuleFactory()); } @Test @@ -376,54 +375,35 @@ public class NetconfITTest extends AbstractNetconfConfigTest { return netconfClient; } - private void startSSHServer() throws Exception { - logger.info("Creating SSH server"); - StubUserManager um = new StubUserManager(USERNAME, PASSWORD); - String pem; - try (InputStream is = getClass().getResourceAsStream("/RSA.pk")) { - pem = IOUtils.toString(is); + @Test + public void testIdRef() throws Exception { + NetconfMessage editId = XmlFileLoader.xmlFileToNetconfMessage("netconfMessages/editConfig_identities.xml"); + NetconfMessage commit = XmlFileLoader.xmlFileToNetconfMessage("netconfMessages/commit.xml"); + + try (TestingNetconfClient netconfClient = createSession(tcpAddress, "1")) { + assertIsOK(netconfClient.sendMessage(editId).getDocument()); + assertIsOK(netconfClient.sendMessage(commit).getDocument()); + + NetconfMessage response = netconfClient.sendMessage(getConfig); + + assertThat(XmlUtil.toString(response.getDocument()), JUnitMatchers.containsString("prefix:test-identity1")); + assertThat(XmlUtil.toString(response.getDocument()), JUnitMatchers.containsString("prefix:test-identity2")); + assertThat(XmlUtil.toString(response.getDocument()), JUnitMatchers.containsString("prefix:test-identity2")); + assertThat(XmlUtil.toString(response.getDocument()), JUnitMatchers.containsString("prefix:test-identity1")); + + } catch (Exception e) { + fail(Throwables.getStackTraceAsString(e)); } - AuthProvider ap = new AuthProvider(um, pem); - Thread sshServerThread = new Thread(NetconfSSHServer.start(10830, tcpAddress, ap)); - sshServerThread.setDaemon(true); - sshServerThread.start(); - logger.info("SSH server on"); } - @Test - public void sshTest() throws Exception { - startSSHServer(); - logger.info("creating connection"); - Connection conn = new Connection(sshAddress.getHostName(), sshAddress.getPort()); - Assert.assertNotNull(conn); - logger.info("connection created"); - conn.connect(); - boolean isAuthenticated = conn.authenticateWithPassword(USERNAME, PASSWORD); - assertTrue(isAuthenticated); - logger.info("user authenticated"); - final Session sess = conn.openSession(); - sess.startSubSystem("netconf"); - logger.info("user authenticated"); - sess.getStdin().write(XmlUtil.toString(this.getConfig.getDocument()).getBytes()); - - new Thread() { - @Override - public void run() { - while (true) { - byte[] bytes = new byte[1024]; - int c = 0; - try { - c = sess.getStdout().read(bytes); - } catch (IOException e) { - throw new IllegalStateException("IO exception while reading data on ssh bridge."); - } - logger.info("got data:" + bytes); - if (c == 0) { - break; - } - } - } - }.join(); - } + @Override + protected CodecRegistry getCodecRegistry() { + final IdentityCodec codec = mock(IdentityCodec.class); + doReturn(TestIdentity1.class).when(codec).deserialize(TestIdentity1.QNAME); + doReturn(TestIdentity2.class).when(codec).deserialize(TestIdentity2.QNAME); + final CodecRegistry ret = super.getCodecRegistry(); + doReturn(codec).when(ret).getIdentityCodec(); + return ret; + } } 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 deleted file mode 100644 index 981f1148e4..0000000000 --- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java +++ /dev/null @@ -1,184 +0,0 @@ -/* -* 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; -import static org.opendaylight.controller.test.sal.binding.it.TestHelper.flowCapableModelBundles; -import static org.opendaylight.controller.test.sal.binding.it.TestHelper.junitAndMockitoBundles; -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.util.HashedWheelTimer; -import io.netty.util.Timer; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; - -import javax.xml.parsers.ParserConfigurationException; - -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.NetconfClientDispatcherImpl; -import org.opendaylight.controller.netconf.client.SimpleNetconfClientSessionListener; -import org.opendaylight.controller.netconf.client.conf.NetconfClientConfiguration; -import org.opendaylight.controller.netconf.client.conf.NetconfClientConfigurationBuilder; -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.opendaylight.protocol.framework.NeverReconnectStrategy; -import org.ops4j.pax.exam.Configuration; -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.ops4j.pax.tinybundles.core.TinyBundles; -import org.osgi.framework.Constants; -import org.xml.sax.SAXException; - -import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; - -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.util.concurrent.GlobalEventExecutor; - -@Ignore -@RunWith(PaxExam.class) -public class IdentityRefNetconfTest { - - public static final int CLIENT_CONNECTION_TIMEOUT_MILLIS = 15000; - - // Wait for controller to start - - // 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; - - @Configuration - public Option[] config() { - return options( - 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(), - - // 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() { - return new DefaultCompositeOption( - 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("org.openexi", "nagasena").versionAsInProject(), - mavenBundle("org.openexi", "nagasena-rta").versionAsInProject()); - - - } - - private Option testingModules() { - return new DefaultCompositeOption( - mavenBundle("org.opendaylight.controller", "yang-test").versionAsInProject()); - } - - private static final InetSocketAddress tcpAddress = new InetSocketAddress("127.0.0.1", 18383); - - @Test - public void testIdRef() throws Exception { - Preconditions.checkNotNull(broker, "Controller not initialized"); - - - NetconfMessage edit = xmlFileToNetconfMessage("netconfMessages/editConfig_identities.xml"); - NetconfMessage commit = xmlFileToNetconfMessage("netconfMessages/commit.xml"); - NetconfMessage getConfig = xmlFileToNetconfMessage("netconfMessages/getConfig.xml"); - - NioEventLoopGroup nettyThreadgroup = new NioEventLoopGroup(); - Timer timer = new HashedWheelTimer(); - NetconfClientDispatcherImpl clientDispatcher = new NetconfClientDispatcherImpl(nettyThreadgroup, nettyThreadgroup, timer); - try (TestingNetconfClient netconfClient = new TestingNetconfClient("client", clientDispatcher, getClientConfiguration(tcpAddress))) { - sendMessage(edit, netconfClient); - sendMessage(commit, netconfClient); - sendMessage(getConfig, netconfClient, "id-test", - "prefix:test-identity1", - "prefix:test-identity2", - "prefix:test-identity2", - "prefix:test-identity1"); - - clientDispatcher.close(); - } catch (Exception e) { - fail(Throwables.getStackTraceAsString(e)); - } finally { - nettyThreadgroup.shutdownGracefully().get(); - timer.stop(); - } - } - - private void sendMessage(NetconfMessage edit, TestingNetconfClient netconfClient, String... containingResponse) - throws ExecutionException, InterruptedException, TimeoutException { - NetconfMessage response = netconfClient.sendRequest(edit).get(); - if (containingResponse == null) { - Assert.assertThat(XmlUtil.toString(response.getDocument()), JUnitMatchers.containsString("")); - } else { - for (String resp : containingResponse) { - Assert.assertThat(XmlUtil.toString(response.getDocument()), JUnitMatchers.containsString(resp)); - } - } - } - - public static NetconfMessage xmlFileToNetconfMessage(final String fileName) throws IOException, SAXException, - ParserConfigurationException { - return XmlFileLoader.xmlFileToNetconfMessage(fileName); - } - - public NetconfClientConfiguration getClientConfiguration(final InetSocketAddress tcpAddress) { - final NetconfClientConfigurationBuilder b = NetconfClientConfigurationBuilder.create(); - b.withAddress(tcpAddress); - b.withSessionListener(new SimpleNetconfClientSessionListener()); - b.withReconnectStrategy(new NeverReconnectStrategy(GlobalEventExecutor.INSTANCE, - CLIENT_CONNECTION_TIMEOUT_MILLIS)); - b.withConnectionTimeoutMillis(CLIENT_CONNECTION_TIMEOUT_MILLIS); - return b.build(); - } -} diff --git a/opendaylight/netconf/netconf-it/src/test/resources/RSA.pk b/opendaylight/netconf/netconf-it/src/test/resources/RSA.pk deleted file mode 100644 index c0266c7bd2..0000000000 --- a/opendaylight/netconf/netconf-it/src/test/resources/RSA.pk +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEAuC9hbEacpewvylI0mwFwjy3Wou2hpr/ncN9BBiFDSaG5yW2k -3Oy+SCAcFCL+ZKWb6cc6Ch4gUeCwyEHRojZguuhliKtak9YQf6qbvpPLe00842Lx -iqNAGurMpzizCDsGFq8ChaAkBZQI3TvcHuPoSUWSMJ+K8xHpRyUdVr6g2yEjezKJ -sTXBtWaeCCh6YUafFujuDJk7fvYcPW7Je5KRBBStIKvxcMW0zB+7eq04deTHwGbJ -gGjKWilQ72hsDDP3Hbp5CJMAYg1r4GlCmFx3KyHRGztgWgNgaD7nNpKCkTLjtmA6 -b4x7TA+jrzZ6Af2z5TMrI4dv5w1SrxHaZ+ziLQIDAQABAoIBAHTndeGgq/rQf8De -Do+4CTaHtK0zQSAyu/azbXUzlZ7drKuCEVs8VMY4wzmwwGEnkF+A2YDkgEUX5X0l -8aYQ97KKoS9u+43MGCrAIhyDeGrpqlT1TzRcy+qJz53v6gq2U/X/3QztiQ+VV078 -mIluxNgE9XYxPaNsYfGLSCTv1+9c8y/hjGVX2kwFK+u4ut0ZZETggNa8UxfaHVDS -fIJQX9Gm3J3GSUV30fDGMBIUW6ESLc2L8b7u8Mp9TRP39ZeQSuEUjBe8MYKv0Rel -oEpjZvcnniMTpFbLpndBYn7/AoIiEBvtCN8faVTuRRcvvLcsRm09IctzKQYnMh6M -6PLKV+ECgYEA8HFRYaKHUzxpzE/fyon82GQbzqFFY0/bbWrfWICMfNbIgshJUie6 -FmH5iUFMfeqaT7v557HFM0GB9FeIeSbvd88YmiBAcRopZ3DfMkDH+DT73yJ+/TKG -2nrQtdhyuTIs4bwHqeS2BBJYs7PK9R2rratF3l34Tf7mjlvyOgygHdUCgYEAxBo2 -8hEBlAVNcNb1hTYUxe1w1B6675/mFlmw98Xmj9dRYfICXNhahs8tX3/lsBEd+vBu -fI0oyHaff8m5bPgGzD1ZMybfeROujNrgxaKVk7Ef0FDRRCop4bm18OroFlFAt9l8 -wMp++ToACbdvQvL/mjWMPYlIxhB/YxHswICZZvkCgYAexxKYwdo6sGAGlC7cWT9x -X5cjowcjyEQZRHXkeUgCbufpvcOM7aLnXJE5nY8yCwbHsBM0MlBA2GDPKylAANjk -aDEJAZneIHAuWodngl1Wi0m2bU7+ECqs6s2uiU9eH2sZVh1RBQK7kLGkBx6ys6KX -L3ZZGYRAT6GplWFzRsx0JQKBgCeVlxPD5QqpC1nEumi6YvUVGdpnnZpzL3HBhxxs -wT612wKnZFyze4qM1X7ahVXGDsQxtkvD/sCAWW/lG13orw6ZL6FIroF1PJ3ILOkY -CZN3hJF7TtKwpCWhZB2OfWzL2AGEkE8mUP0j/Q/5DCd6f6f0OSvOw3bfq6cm3iB5 -lP2ZAoGAXsRN5TZTX4AQ2xTlrDQ8A5XgcvyWQpJOmEXMTyHV7VaJVzmNWFVAvndK -5UIq8ALDwB2t7vjmMUW6euvIwqtXiop7G79UOb3e3NhzeyWFGQyBLqCRznGaXQTT -dlFy73xhukZMhFnj006bjKCYvOPnwuGl3+0fuWil5Rq3jOuY5c8= ------END RSA PRIVATE KEY----- diff --git a/opendaylight/netconf/netconf-it/src/test/resources/controller.xml b/opendaylight/netconf/netconf-it/src/test/resources/controller.xml deleted file mode 100644 index 96efc10403..0000000000 --- a/opendaylight/netconf/netconf-it/src/test/resources/controller.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:test:types?module=test-types&revision=2013-11-27 - urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 - urn:opendaylight:params:xml:ns:yang:controller:logback:config?module=config-logging&revision=2013-07-16 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:test:impl?module=config-test-impl&revision=2013-04-03 - urn:opendaylight:params:xml:ns:yang:controller:test?module=config-test&revision=2013-06-13 - - - - - - prefix:impl-identity-test - id-test - - prefix:test-identity2 - - - prefix:test-identity2 - prefix:test-identity1 - - - prefix:test-identity1 - prefix:test-identity2 - - prefix:test-identity1 - - - prefix:binding-broker-impl - binding-broker-impl - - prefix:binding-notification-service - ref_binding-notification-broker - - - prefix:binding-data-broker - ref_binding-data-broker - - - - prefix:runtime-generated-mapping - runtime-mapping-singleton - - - prefix:binding-notification-broker - binding-notification-broker - - - prefix:binding-data-broker - binding-data-broker - - prefix:dom-broker-osgi-registry - ref_dom-broker - - - prefix:binding-dom-mapping-service - ref_runtime-mapping-singleton - - - - prefix:logback - singleton - - DEBUG - console - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - DEBUG - ROOT - console - - - - prefix:schema-service-singleton - yang-schema-service - - - prefix:hash-map-data-store - hash-map-data-store - - - prefix:dom-broker-impl - dom-broker - - prefix:dom-data-store - ref_hash-map-data-store - - - - - - prefix:schema-service - - ref_yang-schema-service - /modules/module[type='schema-service-singleton'][name='yang-schema-service'] - - - - prefix:dom-data-store - - ref_hash-map-data-store - /modules/module[type='hash-map-data-store'][name='hash-map-data-store'] - - - - prefix:dom-broker-osgi-registry - - ref_dom-broker - /modules/module[type='dom-broker-impl'][name='dom-broker'] - - - - prefix:testing - - ref_id-test - /modules/module[type='impl-identity-test'][name='id-test'] - - - - prefix:binding-dom-mapping-service - - ref_runtime-mapping-singleton - /modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton'] - - - - prefix:binding-data-consumer-broker - - ref_binding-data-broker - /modules/module[type='binding-data-broker'][name='binding-data-broker'] - - - - prefix:binding-rpc-registry - - ref_binding-broker-impl - /modules/module[type='binding-broker-impl'][name='binding-broker-impl'] - - - - prefix:binding-notification-service - - ref_binding-notification-broker - /modules/module[type='binding-notification-broker'][name='binding-notification-broker'] - - - - prefix:binding-broker-osgi-registry - - ref_binding-broker-impl - /modules/module[type='binding-broker-impl'][name='binding-broker-impl'] - - - - prefix:binding-notification-subscription-service - - ref_binding-notification-broker - /modules/module[type='binding-notification-broker'][name='binding-notification-broker'] - - - - prefix:binding-data-broker - - ref_binding-data-broker - /modules/module[type='binding-data-broker'][name='binding-data-broker'] - - - - - - - - diff --git a/opendaylight/netconf/netconf-it/src/test/resources/keystore.jks b/opendaylight/netconf/netconf-it/src/test/resources/keystore.jks deleted file mode 100644 index 201d3758af..0000000000 Binary files a/opendaylight/netconf/netconf-it/src/test/resources/keystore.jks and /dev/null differ diff --git a/opendaylight/netconf/netconf-it/src/test/resources/netconfMessages/commit.xml b/opendaylight/netconf/netconf-it/src/test/resources/netconfMessages/commit.xml deleted file mode 100644 index ffdf132153..0000000000 --- a/opendaylight/netconf/netconf-it/src/test/resources/netconfMessages/commit.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/opendaylight/netconf/netconf-it/src/test/resources/netconfMessages/getConfig.xml b/opendaylight/netconf/netconf-it/src/test/resources/netconfMessages/getConfig.xml deleted file mode 100644 index 39efb4961b..0000000000 --- a/opendaylight/netconf/netconf-it/src/test/resources/netconfMessages/getConfig.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -