From dbb4724dbc8f65c33ce38f5f0942db5732f26a1a Mon Sep 17 00:00:00 2001 From: Jakub Morvay Date: Thu, 17 Jan 2019 18:34:16 +0100 Subject: [PATCH] Remove netconf-ssh project netconf-ssh contains logic for setting up ssh servers used in netconf project (netconf test-tool, mdsal netconf northbound and css netconf northbound). Moreover it also actually instantiates ssh server for css netconf northbound. Since css is no longer around, get rid of the above mentioned ssh server instantiation logic. Move other classes to mdsal-netconf-ssh project -- it is their primary user now. Change-Id: Ifffcf97429887cd6533def887c29dca9678ec815 Signed-off-by: Jakub Morvay --- features/netconf/odl-netconf-ssh/pom.xml | 5 - netconf/mdsal-netconf-ssh/pom.xml | 44 +++++--- .../ssh/NetconfNorthboundSshServer.java | 0 .../netconf/ssh/RemoteNetconfCommand.java | 0 .../netconf/ssh/SshProxyClientHandler.java | 0 .../netconf/ssh/SshProxyServer.java | 0 .../ssh/SshProxyServerConfiguration.java | 5 - .../SshProxyServerConfigurationBuilder.java | 0 .../netconf/netty/EchoClient.java | 0 .../netconf/netty/EchoClientHandler.java | 0 .../netconf/netty/EchoServer.java | 0 .../netconf/netty/EchoServerHandler.java | 0 .../netconf/netty/ProxyClientHandler.java | 0 .../netconf/netty/ProxyServer.java | 0 .../netconf/netty/ProxyServerHandler.java | 0 .../opendaylight/netconf/netty/SSHTest.java | 0 .../ssh/authentication/SSHServerTest.java | 0 netconf/netconf-ssh/pom.xml | 99 ---------------- .../netconf/ssh/NetconfSSHProvider.java | 106 ------------------ .../blueprint/netconf-ssh-blueprint.xml | 26 ----- netconf/netconf-ssh/src/test/resources/RSA.pk | 27 ----- .../src/test/resources/logback-test.xml | 13 --- netconf/pom.xml | 1 - netconf/tools/netconf-testtool/pom.xml | 8 +- 24 files changed, 30 insertions(+), 304 deletions(-) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/main/java/org/opendaylight/netconf/ssh/SshProxyClientHandler.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/main/java/org/opendaylight/netconf/ssh/SshProxyServer.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfiguration.java (88%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfigurationBuilder.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/EchoClient.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/EchoServer.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/ProxyClientHandler.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/netty/SSHTest.java (100%) rename netconf/{netconf-ssh => mdsal-netconf-ssh}/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java (100%) delete mode 100644 netconf/netconf-ssh/pom.xml delete mode 100644 netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfSSHProvider.java delete mode 100644 netconf/netconf-ssh/src/main/resources/org/opendaylight/blueprint/netconf-ssh-blueprint.xml delete mode 100644 netconf/netconf-ssh/src/test/resources/RSA.pk delete mode 100644 netconf/netconf-ssh/src/test/resources/logback-test.xml diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml index b5627df4c6..55e565a1cc 100644 --- a/features/netconf/odl-netconf-ssh/pom.xml +++ b/features/netconf/odl-netconf-ssh/pom.xml @@ -45,10 +45,5 @@ xml features - - ${project.groupId} - netconf-ssh - ${project.version} - diff --git a/netconf/mdsal-netconf-ssh/pom.xml b/netconf/mdsal-netconf-ssh/pom.xml index 2e9a06a44b..c03c54301c 100644 --- a/netconf/mdsal-netconf-ssh/pom.xml +++ b/netconf/mdsal-netconf-ssh/pom.xml @@ -16,7 +16,6 @@ ../netconf-parent - org.opendaylight.netconf mdsal-netconf-ssh 1.6.0-SNAPSHOT ${project.artifactId} @@ -24,29 +23,38 @@ - ${project.groupId} - netconf-ssh + com.google.guava + guava org.apache.aries.blueprint org.apache.aries.blueprint.core provided + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + + + ${project.groupId} + netconf-api + + + ${project.groupId} + netconf-auth + + + ${project.groupId} + netconf-util + + + ${project.groupId} + netconf-netty-util + + + org.osgi + org.osgi.core + - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.artifactId} - netconf-ssh - - - - - diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java similarity index 100% rename from netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java rename to netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfNorthboundSshServer.java diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java similarity index 100% rename from netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java rename to netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/RemoteNetconfCommand.java diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyClientHandler.java b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyClientHandler.java similarity index 100% rename from netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyClientHandler.java rename to netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyClientHandler.java diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServer.java b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServer.java similarity index 100% rename from netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServer.java rename to netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServer.java diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfiguration.java b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfiguration.java similarity index 88% rename from netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfiguration.java rename to netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfiguration.java index 935241a390..16ecfc5369 100644 --- a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfiguration.java +++ b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfiguration.java @@ -24,11 +24,6 @@ public final class SshProxyServerConfiguration { private final int idleTimeout; private final Optional publickeyAuthenticator; - SshProxyServerConfiguration(final InetSocketAddress bindingAddress, final LocalAddress localAddress, - final AuthProvider authenticator, final KeyPairProvider keyPairProvider, final int idleTimeout) { - this(bindingAddress, localAddress, authenticator, null, keyPairProvider, idleTimeout); - } - SshProxyServerConfiguration(final InetSocketAddress bindingAddress, final LocalAddress localAddress, final AuthProvider authenticator, final PublickeyAuthenticator publickeyAuthenticator, final KeyPairProvider keyPairProvider, final int idleTimeout) { diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfigurationBuilder.java b/netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfigurationBuilder.java similarity index 100% rename from netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfigurationBuilder.java rename to netconf/mdsal-netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/SshProxyServerConfigurationBuilder.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClient.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClient.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClient.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClient.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyClientHandler.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyClientHandler.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyClientHandler.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyClientHandler.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java diff --git a/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java b/netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java similarity index 100% rename from netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java rename to netconf/mdsal-netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml deleted file mode 100644 index 4fdaafe6c2..0000000000 --- a/netconf/netconf-ssh/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.netconf - netconf-parent - 1.6.0-SNAPSHOT - ../netconf-parent - - - org.opendaylight.netconf - netconf-ssh - 1.6.0-SNAPSHOT - ${project.artifactId} - bundle - - - - ${project.groupId} - netconf-api - - - ${project.groupId} - netconf-auth - - - ${project.groupId} - netconf-util - - - ${project.groupId} - netconf-impl - - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-inet-types - - - com.google.guava - guava - - - org.slf4j - slf4j-api - - - org.opendaylight.yangtools - mockito-configuration - test - - - ${project.groupId} - netconf-netty-util - - - ${project.groupId} - netconf-client - test - - - org.osgi - org.osgi.compendium - - - org.osgi - org.osgi.core - - - - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - package - - - - - - - diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfSSHProvider.java b/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfSSHProvider.java deleted file mode 100644 index dd2d089700..0000000000 --- a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfSSHProvider.java +++ /dev/null @@ -1,106 +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.netconf.ssh; - -import io.netty.channel.local.LocalAddress; -import io.netty.channel.nio.NioEventLoopGroup; -import java.io.File; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import org.apache.sshd.common.util.security.SecurityUtils; -import org.apache.sshd.common.util.threads.ThreadUtils; -import org.apache.sshd.server.keyprovider.AbstractGeneratorHostKeyProvider; -import org.opendaylight.netconf.auth.AuthProvider; -import org.opendaylight.netconf.util.NetconfConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class NetconfSSHProvider { - private static final Logger LOG = LoggerFactory.getLogger(NetconfSSHProvider.class); - - private static final java.lang.String ALGORITHM = "RSA"; - private static final int KEY_SIZE = 4096; - public static final int POOL_SIZE = 8; - private static final int DEFAULT_IDLE_TIMEOUT = Integer.MAX_VALUE; - - private final AuthProvider authProvider; - private final NetconfConfiguration netconfConfiguration; - - private ScheduledExecutorService minaTimerExecutor; - private NioEventLoopGroup clientGroup; - private ExecutorService nioExecutor; - - private SshProxyServer server; - - public NetconfSSHProvider(final AuthProvider authProvider, - final NetconfConfiguration netconfConfiguration) { - - this.authProvider = authProvider; - this.netconfConfiguration = netconfConfiguration; - } - - // Called via blueprint - @SuppressWarnings("unused") - public void init() throws IOException { - minaTimerExecutor = Executors.newScheduledThreadPool(POOL_SIZE, - runnable -> new Thread(runnable, "netconf-ssh-server-mina-timers")); - clientGroup = new NioEventLoopGroup(); - nioExecutor = ThreadUtils.newFixedThreadPool("netconf-ssh-server-nio-group", POOL_SIZE); - server = startSSHServer(); - } - - // Called via blueprint - @SuppressWarnings("unused") - public void destroy() throws IOException { - if (server != null) { - server.close(); - } - - if (nioExecutor != null) { - nioExecutor.shutdownNow(); - } - - if (clientGroup != null) { - clientGroup.shutdownGracefully(); - } - - if (minaTimerExecutor != null) { - minaTimerExecutor.shutdownNow(); - } - } - - private SshProxyServer startSSHServer() - throws IOException { - - final InetSocketAddress sshSocketAddress = netconfConfiguration.getSshServerAddress(); - LOG.info("Starting netconf SSH server at {}", sshSocketAddress); - - final LocalAddress localAddress = NetconfConfiguration.NETCONF_LOCAL_ADDRESS; - - final String path = netconfConfiguration.getPrivateKeyPath(); - LOG.trace("Starting netconf SSH server with path to ssh private key {}", path); - - final SshProxyServer sshProxyServer = new SshProxyServer(minaTimerExecutor, clientGroup, nioExecutor); - final AbstractGeneratorHostKeyProvider keyPairProvider = SecurityUtils.createGeneratorHostKeyProvider(null); - keyPairProvider.setAlgorithm(ALGORITHM); - keyPairProvider.setKeySize(KEY_SIZE); - keyPairProvider.setFile(new File(path)); - sshProxyServer.bind( - new SshProxyServerConfigurationBuilder() - .setBindingAddress(sshSocketAddress) - .setLocalAddress(localAddress) - .setAuthenticator(authProvider) - .setKeyPairProvider(keyPairProvider) - .setIdleTimeout(DEFAULT_IDLE_TIMEOUT) - .createSshProxyServerConfiguration()); - return sshProxyServer; - } -} diff --git a/netconf/netconf-ssh/src/main/resources/org/opendaylight/blueprint/netconf-ssh-blueprint.xml b/netconf/netconf-ssh/src/main/resources/org/opendaylight/blueprint/netconf-ssh-blueprint.xml deleted file mode 100644 index 2f504c064c..0000000000 --- a/netconf/netconf-ssh/src/main/resources/org/opendaylight/blueprint/netconf-ssh-blueprint.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - diff --git a/netconf/netconf-ssh/src/test/resources/RSA.pk b/netconf/netconf-ssh/src/test/resources/RSA.pk deleted file mode 100644 index c0266c7bd2..0000000000 --- a/netconf/netconf-ssh/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/netconf/netconf-ssh/src/test/resources/logback-test.xml b/netconf/netconf-ssh/src/test/resources/logback-test.xml deleted file mode 100644 index 324c234330..0000000000 --- a/netconf/netconf-ssh/src/test/resources/logback-test.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/netconf/pom.xml b/netconf/pom.xml index 9eafcdbed7..df788c45bf 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -44,7 +44,6 @@ netconf-netty-util netconf-mapping-api netconf-client - netconf-ssh netconf-tcp netconf-auth aaa-authn-odl-plugin diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index beaed7d7dd..f1c3db6de5 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -113,10 +113,6 @@ org.opendaylight.netconf mdsal-netconf-monitoring - - ${project.groupId} - netconf-ssh - org.opendaylight.mdsal mdsal-dom-inmemory-datastore @@ -125,6 +121,10 @@ org.opendaylight.netconf mdsal-netconf-connector + + ${project.groupId} + mdsal-netconf-ssh + org.apache.karaf.features org.apache.karaf.features.core -- 2.36.6