From c3bf03a32a404f86fdf03287a41a8d1b78822ecf Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Mon, 1 Oct 2018 07:48:40 +0200 Subject: [PATCH] Use raw configuration endpoint - extracted variables shared in both collectors (encrypted/unencrypted) to .env file - change consul url to contain `?raw=true` parameter which allows to avoid decoding configuration Change-Id: Ib10cd8d0cb729a1231fa8a034698c824336b1b68 Issue-ID: DCAEGEN2-827 Signed-off-by: Filip Krzywka --- plans/dcaegen2-collectors-hv-ves/testsuites/.env | 9 +++ .../testsuites/docker-compose.yml | 65 +++++++++++----------- .../testcases/libraries/XnfSimulatorLibrary.py | 4 +- 3 files changed, 44 insertions(+), 34 deletions(-) create mode 100644 plans/dcaegen2-collectors-hv-ves/testsuites/.env diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env new file mode 100644 index 00000000..2a8bbe34 --- /dev/null +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/.env @@ -0,0 +1,9 @@ + +HV_VES_COLLECTOR_NAMESPACE=onap +HV_VES_GROUP_ID=org.onap.dcaegen2.collectors.hv-ves +HV_VES_IMAGE=hv-collector-main:latest +DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator:latest + +HV_VES_CONFIG_URL=http://consul:8500/v1/kv/veshv-config?raw=true +HV_VES_HEALTHCHECK_CMD=curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061 +HV_VES_MAIN_CLASS=org.onap.dcae.collectors.veshv.main.MainKt \ No newline at end of file diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index 2a928217..092af0c0 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml @@ -9,92 +9,91 @@ services: zookeeper: image: wurstmeister/zookeeper ports: - - "2181:2181" + - "2181:2181" networks: - - ves-hv-default + - ves-hv-default kafka: image: wurstmeister/kafka ports: - - "9092:9092" + - "9092:9092" environment: KAFKA_ADVERTISED_HOST_NAME: "kafka" KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true' KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181" KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092" volumes: - - /var/run/docker.sock:/var/run/docker.sock + - /var/run/docker.sock:/var/run/docker.sock depends_on: - - zookeeper + - zookeeper networks: - - ves-hv-default + - ves-hv-default consul: image: progrium/consul ports: - - "8500:8500" + - "8500:8500" environment: - - CONSUL_BIND_INTERFACE=eth0 + - CONSUL_BIND_INTERFACE=eth0 networks: ves-hv-default: aliases: - - consul + - consul command: ["-server", "-bootstrap"] ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE} ports: - - "6060:6060" - - "6061:6061/tcp" - entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"] - command: ["--listen-port", "6061", - "--config-url", "http://consul:8500/v1/kv/veshv-config", + - "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}", "--key-store-password", "onaponap", "--trust-store-password", "onaponap"] healthcheck: interval: 10s timeout: 5s retries: 2 - test: "curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061" + test: ${HV_VES_HEALTHCHECK_CMD} depends_on: - - kafka + - kafka volumes: - - ./ssl/:/etc/ves-hv/ + - ./ssl/:/etc/ves-hv/ networks: - - ves-hv-default + - ves-hv-default unencrypted-ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE} ports: - - "7060:6060" - - "7061:6061/tcp" - entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"] - command: ["--listen-port", "6061","--config-url", "http://consul:8500/v1/kv/veshv-config", "--ssl-disable"] + - "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"] healthcheck: interval: 10s timeout: 5s retries: 2 - test: "curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061" + test: ${HV_VES_HEALTHCHECK_CMD} depends_on: - - kafka + - kafka volumes: - - ./ssl/:/etc/ves-hv/ + - ./ssl/:/etc/ves-hv/ networks: - - ves-hv-default + - ves-hv-default dcae-app-simulator: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:latest + image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE} ports: - - "6063:6063/tcp" - command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"] + - "6063:6063/tcp" + command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "non-existing-topic"] healthcheck: interval: 10s timeout: 5s retries: 2 test: "curl --request GET --fail --silent --show-error localhost:6063/healthcheck" depends_on: - - kafka + - kafka networks: ves-hv-default: aliases: - - dcae-app-simulator \ No newline at end of file + - dcae-app-simulator \ No newline at end of file diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py index f091de1b..ec405a91 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py @@ -5,7 +5,9 @@ from robot.api import logger from time import sleep XNF_SIMULATOR_NAME = "xNF Simulator" -SIMULATOR_IMAGE_NAME = "onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator" +HV_VES_COLLECTOR_NAMESPACE="onap" +HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves" +SIMULATOR_IMAGE_NAME = HV_VES_COLLECTOR_NAMESPACE + "/" + HV_VES_GROUP_ID + ".hv-collector-xnf-simulator" SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":latest" WORKSPACE_ENV = os.getenv("WORKSPACE") certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/" -- 2.16.6