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_IMAGE=hv-collector-main
+DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator
+
+# IF CHANGING BELOW VALUE, REMEMBER TO UPDATE ALSO XNF-SIMULATOR VERSION
+# 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
command: ["-server", "-bootstrap"]
ves-hv-collector:
- image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}
+ image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
ports:
- "6060:6060"
- "6061:6061/tcp"
- ves-hv-default
unencrypted-ves-hv-collector:
- image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}
+ image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
ports:
- "7060:6060"
- "7061:6061/tcp"
- ves-hv-default
dcae-app-simulator:
- image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}
+ image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}:${HV_VES_VERSION}
ports:
- "6063:6063/tcp"
command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "non-existing-topic"]
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"
+HV_VES_VERSION="1.1-SNAPSHOT"
+SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":" + HV_VES_VERSION
WORKSPACE_ENV = os.getenv("WORKSPACE")
certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/"
collector_certs_lookup_dir = "/etc/ves-hv/"