From 7f2c6664854b295eb6779e8df749ac2204f66453 Mon Sep 17 00:00:00 2001
From: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Date: Thu, 20 Dec 2018 11:51:44 +0100
Subject: [PATCH] Align with HV-VES startup changes

Change-Id: I0f061343b8cdb38a62fd6012888d19bad5296912
Issue-ID: DCAEGEN2-1047
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
---
 .../testsuites/docker-compose.yml                      | 18 +++++++++++++-----
 .../testcases/resources/ves-hv-configuration.json      |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 9ba27750..67178353 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -46,10 +46,13 @@ services:
     ports:
     - "6060:6060"
     - "6061:6061/tcp"
-    entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "${HV_VES_MAIN_CLASS}"]
-    command: ["--listen-port", "6061","--config-url", "${HV_VES_CONFIG_URL}",
+    command: ["--listen-port", "6061",
+              "--config-url", "${HV_VES_CONFIG_URL}",
+              "--kafka-bootstrap-servers", "kafka:9092",
               "--key-store-password", "onaponap",
               "--trust-store-password", "onaponap"]
+    environment:
+      JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid"
     healthcheck:
       interval: 10s
       timeout: 5s
@@ -67,8 +70,12 @@ services:
     ports:
     - "7060:6060"
     - "7061:6061/tcp"
-    entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "${HV_VES_MAIN_CLASS}"]
-    command: ["--listen-port", "6061","--config-url", "${HV_VES_CONFIG_URL}", "--ssl-disable"]
+    command: ["--listen-port", "6061",
+              "--config-url", "${HV_VES_CONFIG_URL}",
+              "--kafka-bootstrap-servers", "kafka:9092",
+              "--ssl-disable"]
+    environment:
+      JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid"
     healthcheck:
       interval: 10s
       timeout: 5s
@@ -96,4 +103,5 @@ services:
     networks:
       ves-hv-default:
         aliases:
-        - dcae-app-simulator
\ No newline at end of file
+        - dcae-app-simulator
+
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json
index 9ef72497..1a65cf1b 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json
@@ -1,9 +1,9 @@
 {
-  "dmaap.kafkaBootstrapServers": "kafka:9092",
   "collector.routing": [
     {
       "fromDomain": "perf3gpp",
       "toTopic": "TEST_HV_VES_PERF3GPP"
     }
   ]
-}
\ No newline at end of file
+}
+
-- 
2.16.6