Implement blocking consul calls

Replaced interval based requesting for consul configuration with blocking query calls

Closes ONAP-80

Change-Id: If70365bae9fde513d99b047209d085122a5df0dd
Signed-off-by: Jakub Dudycz <jdudycz@nokia.com>
Issue-ID: DCAEGEN2-601

1 files changed, 14 insertions, 7 deletions

diff --git a/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgBasedServerConfigurationTest.kt b/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgBasedServerConfigurationTest.kt
index 2c49cf98..8f0c2af9 100644
--- a/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgBasedServerConfigurationTest.kt
+++ b/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgBasedServerConfigurationTest.kt
@@ -40,8 +40,8 @@ import java.time.Duration
 object ArgBasedServerConfigurationTest : Spek({
     lateinit var cut: ArgBasedServerConfiguration
     val configurationUrl = "http://test-address/test"
+    val firstRequestDelay = "10"
     val listenPort = "6969"
-    val updateInterval = "10"
     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")
@@ -63,7 +63,7 @@ object ArgBasedServerConfigurationTest : Spek({
             beforeEachTest {
                 result = parse("--listen-port", listenPort,
                         "--config-url", configurationUrl,
-                        "--update-interval", updateInterval,
+                        "--first-request-delay", firstRequestDelay,
                         "--private-key-file", pk.toFile().absolutePath,
                         "--cert-file", cert.toFile().absolutePath,
                         "--trust-cert-file", trustCert.toFile().absolutePath)
@@ -73,8 +73,8 @@ object ArgBasedServerConfigurationTest : Spek({
                 assertThat(result.port).isEqualTo(6969)
             }
 
-            it("should set update interval") {
-                assertThat(result.configurationUpdateInterval).isEqualTo(Duration.ofSeconds(10))
+            it("should set proper first consul request delay") {
+                assertThat(result.firstRequestDelay).isEqualTo(Duration.ofSeconds(10))
             }
 
             it("should set proper config url") {
@@ -86,19 +86,25 @@ object ArgBasedServerConfigurationTest : Spek({
                         SecurityConfiguration(pk, cert, trustCert)
                 )
             }
+
+
         }
 
         given("some parameters are present in the short form") {
             lateinit var result: ServerConfiguration
 
             beforeEachTest {
-                result = parse("-p", "666", "-c", configurationUrl)
+                result = parse("-p", "666", "-c", configurationUrl, "-d", firstRequestDelay)
             }
 
             it("should set proper port") {
                 assertThat(result.port).isEqualTo(666)
             }
 
+            it("should set proper first consul request delay") {
+                assertThat(result.firstRequestDelay).isEqualTo(Duration.ofSeconds(10))
+            }
+
             it("should set proper config url") {
                 assertThat(result.configurationUrl).isEqualTo(configurationUrl)
             }
@@ -119,8 +125,9 @@ object ArgBasedServerConfigurationTest : Spek({
                 assertThat(result.configurationUrl).isEqualTo(DefaultValues.CONFIG_URL)
             }
 
-            it("should set default update interval") {
-                assertThat(result.configurationUpdateInterval).isEqualTo(Duration.ofSeconds(DefaultValues.UPDATE_INTERVAL))
+            it("should set default first consul request delay") {
+                assertThat(result.firstRequestDelay)
+                        .isEqualTo(Duration.ofSeconds(DefaultValues.CONSUL_FIRST_REQUEST_DELAY))
             }
 
             on("security config") {