From fc6ab3e5fee2bc3e607848caa665b166d6f38dd6 Mon Sep 17 00:00:00 2001 From: Jakub Dudycz Date: Tue, 24 Jul 2018 11:48:12 +0200 Subject: Rework argument configuration - Unify names of argument configuration classes in DCAE APP simulator, XNF simualtor and VES HV Collector - Make some of the arguments required - Adjust docker-compose and Dockerfiles - Adjust test cases and error handling Closes ONAP-683 Change-Id: I4a9d43791cced9dcb52eb83e2f7956462e8712d9 Signed-off-by: Jakub Dudycz Issue-ID: DCAEGEN2-601 --- .../kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt | 2 +- .../kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hv-collector-core/src/main') diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt index 61e1ebff..c28b1510 100644 --- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt +++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt @@ -58,7 +58,7 @@ internal class NettyTcpServer(private val serverConfig: ServerConfiguration, private fun configureServer(opts: ServerOptions.Builder<*>) { val sslContext: Option = sslContextFactory.createSslContext(serverConfig.securityConfiguration) if (sslContext.isDefined()) opts.sslContext(sslContext.orNull()) - opts.port(serverConfig.port) + opts.port(serverConfig.listenPort) } private fun handleConnection(nettyInbound: NettyInbound): Mono { diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt index 93ad719d..b0f3ec06 100644 --- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt +++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt @@ -27,7 +27,7 @@ import java.time.Duration * @since May 2018 */ data class ServerConfiguration( - val port: Int, + val listenPort: Int, val configurationProviderParams: ConfigurationProviderParams, val securityConfiguration: SecurityConfiguration, val idleTimeout: Duration, -- cgit 1.2.3-korg