diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2017-06-30 13:46:26 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-06-30 22:19:00 +0200 |
commit | 9ffb7cb36349d00ab31538c85bae597e5d10062b (patch) | |
tree | cd68783486c431f298658de5eac9ab0edb0d8c84 /infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf | |
parent | 5952721d74f9e1af59c3deb1018054aa4424c461 (diff) |
HONEYCOMB-360 - Common northbound configuration
Change-Id: Iefa1c4a7388c628c9527a00b13be59d98db640ec
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf')
-rw-r--r-- | infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java index ba36a266b..8d86677d3 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java @@ -21,6 +21,7 @@ import com.google.inject.Inject; import io.fd.honeycomb.infra.distro.InitializationException; import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; +import io.fd.honeycomb.northbound.CredentialsConfiguration; import io.netty.channel.ChannelFuture; import io.netty.channel.local.LocalAddress; import io.netty.channel.nio.NioEventLoopGroup; @@ -51,6 +52,8 @@ public final class NetconfSshServerProvider extends ProviderTrait<NetconfSshServ private HoneycombConfiguration cfgAttributes; @Inject private NioEventLoopGroup nettyThreadgroup; + @Inject + private CredentialsConfiguration credentialsCfg; private ScheduledExecutorService pool = Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder().setNameFormat("netconf-ssh-%d").build()); @@ -76,7 +79,7 @@ public final class NetconfSshServerProvider extends ProviderTrait<NetconfSshServ sshConfigBuilder.setBindingAddress(bindingAddress); sshConfigBuilder.setLocalAddress(localAddress); // Only simple authProvider checking ConfigAttributes, checking the config file - sshConfigBuilder.setAuthenticator(new SimplelAuthProvider(cfgAttributes)); + sshConfigBuilder.setAuthenticator(new SimplelAuthProvider(credentialsCfg)); sshConfigBuilder.setIdleTimeout(Integer.MAX_VALUE); sshConfigBuilder.setKeyPairProvider(new PEMGeneratorHostKeyProvider()); @@ -106,9 +109,9 @@ public final class NetconfSshServerProvider extends ProviderTrait<NetconfSshServ private static final class SimplelAuthProvider implements AuthProvider { - private final HoneycombConfiguration cfgAttributes; + private final CredentialsConfiguration cfgAttributes; - SimplelAuthProvider(final HoneycombConfiguration cfgAttributes) { + SimplelAuthProvider(final CredentialsConfiguration cfgAttributes) { this.cfgAttributes = cfgAttributes; } |