From a313a7fb4ba81e960397ec432ce02c28804a44b4 Mon Sep 17 00:00:00 2001
From: Izabela Zawadzka <izabela.zawadzka@nokia.com>
Date: Wed, 10 Jul 2019 09:29:51 +0200
Subject: Use consumers in main

It includes --disable-processing flag.
Also fixed some issues with script for local performance test.
Also added KafkaConsumer::poll in OffsetKafka Consumer - without it KafkaConsumer::assignment returns empty set

Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
Issue-ID: DCAEGEN2-1657
Change-Id: I95fadb45f321398346094dfa0c4a6e9da954c186
---
 tools/performance/local/docker-compose.yml        | 2 +-
 tools/performance/local/local-performance-test.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'tools/performance')

diff --git a/tools/performance/local/docker-compose.yml b/tools/performance/local/docker-compose.yml
index c0dfc478..73d02fd1 100644
--- a/tools/performance/local/docker-compose.yml
+++ b/tools/performance/local/docker-compose.yml
@@ -104,7 +104,7 @@ services:
     image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-kafka-consumer
     ports:
       - "6064:6064/tcp"
-    command: ["--listen-port", "6062"]
+    command: ["--listen-port", "6064", "--kafka-topics", "HV_VES_PERF3GPP", "--kafka-bootstrap-servers",  "message-router-kafka-0:9093"]
     depends_on:
       - message-router-kafka-0
 
diff --git a/tools/performance/local/local-performance-test.sh b/tools/performance/local/local-performance-test.sh
index 3c885a64..6d08b8e7 100755
--- a/tools/performance/local/local-performance-test.sh
+++ b/tools/performance/local/local-performance-test.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-SCRIPT_DIRECTORY="$(dirname "$0")"
+SCRIPT_DIRECTORY="$(pwd "$0")"
 CERT_FILE=${CERT_FILE:-/ssl/client.p12}
 CERT_PASS_FILE=${CERT_PASS_FILE:-/ssl/client.pass}
-HV_VES_NETWORK=${HV_VES_NETWORK:-performance_default}
-VOLUME_MAPPING=${VOLUME_MAPPING:-$PWD/../ssl/:/ssl}
+HV_VES_NETWORK=${HV_VES_NETWORK:-local_default}
+VOLUME_MAPPING=${VOLUME_MAPPING:-$SCRIPT_DIRECTORY/../../ssl/:/ssl}
 PRODUCER_IMAGE_NAME=${PRODUCER_IMAGE_NAME:-the-a-team-registry-local.esisoj70.emea.nsn-net.net/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-rust-client:latest}
 
 PRODUCER_APP_NAME=hv-ves-producer
@@ -115,6 +115,7 @@ function clean(){
     echo "Clearing generated certs"
     cd ../../ssl
     ./gen-certs.sh clean
+
     cd "$SCRIPT_DIRECTORY"
 
     echo "Removing HV-VES components"
-- 
cgit 1.2.3-korg