X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdcaegen2%2Fprh-testsuites%2Fsetup.sh;h=bb8a8e95fdfd82075491386041fbead61454edaf;hb=ee72614cc6fe35737d24db1c99ceb13b7e5e54fd;hp=096c695b8af894a92f2142fd494f3d9bcac517d9;hpb=dff4368ec33b87949935d2561acf9b55bd69aabc;p=integration%2Fcsit.git

diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh
index 096c695b..bb8a8e95 100644
--- a/plans/dcaegen2/prh-testsuites/setup.sh
+++ b/plans/dcaegen2/prh-testsuites/setup.sh
@@ -2,48 +2,40 @@
 
 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"
 
 cd ${WORKSPACE}/tests/dcaegen2/prh-testcases/resources/
 
+#Prepare PRH config volume
+mkdir prh_configs/prh_config_volume
+cp prh_configs/prh-config.yaml prh_configs/prh_config_volume/application_config.yaml
+
 pip uninstall -y docker-py
 pip uninstall -y docker
 pip install -U docker
+
+set -e
+
+docker login -u docker -p docker https://nexus3.onap.org:10001
 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})
 
 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
-check_heartbeat 8100
-check_heartbeat 8200
+wait_for_service_init localhost:8100/heartbeat
 
 # #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 SSL_AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3334 -v AAI_SIMULATOR_SETUP:${AAI_SIMULATOR_IP}:3335"
-
+ROBOT_VARIABLES="-v DMAAP_SIMULATOR_SETUP:${DMAAP_SIMULATOR_IP}:2224 -v AAI_SIMULATOR_SETUP:${AAI_SIMULATOR_IP}:3335 -v PRH_SETUP:${PRH_IP}:8100"
\ No newline at end of file