diff options
| author |   Jakub Dudycz <jakub.dudycz@nokia.com> | 2018-07-24 11:48:12 +0200 |
|---|---|---|
| committer |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-08-03 09:41:09 +0200 |
| commit | fc6ab3e5fee2bc3e607848caa665b166d6f38dd6 (patch) | |
| tree | c54a032ef0093f7024cff963addca163b0dcf98e /hv-collector-core | |
| parent | 53dbf8e66ad83c2d5f06279a0d7446e5e8be68e8 (diff) | |
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 <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-601
Diffstat (limited to 'hv-collector-core')
2 files changed, 2 insertions, 2 deletions
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<SslContext> = 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<Void> { 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, |