aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2019-04-12 15:54:32 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-12 15:54:32 +0000
commit5124ab5b8dad3dff35da2ceec74ca0e2645117e6 (patch)
tree8f40a909af044efdbb97037c2d1f5b408c0ac397 /plans
parent5ab8a07212f71a31da81b9a65f88eeb5c52d7b9b (diff)
parent26125b14101098f87dfa5d8d0671cab00e8e27f5 (diff)
Merge "Attempt to check CSIT Consul and CBS discovery fix"
Diffstat (limited to 'plans')
-rw-r--r--plans/dcaegen2/prh-testsuites/setup.sh14
-rw-r--r--plans/dcaegen2/prh-testsuites/teardown.sh3
2 files changed, 16 insertions, 1 deletions
diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh
index 9040ae60..5ce3d0e6 100644
--- a/plans/dcaegen2/prh-testsuites/setup.sh
+++ b/plans/dcaegen2/prh-testsuites/setup.sh
@@ -6,6 +6,9 @@ export PRH_SERVICE="prh"
export SSL_PRH_SERVICE="ssl_prh"
export DMAAP_SIMULATOR="dmaap_simulator"
export AAI_SIMULATOR="aai_simulator"
+export CONSUL="consul"
+export CONSUL_CONFIG="consul-cfg"
+export CBS="consul-cfg"
cd ${WORKSPACE}/tests/dcaegen2/prh-testcases/resources/
@@ -14,20 +17,30 @@ pip uninstall -y docker
pip install -U docker
docker-compose up -d --build
+# Extract docker images IPs
PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE})
SSL_PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${SSL_PRH_SERVICE})
DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR})
AAI_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${AAI_SIMULATOR})
+CONSUL_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${CONSUL})
+CONSUL_CONFIG_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${CONSUL_CONFIG})
+CBS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${CBS})
bypass_ip_adress ${PRH_IP}
bypass_ip_adress ${SSL_PRH_IP}
bypass_ip_adress ${DMAAP_SIMULATOR_IP}
bypass_ip_adress ${AAI_SIMULATOR_IP}
+bypass_ip_adress ${CONSUL_IP}
+bypass_ip_adress ${CONSUL_CONFIG_IP}
+bypass_ip_adress ${CBS_IP}
echo PRH_IP=${PRH_IP}
echo SSL_PRH_IP=${SSL_PRH_IP}
echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP}
echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP}
+echo CONSUL_IP=${CONSUL_IP}
+echo CONSUL_CONFIG_IP=${CONSUL_CONFIG_IP}
+echo CBS_IP=${CBS_IP}
# Wait for initialization of PRH services
wait_for_service_init localhost:8100/heartbeat
@@ -35,4 +48,3 @@ wait_for_service_init localhost:8200/heartbeat
# #Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v DMAAP_SIMULATOR_SETUP:${DMAAP_SIMULATOR_IP}:2224 -v AAI_SIMULATOR_SETUP:${AAI_SIMULATOR_IP}:3335"
-
diff --git a/plans/dcaegen2/prh-testsuites/teardown.sh b/plans/dcaegen2/prh-testsuites/teardown.sh
index 45a3b8b1..bb5f8f90 100644
--- a/plans/dcaegen2/prh-testsuites/teardown.sh
+++ b/plans/dcaegen2/prh-testsuites/teardown.sh
@@ -19,3 +19,6 @@ kill-instance.sh prh
kill-instance.sh ssl_prh
kill-instance.sh dmaap_simulator
kill-instance.sh aai_simulator
+kill-instance.sh consul
+kill-instance.sh consul-cfg
+kill-instance.sh cbs