Use CBS by means of SDK in place of Consul

- changed IO creation in main to fix error with too early calling
changeState method on collector HealthState
- increased coverage a little with few tests
- corrected coverage-report pom file to include new modules
- temporarily changed to 1.1.4-SNAPSHOT version of sdk due to need
of new version of CBSLookup

Change-Id: Ic73b46cf881ab4fabf52bef0327b09082aa90dc6
Issue-ID: DCAEGEN2-1302
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>

2 files changed, 4 insertions, 14 deletions

diff --git a/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt b/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt
index da2bfb48..6d219106 100644
--- a/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt
+++ b/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * dcaegen2-collectors-veshv
  * ================================================================================
- * Copyright (C) 2018 NOKIA
+ * Copyright (C) 2018-2019 NOKIA
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,6 @@ object ArgVesHvConfigurationTest : Spek({
     lateinit var cut: ArgVesHvConfiguration
     val kafkaBootstrapServers = "dmaap-mr-wro:6666,dmaap-mr-gda:6666"
     val healthCheckApiPort = "6070"
-    val configurationUrl = "http://test-address/test"
     val firstRequestDelay = "10"
     val requestInterval = "5"
     val listenPort = "6969"
@@ -63,7 +62,6 @@ object ArgVesHvConfigurationTest : Spek({
                         "--kafka-bootstrap-servers", kafkaBootstrapServers,
                         "--health-check-api-port", healthCheckApiPort,
                         "--listen-port", listenPort,
-                        "--config-url", configurationUrl,
                         "--first-request-delay", firstRequestDelay,
                         "--request-interval", requestInterval,
                         "--key-store", "/tmp/keys.p12",
@@ -95,21 +93,16 @@ object ArgVesHvConfigurationTest : Spek({
                 assertThat(result.healthCheckApiListenAddress.address.hostAddress).isEqualTo("0.0.0.0")
             }
 
-            it("should set proper first consul request delay") {
+            it("should set proper first request delay") {
                 assertThat(result.configurationProviderParams.firstRequestDelay)
                         .isEqualTo(Duration.ofSeconds(firstRequestDelay.toLong()))
             }
 
-            it("should set proper consul request interval") {
+            it("should set proper request interval") {
                 assertThat(result.configurationProviderParams.requestInterval)
                         .isEqualTo(Duration.ofSeconds(requestInterval.toLong()))
             }
 
-            it("should set proper config url") {
-                assertThat(result.configurationProviderParams.configurationUrl)
-                        .isEqualTo(configurationUrl)
-            }
-
             it("should set proper security configuration") {
                 assertThat(result.securityConfiguration.keys.isEmpty()).isFalse()
 
@@ -135,7 +128,6 @@ object ArgVesHvConfigurationTest : Spek({
                 it("should throw exception") {
                     assertThat(
                             cut.parseExpectingFailure(
-                                    "--config-url", configurationUrl,
                                     "--ssl-disable",
                                     "--first-request-delay", firstRequestDelay,
                                     "--request-interval", requestInterval
@@ -164,7 +156,6 @@ object ArgVesHvConfigurationTest : Spek({
                             "--kafka-bootstrap-servers", kafkaBootstrapServers,
                             "--health-check-api-port", healthCheckApiPort,
                             "--listen-port", listenPort,
-                            "--config-url", configurationUrl,
                             "--first-request-delay", firstRequestDelay,
                             "--request-interval", requestInterval,
                             "--key-store", "/tmp/keys.p12",
@@ -183,7 +174,6 @@ object ArgVesHvConfigurationTest : Spek({
                             "--kafka-bootstrap-servers", kafkaBootstrapServers,
                             "--health-check-api-port", healthCheckApiPort,
                             "--listen-port", listenPort,
-                            "--config-url", configurationUrl,
                             "--first-request-delay", firstRequestDelay,
                             "--request-interval", requestInterval,
                             "--key-store", "/tmp/keys.p12",
diff --git a/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MainTest.kt b/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MainTest.kt
index e032f00e..e18b0b10 100644
--- a/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MainTest.kt
+++ b/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MainTest.kt
@@ -51,7 +51,7 @@ internal object MainTest : Spek({
             val healthState: HealthState = mock()
 
             on("closeServers") {
-                closeServers(handle, healthState = healthState).unsafeRunSync()
+                closeServers(handle, healthState = healthState).invoke()
 
                 it("should close all handles") {
                     assertThat(closed).isTrue()