From: Tony Tkacik <ttkacik@cisco.com>
Date: Thu, 28 Aug 2014 15:47:25 +0000 (+0000)
Subject: Merge "BUG-1617 Extract AuthProvider from netconf ssh"
X-Git-Tag: release/helium~186
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=99a0b01f27126a17ec2af165cf3fd9e53c977d2b

Merge "BUG-1617 Extract AuthProvider from netconf ssh"
---

99a0b01f27126a17ec2af165cf3fd9e53c977d2b
diff --cc opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/SSHTest.java
index b3478c3693,8010794364..ce1400bbcb
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/SSHTest.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/SSHTest.java
@@@ -59,13 -58,11 +58,13 @@@ public class SSHTest 
      @Test
      public void test() throws Exception {
          new Thread(new EchoServer(), "EchoServer").start();
-         AuthProvider authProvider = mock(AuthProviderImpl.class);
-         doReturn(PEMGenerator.generate().toCharArray()).when(authProvider).getPEMAsCharArray();
+         AuthProvider authProvider = mock(AuthProvider.class);
          doReturn(true).when(authProvider).authenticated(anyString(), anyString());
 +        doReturn("auth").when(authProvider).toString();
 +
          NetconfSSHServer netconfSSHServer = NetconfSSHServer.start(10831, NetconfConfigUtil.getNetconfLocalAddress(),
-                 authProvider, new NioEventLoopGroup());
+                 new NioEventLoopGroup(), PEMGenerator.generate().toCharArray());
+         netconfSSHServer.setAuthProvider(authProvider);
  
          InetSocketAddress address = netconfSSHServer.getLocalSocketAddress();
          final EchoClientHandler echoClientHandler = connectClient(address);