Simplify consul/CBS configuration
- bumped docker-compose version
Change-Id: I821f5ab6a03e8aaa37c1be1dc53ec7569958de79
Issue-ID: DCAEGEN2-1359
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env
index 1558083..0c6cfd8 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/.env
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/.env
@@ -12,5 +12,5 @@
JAVA_OPTS=-Dio.netty.leakDetection.level=paranoid
CONSUL_HOST=consul-server
-CONFIG_BINDING_SERVICE=cbs
+CONFIG_BINDING_SERVICE=config-binding-service
HV_VES_HOSTNAME=dcae-hv-ves-collector
\ No newline at end of file
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json b/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json
deleted file mode 100644
index 0761c7e..0000000
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "service": {
- "name": "cbs",
- "tags": [
- "cbs"
- ],
- "port": 10000,
- "address": "config-binding-service"
- }
-}
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/consul/configuration.hcl b/plans/dcaegen2-collectors-hv-ves/testsuites/consul/configuration.hcl
new file mode 100644
index 0000000..12ed138
--- /dev/null
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/consul/configuration.hcl
@@ -0,0 +1,33 @@
+/*
+ * ============LICENSE_START=======================================================
+ * csit-dcaegen2-collectors-hv-ves
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+server = true
+bootstrap = true
+client_addr = "0.0.0.0"
+
+service {
+ # name under which hv-ves collector should seek cbs
+ # usually set as CONFIG_BINDING_SERVICE environment variable
+ Name = "config-binding-service"
+ # address of CBS as seen by hv-ves collector
+ Address = "config-binding-service"
+ Port = 10000
+}
+
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 32b3943..4afd220 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -34,7 +34,6 @@
networks:
- ves-hv-default
-
#
# Consul / CBS
#
@@ -43,13 +42,10 @@
image: docker.io/consul:1.0.6
ports:
- "8500:8500"
- command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
volumes:
- - ./consul.d/:/consul/consul.d
+ - ./consul/:/consul/config
networks:
- ves-hv-default:
- aliases:
- - consul
+ - ves-hv-default
config-binding-service:
image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
@@ -60,9 +56,7 @@
depends_on:
- consul-server
networks:
- ves-hv-default:
- aliases:
- - cbs
+ - ves-hv-default
#
# DCAE HV VES Collector
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
index 0925e3b..d553b1d 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
@@ -13,7 +13,7 @@
pip uninstall -y docker-py
pip install docker
- COMPOSE_VERSION=1.22.0
+ COMPOSE_VERSION=1.23.2
COMPOSE_LOCATION='/usr/local/bin/docker-compose'
sudo curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o ${COMPOSE_LOCATION}
sudo chmod +x ${COMPOSE_LOCATION}