import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler;
+import org.opendaylight.netconf.shaded.sshd.client.channel.ChannelSubsystem;
import org.opendaylight.netconf.shaded.sshd.client.channel.ClientChannel;
import org.opendaylight.netconf.shaded.sshd.client.future.AuthFuture;
import org.opendaylight.netconf.shaded.sshd.client.future.ConnectFuture;
final IoInputStream asyncOut = getMockedIoInputStream();
final IoOutputStream asyncIn = getMockedIoOutputStream();
- final NettyAwareChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
+ final ChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
final ClientSession sshSession = getMockedSshSession(subsystemChannel);
final ConnectFuture connectFuture = getSuccessConnectFuture(sshSession);
final IoInputStream asyncOut = getMockedIoInputStream();
final IoOutputStream asyncIn = getMockedIoOutputStream();
- final NettyAwareChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
+ final ChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
final ClientSession sshSession = getMockedSshSession(subsystemChannel);
final ConnectFuture connectFuture = getSuccessConnectFuture(sshSession);
Futures.addCallback(stubAddListener(ioWriteFuture), new SuccessFutureListener<IoWriteFuture>() {
@Override
public void onSuccess(final SshFutureListener<IoWriteFuture> result) {
- doReturn(false).when(ioWriteFuture).isWritten();
doReturn(new IllegalStateException()).when(ioWriteFuture).getException();
result.operationComplete(ioWriteFuture);
}
}, MoreExecutors.directExecutor());
- final NettyAwareChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
+ final ChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
final ClientSession sshSession = getMockedSshSession(subsystemChannel);
final ConnectFuture connectFuture = getSuccessConnectFuture(sshSession);
final IoOutputStream asyncIn = getMockedIoOutputStream();
final IoWriteFuture ioWriteFuture = asyncIn.writeBuffer(new ByteArrayBuffer());
- final NettyAwareChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
+ final ChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
final ClientSession sshSession = getMockedSshSession(subsystemChannel);
final ConnectFuture connectFuture = getSuccessConnectFuture(sshSession);
final IoOutputStream asyncIn = getMockedIoOutputStream();
final IoWriteFuture ioWriteFuture = asyncIn.writeBuffer(new ByteArrayBuffer());
- final NettyAwareChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
+ final ChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
final ClientSession sshSession = getMockedSshSession(subsystemChannel);
final ConnectFuture connectFuture = getSuccessConnectFuture(sshSession);
final IoInputStream asyncOut = getMockedIoInputStream();
final IoOutputStream asyncIn = getMockedIoOutputStream();
- final NettyAwareChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
+ final ChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
final ClientSession sshSession = getMockedSshSession(subsystemChannel);
final ConnectFuture connectFuture = getSuccessConnectFuture(sshSession);
return connectFuture;
}
- private static NettyAwareClientSession getMockedSshSession(final NettyAwareChannelSubsystem subsystemChannel)
+ private static NettyAwareClientSession getMockedSshSession(final ChannelSubsystem subsystemChannel)
throws IOException {
final NettyAwareClientSession sshSession = mock(NettyAwareClientSession.class);
doReturn(false).when(sshSession).isClosed();
doReturn(false).when(sshSession).isClosing();
final CloseFuture closeFuture = mock(CloseFuture.class);
- Futures.addCallback(stubAddListener(closeFuture), new SuccessFutureListener<CloseFuture>() {
+ Futures.addCallback(stubAddListener(closeFuture), new SuccessFutureListener<>() {
@Override
public void onSuccess(final SshFutureListener<CloseFuture> result) {
doReturn(true).when(closeFuture).isClosed();
}, MoreExecutors.directExecutor());
doReturn(closeFuture).when(sshSession).close(false);
- doReturn(subsystemChannel).when(sshSession).createSubsystemChannel(eq("netconf"), any());
+ doReturn(subsystemChannel).when(sshSession).createSubsystemChannel(eq("netconf"),
+ any(ChannelHandlerContext.class));
return sshSession;
}
- private NettyAwareChannelSubsystem getMockedSubsystemChannel(final IoInputStream asyncOut,
+ private ChannelSubsystem getMockedSubsystemChannel(final IoInputStream asyncOut,
final IoOutputStream asyncIn) throws IOException {
- final NettyAwareChannelSubsystem subsystemChannel = mock(NettyAwareChannelSubsystem.class);
+ final ChannelSubsystem subsystemChannel = mock(ChannelSubsystem.class);
doNothing().when(subsystemChannel).setStreaming(any(ClientChannel.Streaming.class));
final OpenFuture openFuture = mock(OpenFuture.class);
doReturn(openFuture).when(subsystemChannel).open();
doReturn(asyncIn).when(subsystemChannel).getAsyncIn();
doNothing().when(subsystemChannel).onClose(any());
- doNothing().when(subsystemChannel).close();
+ doReturn(null).when(subsystemChannel).close(false);
return subsystemChannel;
}
private static IoOutputStream getMockedIoOutputStream() throws IOException {
final IoOutputStream mock = mock(IoOutputStream.class);
final IoWriteFuture ioWriteFuture = mock(IoWriteFuture.class);
- doReturn(true).when(ioWriteFuture).isWritten();
+ doReturn(null).when(ioWriteFuture).getException();
Futures.addCallback(stubAddListener(ioWriteFuture), new SuccessFutureListener<IoWriteFuture>() {
@Override
final IoInputStream asyncOut = getMockedIoInputStream();
final IoOutputStream asyncIn = getMockedIoOutputStream();
- final NettyAwareChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
+ final ChannelSubsystem subsystemChannel = getMockedSubsystemChannel(asyncOut, asyncIn);
final ClientSession sshSession = getMockedSshSession(subsystemChannel);
final ConnectFuture connectFuture = getSuccessConnectFuture(sshSession);