Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Netconf-cli compilable and included in project"
[controller.git]
/
opendaylight
/
netconf
/
netconf-netty-util
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
nettyutil
/
handler
/
ssh
/
client
/
AsyncSshHandler.java
diff --git
a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java
b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java
index fa7d0900edc805ebd45f3b2edce8a21d46cfb031..14d753f1f8b59c25a7ea871e3bfe5e430c1d9970 100644
(file)
--- a/
opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java
+++ b/
opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java
@@
-8,9
+8,13
@@
package org.opendaylight.controller.netconf.nettyutil.handler.ssh.client;
package org.opendaylight.controller.netconf.nettyutil.handler.ssh.client;
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
import java.io.IOException;
import java.net.SocketAddress;
import java.io.IOException;
import java.net.SocketAddress;
-
import org.apache.sshd.ClientChannel;
import org.apache.sshd.ClientSession;
import org.apache.sshd.SshClient;
import org.apache.sshd.ClientChannel;
import org.apache.sshd.ClientSession;
import org.apache.sshd.SshClient;
@@
-23,19
+27,12
@@
import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelOutboundHandlerAdapter;
-import io.netty.channel.ChannelPromise;
-
/**
* Netty SSH handler class. Acts as interface between Netty and SSH library.
*/
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
/**
* Netty SSH handler class. Acts as interface between Netty and SSH library.
*/
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
- private static final Logger
logger
= LoggerFactory.getLogger(AsyncSshHandler.class);
+ private static final Logger
LOG
= LoggerFactory.getLogger(AsyncSshHandler.class);
public static final String SUBSYSTEM = "netconf";
public static final SshClient DEFAULT_CLIENT = SshClient.setUpDefaultClient();
public static final String SUBSYSTEM = "netconf";
public static final SshClient DEFAULT_CLIENT = SshClient.setUpDefaultClient();
@@
-77,7
+74,7
@@
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
}
private void startSsh(final ChannelHandlerContext ctx, final SocketAddress address) {
}
private void startSsh(final ChannelHandlerContext ctx, final SocketAddress address) {
-
logger
.debug("Starting SSH to {} on channel: {}", address, ctx.channel());
+
LOG
.debug("Starting SSH to {} on channel: {}", address, ctx.channel());
final ConnectFuture sshConnectionFuture = sshClient.connect(authenticationHandler.getUsername(), address);
sshConnectionFuture.addListener(new SshFutureListener<ConnectFuture>() {
final ConnectFuture sshConnectionFuture = sshClient.connect(authenticationHandler.getUsername(), address);
sshConnectionFuture.addListener(new SshFutureListener<ConnectFuture>() {
@@
-94,7
+91,7
@@
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
private synchronized void handleSshSessionCreated(final ConnectFuture future, final ChannelHandlerContext ctx) {
try {
private synchronized void handleSshSessionCreated(final ConnectFuture future, final ChannelHandlerContext ctx) {
try {
-
logger
.trace("SSH session created on channel: {}", ctx.channel());
+
LOG
.trace("SSH session created on channel: {}", ctx.channel());
session = future.getSession();
final AuthFuture authenticateFuture = authenticationHandler.authenticate(session);
session = future.getSession();
final AuthFuture authenticateFuture = authenticationHandler.authenticate(session);
@@
-115,7
+112,7
@@
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
private synchronized void handleSshAuthenticated(final ClientSession session, final ChannelHandlerContext ctx) {
try {
private synchronized void handleSshAuthenticated(final ClientSession session, final ChannelHandlerContext ctx) {
try {
-
logger
.debug("SSH session authenticated on channel: {}, server version: {}", ctx.channel(), session.getServerVersion());
+
LOG
.debug("SSH session authenticated on channel: {}, server version: {}", ctx.channel(), session.getServerVersion());
channel = session.createSubsystemChannel(SUBSYSTEM);
channel.setStreaming(ClientChannel.Streaming.Async);
channel = session.createSubsystemChannel(SUBSYSTEM);
channel.setStreaming(ClientChannel.Streaming.Async);
@@
-137,7
+134,7
@@
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
}
private synchronized void handleSshChanelOpened(final ChannelHandlerContext ctx) {
}
private synchronized void handleSshChanelOpened(final ChannelHandlerContext ctx) {
-
logger
.trace("SSH subsystem channel opened successfully on channel: {}", ctx.channel());
+
LOG
.trace("SSH subsystem channel opened successfully on channel: {}", ctx.channel());
connectPromise.setSuccess();
connectPromise = null;
connectPromise.setSuccess();
connectPromise = null;
@@
-164,7
+161,7
@@
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
}
private synchronized void handleSshSetupFailure(final ChannelHandlerContext ctx, final Throwable e) {
}
private synchronized void handleSshSetupFailure(final ChannelHandlerContext ctx, final Throwable e) {
-
logger
.warn("Unable to setup SSH connection on channel: {}", ctx.channel(), e);
+
LOG
.warn("Unable to setup SSH connection on channel: {}", ctx.channel(), e);
connectPromise.setFailure(e);
connectPromise = null;
throw new IllegalStateException("Unable to setup SSH connection on channel: " + ctx.channel(), e);
connectPromise.setFailure(e);
connectPromise = null;
throw new IllegalStateException("Unable to setup SSH connection on channel: " + ctx.channel(), e);
@@
-211,7
+208,7
@@
public class AsyncSshHandler extends ChannelOutboundHandlerAdapter {
channel = null;
promise.setSuccess();
channel = null;
promise.setSuccess();
-
logger
.debug("SSH session closed on channel: {}", ctx.channel());
+
LOG
.debug("SSH session closed on channel: {}", ctx.channel());
ctx.fireChannelInactive();
}
ctx.fireChannelInactive();
}