summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-01-30 10:35:11 +0100
committerMarek Gradzki <mgradzki@cisco.com>2018-01-30 10:00:07 +0000
commitb17dfb70fa80a42667322fafa711e4c3094f50ec (patch)
tree5b178a1e3aca01f8ecf3b74c78885898b9153db5
parent8734030b57613cc416fc86c9d75f169938ad0b9f (diff)
HONEYCOMB-414: use NetconfNorthboundSshServer for NETCONF initialization
instead of rewriting it in HC. Change-Id: Id2b5cb1b7bcd38728721ce92a7b5dbe1d919731c Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java6
-rw-r--r--infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java111
2 files changed, 14 insertions, 103 deletions
diff --git a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java
index d9a85cce1..509f5b898 100644
--- a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java
+++ b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java
@@ -43,6 +43,7 @@ import org.opendaylight.netconf.notifications.NetconfNotificationCollector;
import org.opendaylight.netconf.notifications.NetconfNotificationListener;
import org.opendaylight.netconf.notifications.NetconfNotificationRegistry;
import org.opendaylight.netconf.notifications.impl.NetconfNotificationManager;
+import org.opendaylight.netconf.ssh.NetconfNorthboundSshServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -138,8 +139,7 @@ public class NetconfModule extends NorthboundPrivateModule<NetconfConfiguration>
bind(NetconfTcpServerProvider.NetconfTcpServer.class).toProvider(NetconfTcpServerProvider.class)
.asEagerSingleton();
expose(NetconfTcpServerProvider.NetconfTcpServer.class);
- bind(NetconfSshServerProvider.NetconfSshServer.class).toProvider(NetconfSshServerProvider.class)
- .asEagerSingleton();
- return expose(NetconfSshServerProvider.NetconfSshServer.class);
+ bind(NetconfNorthboundSshServer.class).toProvider(NetconfSshServerProvider.class).asEagerSingleton();
+ return expose(NetconfNorthboundSshServer.class);
}
}
diff --git a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java
index 02847d733..dd4cbd37c 100644
--- a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java
+++ b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java
@@ -16,41 +16,23 @@
package io.fd.honeycomb.northbound.netconf;
-import com.google.common.net.InetAddresses;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.Inject;
import io.fd.honeycomb.binding.init.ProviderTrait;
-import io.fd.honeycomb.infra.distro.InitializationException;
+import io.fd.honeycomb.data.init.ShutdownHandler;
import io.fd.honeycomb.northbound.CredentialsConfiguration;
import io.fd.honeycomb.northbound.NetconfConfiguration;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.local.LocalAddress;
import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.concurrent.GlobalEventExecutor;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import org.apache.sshd.server.keyprovider.PEMGeneratorHostKeyProvider;
import org.opendaylight.netconf.api.NetconfServerDispatcher;
import org.opendaylight.netconf.auth.AuthProvider;
-import org.opendaylight.netconf.ssh.SshProxyServer;
-import org.opendaylight.netconf.ssh.SshProxyServerConfigurationBuilder;
+import org.opendaylight.netconf.ssh.NetconfNorthboundSshServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-public final class NetconfSshServerProvider extends ProviderTrait<NetconfSshServerProvider.NetconfSshServer> {
+public final class NetconfSshServerProvider extends ProviderTrait<NetconfNorthboundSshServer> {
private static final Logger LOG = LoggerFactory.getLogger(NetconfSshServerProvider.class);
- // Use RSA for ssh server, see https://git.opendaylight.org/gerrit/#/c/60138/
- private static final String DEFAULT_PRIVATE_KEY_PATH = null; // disable private key serialization
- private static final String DEFAULT_ALGORITHM = "RSA";
- private static final int DEFAULT_KEY_SIZE = 4096;
-
@Inject
private NetconfServerDispatcher dispatcher;
@Inject
@@ -59,61 +41,22 @@ public final class NetconfSshServerProvider extends ProviderTrait<NetconfSshServ
private NioEventLoopGroup nettyThreadgroup;
@Inject
private CredentialsConfiguration credentialsCfg;
-
- private ScheduledExecutorService pool =
- Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder().setNameFormat("netconf-ssh-%d").build());
+ @Inject
+ private ShutdownHandler shutdownHandler;
@Override
- protected NetconfSshServer create() {
+ protected NetconfNorthboundSshServer create() {
if (!cfgAttributes.isNetconfSshEnabled()) {
LOG.info("NETCONF SSH disabled, skipping initialization");
return null;
}
LOG.info("Starting NETCONF SSH");
- // TODO(HONEYCOMB-414): the logic below is very similar to
- // org.opendaylight.netconf.ssh.NetconfNorthboundSshServer (introduced in Carbon), so consider reusing it
- // (requires fixing hardcoded private key path).
- final InetAddress sshBindingAddress = InetAddresses.forString(cfgAttributes.netconfSshBindingAddress.get());
- final InetSocketAddress bindingAddress =
- new InetSocketAddress(sshBindingAddress, cfgAttributes.netconfSshBindingPort.get());
-
- LocalAddress localAddress = new LocalAddress(cfgAttributes.netconfSshBindingPort.toString());
- ChannelFuture localServer = dispatcher.createLocalServer(localAddress);
-
- final SshProxyServer sshProxyServer = new SshProxyServer(pool, nettyThreadgroup, GlobalEventExecutor.INSTANCE);
-
- final SshProxyServerConfigurationBuilder sshConfigBuilder = new SshProxyServerConfigurationBuilder();
- sshConfigBuilder.setBindingAddress(bindingAddress);
- sshConfigBuilder.setLocalAddress(localAddress);
- // Only simple authProvider checking ConfigAttributes, checking the config file
- sshConfigBuilder.setAuthenticator(new SimplelAuthProvider(credentialsCfg));
- sshConfigBuilder.setIdleTimeout(Integer.MAX_VALUE);
- sshConfigBuilder.setKeyPairProvider(new PEMGeneratorHostKeyProvider(DEFAULT_PRIVATE_KEY_PATH,
- DEFAULT_ALGORITHM, DEFAULT_KEY_SIZE));
-
- localServer.addListener(new SshServerBinder(sshProxyServer, sshConfigBuilder, bindingAddress));
-
- return new NetconfSshServer(localServer, sshProxyServer);
- }
-
- public static final class NetconfSshServer {
- private ChannelFuture localServer;
- private SshProxyServer sshProxyServer;
-
- NetconfSshServer(final ChannelFuture localServer,
- final SshProxyServer sshProxyServer) {
- this.localServer = localServer;
- this.sshProxyServer = sshProxyServer;
- }
-
- public Object getLocalServer() {
- return localServer;
- }
-
- public Object getSshProxyServer() {
- return sshProxyServer;
- }
+ final NetconfNorthboundSshServer netconfServer = new NetconfNorthboundSshServer(dispatcher, nettyThreadgroup,
+ GlobalEventExecutor.INSTANCE, cfgAttributes.netconfSshBindingAddress.get(),
+ cfgAttributes.netconfSshBindingPort.get().toString(), new SimplelAuthProvider(credentialsCfg));
+ shutdownHandler.register("netconf-northbound-ssh-server", netconfServer::close);
+ return netconfServer;
}
private static final class SimplelAuthProvider implements AuthProvider {
@@ -129,36 +72,4 @@ public final class NetconfSshServerProvider extends ProviderTrait<NetconfSshServ
return cfgAttributes.username.equals(uname) && cfgAttributes.password.equals(passwd);
}
}
-
- private static final class SshServerBinder implements GenericFutureListener<ChannelFuture> {
- private final SshProxyServer sshProxyServer;
- private final SshProxyServerConfigurationBuilder sshConfigBuilder;
- private final InetSocketAddress bindingAddress;
-
- SshServerBinder(final SshProxyServer sshProxyServer,
- final SshProxyServerConfigurationBuilder sshConfigBuilder,
- final InetSocketAddress bindingAddress) {
- this.sshProxyServer = sshProxyServer;
- this.sshConfigBuilder = sshConfigBuilder;
- this.bindingAddress = bindingAddress;
- }
-
- @Override
- public void operationComplete(final ChannelFuture future) {
- if (future.isDone() && !future.isCancelled()) {
- try {
- sshProxyServer.bind(sshConfigBuilder.createSshProxyServerConfiguration());
- LOG.info("Netconf SSH endpoint started successfully at {}", bindingAddress);
- } catch (final IOException e) {
- throw new InitializationException("Unable to start SSH netconf server", e);
- }
-
- } else {
- LOG.warn("Unable to start SSH netconf server at {}", bindingAddress, future.cause());
- throw new InitializationException("Unable to start SSH netconf server", future.cause());
- }
-
- }
-
- }
}