X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=protocol%2Fnetconf-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fclient%2Fconf%2FNetconfClientConfiguration.java;fp=protocol%2Fnetconf-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fclient%2Fconf%2FNetconfClientConfiguration.java;h=24b7a75cfde21ea206909e76dad1965c08100336;hb=deaf5ad75ce5c33d883e1ffb76402fdb33cf44ae;hp=9653a6b9765aa43e0e802533df1447455fff563d;hpb=128b56697213ef1af74573e7f46122c620ded05e;p=netconf.git diff --git a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java index 9653a6b976..24b7a75cfd 100644 --- a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java +++ b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java @@ -21,6 +21,7 @@ import org.opendaylight.netconf.client.NetconfClientSessionListener; import org.opendaylight.netconf.client.SslHandlerFactory; import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; import org.opendaylight.netconf.nettyutil.handler.ssh.client.NetconfSshClient; +import org.opendaylight.netconf.transport.ssh.ClientFactoryManagerConfigurator; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ssh.client.rev230417.SshClientGrouping; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.tcp.client.rev230417.TcpClientGrouping; @@ -50,6 +51,7 @@ public class NetconfClientConfiguration { private final TlsClientGrouping tlsParameters; private final org.opendaylight.netconf.transport.tls.SslHandlerFactory transportSslHandlerFactory; private final SshClientGrouping sshParameters; + private final ClientFactoryManagerConfigurator sshConfigurator; NetconfClientConfiguration(final NetconfClientProtocol protocol, final InetSocketAddress address, final Long connectionTimeoutMillis, @@ -74,6 +76,7 @@ public class NetconfClientConfiguration { this.tlsParameters = null; this.transportSslHandlerFactory = null; this.sshParameters = null; + this.sshConfigurator = null; validateConfiguration(); } @@ -82,6 +85,7 @@ public class NetconfClientConfiguration { final TlsClientGrouping tlsParameters, final org.opendaylight.netconf.transport.tls.SslHandlerFactory transportSslHandlerFactory, final SshClientGrouping sshParameters, + final ClientFactoryManagerConfigurator sshConfigurator, final NetconfClientSessionListener sessionListener, final List odlHelloCapabilities, final Long connectionTimeoutMillis, @@ -93,6 +97,7 @@ public class NetconfClientConfiguration { this.tlsParameters = tlsParameters; this.transportSslHandlerFactory = transportSslHandlerFactory; this.sshParameters = sshParameters; + this.sshConfigurator = sshConfigurator; this.sessionListener = requireNonNull(sessionListener); this.odlHelloCapabilities = odlHelloCapabilities; this.connectionTimeoutMillis = connectionTimeoutMillis; @@ -172,6 +177,10 @@ public class NetconfClientConfiguration { return sshParameters; } + public ClientFactoryManagerConfigurator getSshConfigurator() { + return sshConfigurator; + } + private void validateConfiguration() { switch (requireNonNull(clientProtocol)) { case TLS: