diff options
author | 2019-03-11 14:13:42 +0100 | |
---|---|---|
committer | 2019-03-11 14:29:27 +0100 | |
commit | 60f92958ebdaa6a5d10a9bc47c6f6d93b3bb97f8 (patch) | |
tree | 1eb5acfff0b40e803ad6e620d1dc01b1ca864884 /plans/dcaegen2-collectors-hv-ves/testsuites | |
parent | 86cccfe341d8328962ae0ed7877bc2fb908d1567 (diff) |
Use CBS in HV-VES testsuites
This change mostly follows related changes made in DCAEGEN2-1302
- consul now starts with CBS service defined through consul.d directory
- moved to consul image used during oom-deployment
- changed hv-ves configuration endpoint to oom-deployment default
Change-Id: I09e10f9e58f7df22f536e7ad35d1467993baa3bc
Issue-ID: DCAEGEN2-1302
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
Diffstat (limited to 'plans/dcaegen2-collectors-hv-ves/testsuites')
3 files changed, 72 insertions, 31 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env index a64ba26a..7e2fffcf 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/.env +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/.env @@ -8,6 +8,5 @@ DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator # IN XNF_SIMULATOR_LIBRARY PYTHON FILE. HV_VES_VERSION=1.1-SNAPSHOT -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 +HV_VES_MAIN_CLASS=org.onap.dcae.collectors.veshv.main.MainKt diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json b/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json new file mode 100644 index 00000000..0761c7e5 --- /dev/null +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json @@ -0,0 +1,10 @@ +{ + "service": { + "name": "cbs", + "tags": [ + "cbs" + ], + "port": 10000, + "address": "config-binding-service" + } +} diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index 67178353..ac07eb78 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml @@ -6,92 +6,124 @@ networks: name: $CONTAINERS_NETWORK services: + + # + # DMaaP Message Router + # + 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 / CBS + # - consul: - image: progrium/consul + consul-server: + image: docker.io/consul:1.0.6 ports: - - "8500:8500" + - "8500:8500" + command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"] + volumes: + - ./consul.d/:/consul/consul.d + networks: + ves-hv-default: + aliases: + - consul + + config-binding-service: + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4 + ports: + - "10000:10000" environment: - - CONSUL_BIND_INTERFACE=eth0 + CONSUL_HOST: "consul-server" + depends_on: + - consul-server networks: ves-hv-default: aliases: - - consul - command: ["-server", "-bootstrap"] + - cbs + # + # DCAE HV VES Collector + # ves-hv-collector: image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION} ports: - - "6060:6060" - - "6061:6061/tcp" + - "6060:6060" + - "6061:6061/tcp" 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" + CONSUL_HOST: "consul-server" + CONFIG_BINDING_SERVICE: "cbs" + HOSTNAME: "dcae-hv-ves-collector" healthcheck: interval: 10s timeout: 5s retries: 2 test: ${HV_VES_HEALTHCHECK_CMD} - depends_on: - - kafka volumes: - - ./ssl/:/etc/ves-hv/ + - ./ssl/:/etc/ves-hv/ + depends_on: + - config-binding-service + - kafka networks: - - ves-hv-default + - ves-hv-default unencrypted-ves-hv-collector: image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION} ports: - - "7060:6060" - - "7061:6061/tcp" + - "7060:6060" + - "7061:6061/tcp" 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" + CONSUL_HOST: "consul-server" + CONFIG_BINDING_SERVICE: "cbs" + HOSTNAME: "dcae-hv-ves-collector" healthcheck: interval: 10s timeout: 5s retries: 2 test: ${HV_VES_HEALTHCHECK_CMD} - depends_on: - - kafka volumes: - - ./ssl/:/etc/ves-hv/ + - ./ssl/:/etc/ves-hv/ + depends_on: + - config-binding-service + - kafka networks: - - ves-hv-default + - ves-hv-default dcae-app-simulator: image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}:${HV_VES_VERSION} ports: - - "6063:6063/tcp" + - "6063:6063/tcp" command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "non-existing-topic"] healthcheck: interval: 10s @@ -99,9 +131,9 @@ services: 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 + - dcae-app-simulator |