summaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-10-19 13:57:29 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-19 13:57:29 +0000
commitdff4368ec33b87949935d2561acf9b55bd69aabc (patch)
tree9f7ac558573bd8a039363615626478546d32d41b /plans
parent3daec4157eb6804b81c9fac639ead8632ff3c16b (diff)
parent55d368698ab39f8a039831f9d244f01742aac419 (diff)
Merge "SSL setup for AAI and simulator"
Diffstat (limited to 'plans')
-rw-r--r--plans/dcaegen2/prh-testsuites/setup.sh25
-rw-r--r--plans/dcaegen2/prh-testsuites/teardown.sh1
2 files changed, 20 insertions, 6 deletions
diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh
index 00892d6b..096c695b 100644
--- a/plans/dcaegen2/prh-testsuites/setup.sh
+++ b/plans/dcaegen2/prh-testsuites/setup.sh
@@ -2,7 +2,19 @@
source ${SCRIPTS}/common_functions.sh
+function check_heartbeat ()
+{
+ local port=$1
+
+ for i in {1..10}; do
+ curl -sS -m 1 localhost:$port/heartbeat && break
+ echo sleep ${i}
+ sleep ${i}
+ done
+}
+
export PRH_SERVICE="prh"
+export SSL_PRH_SERVICE="ssl_prh"
export DMAAP_SIMULATOR="dmaap_simulator"
export AAI_SIMULATOR="aai_simulator"
@@ -14,23 +26,24 @@ pip install -U docker
docker-compose up -d --build
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})
bypass_ip_adress ${PRH_IP}
+bypass_ip_adress ${SSL_PRH_IP}
bypass_ip_adress ${DMAAP_SIMULATOR_IP}
bypass_ip_adress ${AAI_SIMULATOR_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}
# Wait for initialization of PRH services
-for i in {1..10}; do
- curl -sS -m 1 localhost:8100/heartbeat && break
- echo sleep ${i}
- sleep ${i}
-done
+check_heartbeat 8100
+check_heartbeat 8200
# #Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v DMAAP_SIMULATOR:${DMAAP_SIMULATOR_IP}:2222 -v AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3333 -v PRH:${PRH_IP}:8100"
+ROBOT_VARIABLES="-v DMAAP_SIMULATOR:${DMAAP_SIMULATOR_IP}:2222 -v AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3333 -v SSL_AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3334 -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 bd1e5ba0..45a3b8b1 100644
--- a/plans/dcaegen2/prh-testsuites/teardown.sh
+++ b/plans/dcaegen2/prh-testsuites/teardown.sh
@@ -16,5 +16,6 @@
#
kill-instance.sh prh
+kill-instance.sh ssl_prh
kill-instance.sh dmaap_simulator
kill-instance.sh aai_simulator