From: Filip Krzywka Date: Mon, 10 Sep 2018 09:35:13 +0000 (+0200) Subject: Enable ssl-disable option for xNF simulator X-Git-Tag: 1.0.0~17 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=06c3751e4769f8c9fa13e4188fb41a2e9c796188;p=dcaegen2%2Fcollectors%2Fhv-ves.git Enable ssl-disable option for xNF simulator Change-Id: I8d4459c4b612e6066ae0da9521333fc3083952d3 Issue-ID: DCAEGEN2-760 Signed-off-by: Filip Krzywka --- diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt b/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt index 22e47d75..d1a5296a 100644 --- a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt +++ b/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt @@ -19,6 +19,7 @@ */ package org.onap.dcae.collectors.veshv.simulators.xnf.impl.adapters +import arrow.core.Option import io.netty.handler.ssl.ClientAuth import io.netty.handler.ssl.SslContext import io.netty.handler.ssl.SslContextBuilder @@ -48,7 +49,7 @@ class VesHvClient(private val configuration: SimulatorConfiguration) { .options { opts -> opts.host(configuration.vesHost) .port(configuration.vesPort) - .sslContext(createSslContext(configuration.security)) + .sslContext(createSslContext(configuration.security).orNull()) } .build() @@ -92,13 +93,19 @@ class VesHvClient(private val configuration: SimulatorConfiguration) { .then() } - private fun createSslContext(config: SecurityConfiguration): SslContext = - SslContextBuilder.forClient() - .keyManager(config.cert.toFile(), config.privateKey.toFile()) - .trustManager(config.trustedCert.toFile()) - .sslProvider(SslProvider.OPENSSL) - .clientAuth(ClientAuth.REQUIRE) - .build() + private fun createSslContext(config: SecurityConfiguration): Option = + if (config.sslDisable) { + Option.empty() + } else { + Option.just( + SslContextBuilder.forClient() + .keyManager(config.cert.toFile(), config.privateKey.toFile()) + .trustManager(config.trustedCert.toFile()) + .sslProvider(SslProvider.OPENSSL) + .clientAuth(ClientAuth.REQUIRE) + .build() + ) + } private fun NettyOutbound.logConnectionClosed(): NettyOutbound { context().onClose {