Align with configuration present in consul

Rename few configuration json keys inside collector code to match those on consul.

Change-Id: I400aebce98049118a30d7959dc6655a4da6016bf
Issue-ID: DCAEGEN2-774
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>

diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt
index 7de2830..d8ea45d 100644 (file)
--- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt
+++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt
@@ -108,10 +108,10 @@ internal class ConsulConfigurationProvider(private val http: HttpAdapter,
     }
 
     private fun createCollectorConfiguration(configuration: JsonObject): CollectorConfiguration {
-        val routing = configuration.getJsonArray("routing")
+        val routing = configuration.getJsonArray("collector.routing")
 
         return CollectorConfiguration(
-                kafkaBootstrapServers = configuration.getString("kafkaBootstrapServers"),
+                kafkaBootstrapServers = configuration.getString("dmaap.kafkaBootstrapServers"),
                 routing = org.onap.dcae.collectors.veshv.model.routing {
                     for (route in routing) {
                         val routeObj = route.asJsonObject()

diff --git a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt b/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt
index 7885892..59224cc 100644 (file)
--- a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt
+++ b/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt
@@ -131,8 +131,8 @@ private fun constructConsulConfigProvider(url: String,
 fun constructConsulResponse(): String {
 
     val config = """{
-    "kafkaBootstrapServers": "kafka:9093",
-    "routing": [
+    "dmaap.kafkaBootstrapServers": "kafka:9093",
+    "collector.routing": [
             {
                 "fromDomain": 1,
                 "toTopic": "test-topic-1"