From 5ddee4d3b85c1b180acb506099c44678edcc57d5 Mon Sep 17 00:00:00 2001
From: Filip Krzywka <filip.krzywka@nokia.com>
Date: Fri, 29 Mar 2019 14:52:25 +0100
Subject: Merge configurations

- changed temporarily HV-VES default log level to DEBUG as in current
implementation we are applying LogLevel defined in configuration file only
if we successfully retrieve one from configuration-module, which means
that inside of this module we are logging on default level (from logback
file). This should be fixed in future work
- reduced log level on SDK's CbsClientImpl as it's logging frequency was
too high

Change-Id: If50df18df099c34bfc36d39b045140f9b9ad87f6
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
---
 development/bin/consul.sh      | 17 ++++++++++-------
 development/docker-compose.yml | 14 +++++++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'development')

diff --git a/development/bin/consul.sh b/development/bin/consul.sh
index 39f0bdef..2a6bc0f5 100755
--- a/development/bin/consul.sh
+++ b/development/bin/consul.sh
@@ -59,13 +59,16 @@ shift $((OPTIND-1))
 DOMAIN=${1:-perf3gpp}
 TOPIC=${2:-HV_VES_PERF3GPP}
 
-CONFIGURATION="
-{
-    \"collector.routing\":
-        [{
-            \"fromDomain\": \"${DOMAIN}\",
-            \"toTopic\": \"${TOPIC}\"
-        }]
+CONFIGURATION="{
+  "streams_publishes": {
+    "${DOMAIN}": {
+      "type": "kafka",
+      "kafka_info": {
+        "bootstrap_servers": "message-router-kafka:9092",
+        "topic_name": "${TOPIC}"
+      }
+    }
+  }
 }"
 CONFIGURATION_ENDPOINT=localhost:8500/v1/kv/veshv-config
 
diff --git a/development/docker-compose.yml b/development/docker-compose.yml
index e85b520b..d135e8b4 100644
--- a/development/docker-compose.yml
+++ b/development/docker-compose.yml
@@ -43,12 +43,15 @@ services:
     image: docker.io/consul:1.0.6
     restart: on-failure
     command: ["kv", "put", "-http-addr=http://consul-server:8500", "dcae-hv-ves-collector", '{
-                                              "collector.routing": [
-                                                {
-                                                  "fromDomain": "perf3gpp",
-                                                  "toTopic": "HV_VES_PERF3GPP"
+                                              "streams_publishes": {
+                                                "perf3gpp": {
+                                                  "type": "kafka",
+                                                  "kafka_info": {
+                                                    "bootstrap_servers": "message-router-kafka:9092",
+                                                    "topic_name": "HV_VES_PERF3GPP"
+                                                  }
                                                 }
-                                              ]
+                                              }
                                             }'
     ]
     depends_on:
@@ -74,6 +77,7 @@ services:
       - "6061:6061/tcp"
     environment:
       JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid -Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml"
+      VESHV_CONFIGURATION_FILE: "/etc/ves-hv/configuration/base.json"
       CONSUL_HOST: "consul-server"
       CONFIG_BINDING_SERVICE: "CBS"
       HOSTNAME: "dcae-hv-ves-collector"
-- 
cgit 1.2.3-korg