Code Review
/
integration
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update PRH tests to use file based conifg
[integration/csit.git]
/
plans
/
dcaegen2
/
prh-testsuites
/
setup.sh
diff --git
a/plans/dcaegen2/prh-testsuites/setup.sh
b/plans/dcaegen2/prh-testsuites/setup.sh
index
52167bf
..
bb8a8e9
100644
(file)
--- a/
plans/dcaegen2/prh-testsuites/setup.sh
+++ b/
plans/dcaegen2/prh-testsuites/setup.sh
@@
-6,13
+6,22
@@
export PRH_SERVICE="prh"
export DMAAP_SIMULATOR="dmaap_simulator"
export AAI_SIMULATOR="aai_simulator"
export DMAAP_SIMULATOR="dmaap_simulator"
export AAI_SIMULATOR="aai_simulator"
-cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/resources/
+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
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
docker-compose up -d --build
+# Extract docker images IPs
PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${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})
PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${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})
@@
-26,11
+35,7
@@
echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP}
echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP}
# Wait for initialization of PRH services
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
+wait_for_service_init localhost:8100/heartbeat
# #Pass any variables required by Robot test suites in ROBOT_VARIABLES
# #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_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