Align HV-VES tests to use mounted config file instead of Consul
Issue-ID: DCAEGEN2-2718
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: Ia16192b432eadab6e2d10ed1435e888f3e700da1
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/hv-ves-configuration.yaml b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/hv-ves-configuration.yaml
new file mode 100644
index 0000000..0eb41f1
--- /dev/null
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/hv-ves-configuration.yaml
@@ -0,0 +1,17 @@
+streams_publishes:
+ perf3gpp:
+ aaf_credentials:
+ password: admin_secret
+ username: admin
+ kafka_info:
+ bootstrap_servers: kafka:9092
+ topic_name: TEST_HV_VES_PERF3GPP
+ type: kafka
+ ves-3gpp-heartbeat:
+ aaf_credentials:
+ password: admin_secret
+ username: admin
+ kafka_info:
+ bootstrap_servers: kafka:9092
+ topic_name: TEST_SEC_3GPP_HEARTBEAT_OUTPUT
+ type: kafka
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index d89e82b..441ad35 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -71,30 +71,6 @@
- hv-ves-default
#
- # Consul / CBS
- #
-
- consul-server:
- image: docker.io/consul:1.0.6
- ports:
- - "8500:8500"
- volumes:
- - ./consul/:/consul/config
- networks:
- - hv-ves-default
-
- config-binding-service:
- image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.5.2
- ports:
- - "10000:10000"
- environment:
- - CONSUL_HOST
- depends_on:
- - consul-server
- networks:
- - hv-ves-default
-
- #
# DCAE HV VES Collector
#
@@ -110,6 +86,7 @@
- CONSUL_HOST
- CONFIG_BINDING_SERVICE
- CONFIG_BINDING_SERVICE_SERVICE_PORT
+ - CBS_CLIENT_CONFIG_PATH
healthcheck:
interval: 10s
timeout: 5s
@@ -118,7 +95,6 @@
volumes:
- ./collector/:/etc/ves-hv/
depends_on:
- - config-binding-service
- kafka
networks:
- hv-ves-default
@@ -135,6 +111,7 @@
- CONSUL_HOST
- CONFIG_BINDING_SERVICE
- CONFIG_BINDING_SERVICE_SERVICE_PORT
+ - CBS_CLIENT_CONFIG_PATH
healthcheck:
interval: 10s
timeout: 5s
@@ -143,7 +120,6 @@
volumes:
- ./collector/:/etc/ves-hv/
depends_on:
- - config-binding-service
- kafka
networks:
- hv-ves-default
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
index e3e253b..27d7e0f 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
@@ -24,6 +24,7 @@
export CONSUL_HOST="consul-server"
export CONFIG_BINDING_SERVICE="config-binding-service"
export CONFIG_BINDING_SERVICE_SERVICE_PORT="10000"
+export CBS_CLIENT_CONFIG_PATH=/etc/ves-hv/configuration/hv-ves-configuration.yaml
export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
index 1bd0ba1..88637a8 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
@@ -24,6 +24,7 @@
export CONSUL_HOST="consul-server"
export CONFIG_BINDING_SERVICE="config-binding-service"
export CONFIG_BINDING_SERVICE_SERVICE_PORT="10000"
+export CBS_CLIENT_CONFIG_PATH=/etc/ves-hv/configuration/hv-ves-configuration.yaml
export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}