# dockerfile: Dockerfile
ports:
- "6061:6061/tcp"
+ command: ["--listen-port", "6061","--config-url", "http://consul:8500/v1/kv/veshv-config"]
depends_on:
- kafka
- consul
# context: hv-collector-xnf-simulator
# dockerfile: Dockerfile
ports:
- - "8000:5000/tcp"
+ - "6062:6062/tcp"
+ command: ["--listen-port", "6062", "--ves-host", "ves-hv-collector", "--ves-port", "6061"]
depends_on:
- ves-hv-collector
volumes:
# context: hv-collector-dcae-app-simulator
# dockerfile: Dockerfile
ports:
- - "8100:5000/tcp"
+ - "6063:6063/tcp"
+ command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"]
depends_on:
- kafka
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> {
* @since May 2018
*/
data class ServerConfiguration(
- val port: Int,
+ val listenPort: Int,
val configurationProviderParams: ConfigurationProviderParams,
val securityConfiguration: SecurityConfiguration,
val idleTimeout: Duration,
LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
LABEL maintainer="Nokia Wroclaw ONAP Team"
-EXPOSE 5000
-
WORKDIR /opt/ves-hv-dcae-app-simulator
ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.simulators.dcaeapp.MainKt"]
-CMD ["--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas", "--listen-port", "5000"]
COPY target/libs/external/* ./
COPY target/libs/internal/* ./
COPY target/hv-collector-dcae-app-simulator-*.jar ./
*/
package org.onap.dcae.collectors.veshv.simulators.dcaeapp.config
+import arrow.core.ForOption
+import arrow.core.Option
+import arrow.core.fix
+import arrow.instances.extensions
+import arrow.typeclasses.binding
import org.apache.commons.cli.CommandLine
import org.apache.commons.cli.DefaultParser
-import org.onap.dcae.collectors.veshv.simulators.dcaeapp.config.DefaultValues.API_PORT
import org.onap.dcae.collectors.veshv.utils.commandline.ArgBasedConfiguration
import org.onap.dcae.collectors.veshv.utils.commandline.CommandLineOption
-import org.onap.dcae.collectors.veshv.utils.commandline.CommandLineOption.KAFKA_SERVERS
-import org.onap.dcae.collectors.veshv.utils.commandline.CommandLineOption.KAFKA_TOPICS
-import org.onap.dcae.collectors.veshv.utils.commandline.CommandLineOption.LISTEN_PORT
+import org.onap.dcae.collectors.veshv.utils.commandline.CommandLineOption.*
-internal object DefaultValues {
- const val API_PORT = 8080
- const val KAFKA_SERVERS = "kafka:9092"
- const val KAFKA_TOPICS = "ves_hvRanMeas"
-}
-
-class ArgBasedDcaeAppSimConfiguration : ArgBasedConfiguration<DcaeAppSimConfiguration>(DefaultParser()) {
+class ArgDcaeAppSimConfiguration : ArgBasedConfiguration<DcaeAppSimConfiguration>(DefaultParser()) {
override val cmdLineOptionsList: List<CommandLineOption> = listOf(
LISTEN_PORT,
KAFKA_SERVERS,
KAFKA_TOPICS
)
- override fun getConfiguration(cmdLine: CommandLine): DcaeAppSimConfiguration {
- val port = cmdLine.intValue(LISTEN_PORT, API_PORT)
- val kafkaBootstrapServers = cmdLine.stringValue(KAFKA_SERVERS, DefaultValues.KAFKA_SERVERS)
- val kafkaTopics = cmdLine.stringValue(KAFKA_TOPICS, DefaultValues.KAFKA_TOPICS).split(",").toSet()
- return DcaeAppSimConfiguration(
- port,
- kafkaBootstrapServers,
- kafkaTopics)
- }
+ override fun getConfiguration(cmdLine: CommandLine): Option<DcaeAppSimConfiguration> =
+ ForOption extensions {
+ binding {
+ val listenPort = cmdLine
+ .intValue(LISTEN_PORT)
+ .bind()
+ val kafkaBootstrapServers = cmdLine
+ .stringValue(KAFKA_SERVERS)
+ .bind()
+ val kafkaTopics = cmdLine
+ .stringValue(KAFKA_TOPICS)
+ .map { it.split(",").toSet() }
+ .bind()
+ DcaeAppSimConfiguration(
+ listenPort,
+ kafkaBootstrapServers,
+ kafkaTopics)
+ }.fix()
+ }
}
package org.onap.dcae.collectors.veshv.simulators.dcaeapp
import arrow.effects.IO
-import org.onap.dcae.collectors.veshv.simulators.dcaeapp.config.ArgBasedDcaeAppSimConfiguration
+import org.onap.dcae.collectors.veshv.simulators.dcaeapp.config.ArgDcaeAppSimConfiguration
import org.onap.dcae.collectors.veshv.simulators.dcaeapp.config.DcaeAppSimConfiguration
import org.onap.dcae.collectors.veshv.simulators.dcaeapp.kafka.ConsumerFactory
import org.onap.dcae.collectors.veshv.simulators.dcaeapp.remote.ApiServer
const val PROGRAM_NAME = "java $PACKAGE_NAME.MainKt"
fun main(args: Array<String>) =
- ArgBasedDcaeAppSimConfiguration().parse(args)
+ ArgDcaeAppSimConfiguration().parse(args)
.mapLeft(handleWrongArgumentErrorCurried(PROGRAM_NAME))
.map(::startApp)
.unsafeRunEitherSync(
import org.onap.dcae.collectors.veshv.utils.commandline.WrongArgumentError
-internal class ArgBasedDcaeAppSimConfigurationTest : Spek({
+internal class ArgDcaeAppSimulatorConfigurationTest : Spek({
- lateinit var cut: ArgBasedDcaeAppSimConfiguration
+ lateinit var cut: ArgDcaeAppSimConfiguration
+ val listenPort = "1234"
val kafkaBootstrapServers = "localhosting:123,localhostinger:12345"
val kafkaTopics = "top1,top2"
beforeEachTest {
- cut = ArgBasedDcaeAppSimConfiguration()
+ cut = ArgDcaeAppSimConfiguration()
}
fun parseExpectingSuccess(vararg cmdLine: String): DcaeAppSimConfiguration =
given("all parameters are present in the long form") {
beforeEachTest {
- result = parseExpectingSuccess("--listen-port", "6969",
+ result = parseExpectingSuccess(
+ "--listen-port", listenPort,
"--kafka-bootstrap-servers", kafkaBootstrapServers,
"--kafka-topics", kafkaTopics
)
}
it("should set proper port") {
- assertThat(result.apiPort).isEqualTo(6969)
+ assertThat(result.apiPort).isEqualTo(listenPort.toInt())
}
given("some parameters are present in the short form") {
beforeEachTest {
- result = parseExpectingSuccess("-p", "666",
+ result = parseExpectingSuccess(
+ "-p", listenPort,
"--kafka-bootstrap-servers", kafkaBootstrapServers,
"-f", kafkaTopics)
}
it("should set proper port") {
- assertThat(result.apiPort).isEqualTo(666)
+ assertThat(result.apiPort).isEqualTo(listenPort.toInt())
}
it("should set proper kafka bootstrap servers") {
}
}
- given("all optional parameters are absent") {
-
- beforeEachTest {
- result = parseExpectingSuccess("-s", kafkaBootstrapServers, "-f", kafkaTopics)
- }
-
- it("should set default port") {
- assertThat(result.apiPort).isEqualTo(DefaultValues.API_PORT)
- }
- }
-
describe("required parameter is absent") {
given("kafka topics are missing") {
it("should throw exception") {
- assertThat(parseExpectingFailure("-s", kafkaBootstrapServers))
- .isInstanceOf(WrongArgumentError::class.java)
+ assertThat(parseExpectingFailure(
+ "-p", listenPort,
+ "-s", kafkaBootstrapServers
+ )).isInstanceOf(WrongArgumentError::class.java)
+ }
+ }
+
+ given("kafka bootstrap servers is missing") {
+ it("should throw exception") {
+ assertThat(parseExpectingFailure(
+ "-p", listenPort,
+ "-f", kafkaTopics
+ )).isInstanceOf(WrongArgumentError::class.java)
}
}
- given("kafka bootstrap servers are missing") {
+ given("listen port is missing") {
it("should throw exception") {
- assertThat(parseExpectingFailure("-f", kafkaTopics))
- .isInstanceOf(WrongArgumentError::class.java)
+ assertThat(parseExpectingFailure(
+ "-p", kafkaTopics,
+ "-s", kafkaBootstrapServers
+ )).isInstanceOf(WrongArgumentError::class.java)
}
}
}
LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
LABEL maintainer="Nokia Wroclaw ONAP Team"
-EXPOSE 6061
-
WORKDIR /opt/ves-hv-collector
ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
-CMD ["--listen-port", "6061","--config-url", "http://consul:8500/v1/kv/veshv-config"]
COPY target/libs/external/* ./
COPY target/libs/internal/* ./
COPY target/hv-collector-main-*.jar ./
*/
package org.onap.dcae.collectors.veshv.main
+import arrow.core.ForOption
+import arrow.core.Option
+import arrow.core.fix
+import arrow.instances.extensions
+import arrow.typeclasses.binding
import org.apache.commons.cli.CommandLine
import org.apache.commons.cli.DefaultParser
import org.onap.dcae.collectors.veshv.domain.SecurityConfiguration
import org.onap.dcae.collectors.veshv.utils.commandline.CommandLineOption.*
import java.time.Duration
-internal class ArgBasedServerConfiguration : ArgBasedConfiguration<ServerConfiguration>(DefaultParser()) {
+internal class ArgVesHvConfiguration : ArgBasedConfiguration<ServerConfiguration>(DefaultParser()) {
override val cmdLineOptionsList = listOf(
LISTEN_PORT,
CONSUL_CONFIG_URL,
DUMMY_MODE
)
- override fun getConfiguration(cmdLine: CommandLine): ServerConfiguration {
- val port = cmdLine.intValue(LISTEN_PORT, DefaultValues.PORT)
- val idleTimeoutSec = cmdLine.longValue(IDLE_TIMEOUT_SEC, DefaultValues.IDLE_TIMEOUT_SEC)
- val dummyMode = cmdLine.hasOption(DUMMY_MODE)
- val security = createSecurityConfiguration(cmdLine)
- val configurationProviderParams = createConfigurationProviderParams(cmdLine);
- return ServerConfiguration(
- port = port,
- configurationProviderParams = configurationProviderParams,
- securityConfiguration = security,
- idleTimeout = Duration.ofSeconds(idleTimeoutSec),
- dummyMode = dummyMode)
- }
+ override fun getConfiguration(cmdLine: CommandLine): Option<ServerConfiguration> =
+ ForOption extensions {
+ binding {
+ val listenPort = cmdLine.intValue(LISTEN_PORT).bind()
+ val idleTimeoutSec = cmdLine.longValue(IDLE_TIMEOUT_SEC, DefaultValues.IDLE_TIMEOUT_SEC)
+ val dummyMode = cmdLine.hasOption(DUMMY_MODE)
+ val security = createSecurityConfiguration(cmdLine)
+ val configurationProviderParams = createConfigurationProviderParams(cmdLine)
+
+ ServerConfiguration(
+ listenPort = listenPort,
+ configurationProviderParams = configurationProviderParams,
+ securityConfiguration = security,
+ idleTimeout = Duration.ofSeconds(idleTimeoutSec),
+ dummyMode = dummyMode)
+ }.fix()
+ }
+
private fun createConfigurationProviderParams(cmdLine: CommandLine): ConfigurationProviderParams {
val configUrl = cmdLine.stringValue(CONSUL_CONFIG_URL, DefaultValues.CONFIG_URL)
}
internal object DefaultValues {
- const val PORT = 6061
const val CONSUL_FIRST_REQUEST_DELAY = 10L
const val CONSUL_REQUEST_INTERVAL = 5L
const val CONFIG_URL = ""
private const val PROGRAM_NAME = "java org.onap.dcae.collectors.veshv.main.MainKt"
fun main(args: Array<String>) =
- ArgBasedServerConfiguration().parse(args)
+ ArgVesHvConfiguration().parse(args)
.mapLeft(handleWrongArgumentErrorCurried(PROGRAM_NAME))
.map(::createServer)
.map {
import org.jetbrains.spek.api.dsl.it
import org.jetbrains.spek.api.dsl.on
import org.onap.dcae.collectors.veshv.domain.SecurityConfiguration
-import org.onap.dcae.collectors.veshv.main.ArgBasedServerConfiguration.*
+import org.onap.dcae.collectors.veshv.main.ArgVesHvConfiguration.DefaultValues
import org.onap.dcae.collectors.veshv.model.ServerConfiguration
+import org.onap.dcae.collectors.veshv.utils.commandline.WrongArgumentError
import java.nio.file.Paths
import java.time.Duration
* @author Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
* @since May 2018
*/
-object ArgBasedServerConfigurationTest : Spek({
- lateinit var cut: ArgBasedServerConfiguration
+object ArgVesHvConfigurationTest : Spek({
+ lateinit var cut: ArgVesHvConfiguration
val configurationUrl = "http://test-address/test"
val firstRequestDelay = "10"
val requestInterval = "5"
val trustCert = Paths.get("/", "etc", "ves", "trusted.crt")
beforeEachTest {
- cut = ArgBasedServerConfiguration()
+ cut = ArgVesHvConfiguration()
}
fun parse(vararg cmdLine: String): ServerConfiguration =
cut.parse(cmdLine).fold(
- {throw AssertionError("Parsing result should be present")},
+ { throw AssertionError("Parsing result should be present") },
::identity
)
+ fun parseExpectingFailure(vararg cmdLine: String) =
+ cut.parse(cmdLine).fold(::identity) {
+ throw AssertionError("parsing should have failed")
+ }
+
describe("parsing arguments") {
given("all parameters are present in the long form") {
lateinit var result: ServerConfiguration
}
it("should set proper port") {
- assertThat(result.port).isEqualTo(6969)
+ assertThat(result.listenPort).isEqualTo(listenPort.toInt())
}
it("should set proper first consul request delay") {
assertThat(result.configurationProviderParams.firstRequestDelay)
- .isEqualTo(Duration.ofSeconds(10))
+ .isEqualTo(Duration.ofSeconds(firstRequestDelay.toLong()))
}
it("should set proper consul request interval") {
assertThat(result.configurationProviderParams.requestInterval)
- .isEqualTo(Duration.ofSeconds(5))
+ .isEqualTo(Duration.ofSeconds(requestInterval.toLong()))
}
it("should set proper config url") {
lateinit var result: ServerConfiguration
beforeEachTest {
- result = parse("-p", "666", "-c", configurationUrl, "-d", firstRequestDelay)
+ result = parse("-p", listenPort, "-c", configurationUrl, "-d", firstRequestDelay)
}
it("should set proper port") {
- assertThat(result.port).isEqualTo(666)
+ assertThat(result.listenPort).isEqualTo(listenPort.toInt())
}
it("should set proper first consul request delay") {
assertThat(result.configurationProviderParams.firstRequestDelay)
- .isEqualTo(Duration.ofSeconds(10))
+ .isEqualTo(Duration.ofSeconds(firstRequestDelay.toLong()))
}
it("should set proper config url") {
lateinit var result: ServerConfiguration
beforeEachTest {
- result = parse()
- }
-
- it("should set default port") {
- assertThat(result.port).isEqualTo(DefaultValues.PORT)
+ result = parse("--listen-port", listenPort)
}
it("should set default config url") {
}
}
}
+
+ describe("required parameter is absent") {
+ given("listen port is missing") {
+ it("should throw exception") {
+ assertThat(parseExpectingFailure(
+ "--ssl-disable",
+ "--config-url", configurationUrl,
+ "--first-request-delay", firstRequestDelay,
+ "--request-interval", requestInterval,
+ "--private-key-file", pk.toFile().absolutePath,
+ "--cert-file", cert.toFile().absolutePath,
+ "--trust-cert-file", trustCert.toFile().absolutePath)
+ ).isInstanceOf(WrongArgumentError::class.java)
+ }
+ }
+ }
}
})
import arrow.core.Either
import arrow.core.Option
import arrow.core.Try
+import arrow.core.flatMap
import arrow.core.getOrElse
import org.apache.commons.cli.CommandLine
import org.apache.commons.cli.CommandLineParser
.toEither()
.mapLeft { ex -> WrongArgumentError(ex, commandLineOptions) }
.map(this::getConfiguration)
+ .flatMap {
+ it.toEither {
+ WrongArgumentError(
+ "Unexpected error when parsing command line arguments",
+ commandLineOptions)
+ }
+ }
}
- protected abstract fun getConfiguration(cmdLine: CommandLine): T
+ protected abstract fun getConfiguration(cmdLine: CommandLine): Option<T>
protected fun CommandLine.intValue(cmdLineOpt: CommandLineOption, default: Int): Int =
intValue(cmdLineOpt).getOrElse { default }
protected fun CommandLine.longValue(cmdLineOpt: CommandLineOption, default: Long): Long =
longValue(cmdLineOpt).getOrElse { default }
- protected fun CommandLine.stringValue(cmdLineOpt: CommandLineOption): Option<String> =
- optionValue(cmdLineOpt)
-
protected fun CommandLine.stringValue(cmdLineOpt: CommandLineOption, default: String): String =
optionValue(cmdLineOpt).getOrElse { default }
+
+ protected fun CommandLine.intValue(cmdLineOpt: CommandLineOption): Option<Int> =
+ optionValue(cmdLineOpt).map(String::toInt)
+
+ protected fun CommandLine.longValue(cmdLineOpt: CommandLineOption): Option<Long> =
+ optionValue(cmdLineOpt).map(String::toLong)
+
+ protected fun CommandLine.stringValue(cmdLineOpt: CommandLineOption): Option<String> =
+ optionValue(cmdLineOpt)
+
protected fun CommandLine.hasOption(cmdLineOpt: CommandLineOption): Boolean =
this.hasOption(cmdLineOpt.option.opt)
private fun CommandLine.optionValue(cmdLineOpt: CommandLineOption): Option<String> =
Option.fromNullable(getOptionValue(cmdLineOpt.option.opt))
-
- private fun CommandLine.intValue(cmdLineOpt: CommandLineOption): Option<Int> =
- optionValue(cmdLineOpt).map(String::toInt)
-
- private fun CommandLine.longValue(cmdLineOpt: CommandLineOption): Option<Long> =
- optionValue(cmdLineOpt).map(String::toLong)
}
enum class CommandLineOption(val option: Option) {
LISTEN_PORT(Option.builder("p")
.longOpt("listen-port")
+ .required()
.hasArg()
.desc("Listen port")
.build()
formatter.printHelp(programName, options)
}
}
+
LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
LABEL maintainer="Nokia Wroclaw ONAP Team"
-EXPOSE 5000
-
WORKDIR /opt/ves-hv-client-simulator
ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.simulators.xnf.MainKt"]
-CMD ["--ves-host", "ves-hv-collector", "--ves-port", "6061"]
COPY target/libs/external/* ./
COPY target/libs/internal/* ./
COPY target/hv-collector-xnf-simulator-*.jar ./
*/
package org.onap.dcae.collectors.veshv.simulators.xnf.config
+import arrow.core.ForOption
+import arrow.core.Option
+import arrow.core.fix
+import arrow.instances.extensions
+import arrow.typeclasses.binding
import org.apache.commons.cli.CommandLine
import org.apache.commons.cli.DefaultParser
import org.onap.dcae.collectors.veshv.domain.SecurityConfiguration
* @author Jakub Dudycz <jakub.dudycz@nokia.com>
* @since June 2018
*/
-internal class ArgConfigurationProvider : ArgBasedConfiguration<SimulatorConfiguration>(DefaultParser()) {
+internal class ArgXnfSimulatorConfiguration : ArgBasedConfiguration<SimulatorConfiguration>(DefaultParser()) {
override val cmdLineOptionsList = listOf(
VES_HV_PORT,
VES_HV_HOST,
TRUST_CERT_FILE
)
- override fun getConfiguration(cmdLine: CommandLine): SimulatorConfiguration {
- val vesHost = cmdLine.stringValue(VES_HV_HOST, DefaultValues.VES_HV_HOST)
- val vesPort = cmdLine.intValue(VES_HV_PORT, DefaultValues.VES_HV_PORT)
- val listenPort = cmdLine.intValue(LISTEN_PORT, DefaultValues.LISTEN_PORT)
+ override fun getConfiguration(cmdLine: CommandLine): Option<SimulatorConfiguration> =
+ ForOption extensions {
+ binding {
+ val listenPort = cmdLine.intValue(LISTEN_PORT).bind()
+ val vesHost = cmdLine.stringValue(VES_HV_HOST).bind()
+ val vesPort = cmdLine.intValue(VES_HV_PORT).bind()
- return SimulatorConfiguration(
- listenPort,
- vesHost,
- vesPort,
- parseSecurityConfig(cmdLine))
- }
+ SimulatorConfiguration(
+ listenPort,
+ vesHost,
+ vesPort,
+ parseSecurityConfig(cmdLine))
+ }.fix()
+ }
private fun parseSecurityConfig(cmdLine: CommandLine): SecurityConfiguration {
val sslDisable = cmdLine.hasOption(SSL_DISABLE)
const val PRIVATE_KEY_FILE = "/etc/ves-hv/client.key"
const val CERT_FILE = "/etc/ves-hv/client.crt"
const val TRUST_CERT_FILE = "/etc/ves-hv/trust.crt"
- const val VES_HV_PORT = 6061
- const val VES_HV_HOST = "veshvcollector"
- const val LISTEN_PORT = 6062
}
}
*/
package org.onap.dcae.collectors.veshv.simulators.xnf
-import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgConfigurationProvider
+import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgXnfSimulatorConfiguration
import org.onap.dcae.collectors.veshv.simulators.xnf.impl.HttpServer
import org.onap.dcae.collectors.veshv.simulators.xnf.impl.XnfSimulator
import org.onap.dcae.collectors.veshv.utils.arrow.ExitFailure
* @author Jakub Dudycz <jakub.dudycz@nokia.com>
* @since June 2018
*/
-fun main(args: Array<String>) = ArgConfigurationProvider().parse(args)
+fun main(args: Array<String>) = ArgXnfSimulatorConfiguration().parse(args)
.mapLeft(handleWrongArgumentErrorCurried(PROGRAM_NAME))
.map {
XnfSimulator(it)
package org.onap.dcae.collectors.veshv.main.config
import arrow.core.identity
+import org.assertj.core.api.Assertions
import org.assertj.core.api.Assertions.assertThat
import org.jetbrains.spek.api.Spek
import org.jetbrains.spek.api.dsl.describe
import org.jetbrains.spek.api.dsl.it
import org.jetbrains.spek.api.dsl.on
import org.onap.dcae.collectors.veshv.domain.SecurityConfiguration
-import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgConfigurationProvider
-import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgConfigurationProvider.DefaultValues
+import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgXnfSimulatorConfiguration
+import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgXnfSimulatorConfiguration.DefaultValues
import org.onap.dcae.collectors.veshv.simulators.xnf.config.SimulatorConfiguration
+import org.onap.dcae.collectors.veshv.utils.commandline.WrongArgumentError
import java.nio.file.Paths
import kotlin.test.assertTrue
-object ArgConfigurationProviderTest : Spek({
- lateinit var cut: ArgConfigurationProvider
- val vesHost = "localhosting"
+object ArgXnfSimulatorConfiurationTest : Spek({
+ lateinit var cut: ArgXnfSimulatorConfiguration
+ val listenPort = "4321"
+ val vesHost = "localhost"
+ val vesPort = "1234"
val pk = Paths.get("/", "etc", "ves", "pk.pem")
val cert = Paths.get("/", "etc", "ssl", "certs", "ca-bundle.crt")
val trustCert = Paths.get("/", "etc", "ves", "trusted.crt")
beforeEachTest {
- cut = ArgConfigurationProvider()
+ cut = ArgXnfSimulatorConfiguration()
}
fun parse(vararg cmdLine: String): SimulatorConfiguration =
::identity
)
+ fun parseExpectingFailure(vararg cmdLine: String) =
+ cut.parse(cmdLine).fold(
+ ::identity,
+ { throw AssertionError("parsing should have failed") }
+ )
+
describe("parsing arguments") {
lateinit var result: SimulatorConfiguration
beforeEachTest {
result = parse("--ssl-disable",
- "--ves-port", "6969",
+ "--listen-port", listenPort,
"--ves-host", vesHost,
+ "--ves-port", vesPort,
"--private-key-file", pk.toFile().absolutePath,
"--cert-file", cert.toFile().absolutePath,
"--trust-cert-file", trustCert.toFile().absolutePath)
}
- it("should set proper port") {
- assertThat(result.vesPort).isEqualTo(6969)
+ it("should set proper listen port") {
+ assertThat(result.listenPort).isEqualTo(listenPort.toInt())
+ }
+
+ it("should set proper ves host") {
+ assertThat(result.vesHost).isEqualTo(vesHost)
+ }
+
+ it("should set proper ves port") {
+ assertThat(result.vesPort).isEqualTo(vesPort.toInt())
}
it("should set proper security configuration") {
given("some parameters are present in the short form") {
beforeEachTest {
- result = parse("-h", "ves-hv", "--ves-port", "666")
+ result = parse("-p", listenPort, "-h", vesHost, "--ves-port", vesPort)
+ }
+
+ it("should set proper listen port") {
+ assertThat(result.listenPort).isEqualTo(listenPort.toInt())
+ }
+
+ it("should set proper ves host") {
+ assertThat(result.vesHost).isEqualTo(vesHost)
}
- it("should set proper port") {
- assertThat(result.vesPort).isEqualTo(666)
+ it("should set proper ves port") {
+ assertThat(result.vesPort).isEqualTo(vesPort.toInt())
}
}
given("all optional parameters are absent") {
beforeEachTest {
- result = parse("-h", "ves-hv", "-v", "666")
+ result = parse("-p", listenPort, "-h", vesHost, "-v", vesPort)
}
on("security config") {
given("disabled ssl certs together with all other parameters") {
beforeEachTest {
result = parse("--ssl-disable",
+ "--listen-port", listenPort,
"--ves-port", "888",
"--ves-host", vesHost,
"--private-key-file", pk.toFile().absolutePath,
}
}
}
+
+ describe("required parameter is absent") {
+ given("ves port is missing") {
+ it("should throw exception") {
+ assertThat(parseExpectingFailure("-p", listenPort, "-h", vesHost))
+ .isInstanceOf(WrongArgumentError::class.java)
+ }
+ }
+
+ given("ves host is missing") {
+ it("should throw exception") {
+ assertThat(parseExpectingFailure("-p", listenPort, "-v", vesPort))
+ .isInstanceOf(WrongArgumentError::class.java)
+ }
+ }
+
+ given("listen port is missing") {
+ it("should throw exception") {
+ assertThat(parseExpectingFailure("-h", vesHost, "-v", vesPort))
+ .isInstanceOf(WrongArgumentError::class.java)
+ }
+ }
+ }
}
})
Code Review / dcaegen2 / collectors / hv-ves.git / commitdiff