diff options
| author |   Gary Wu <gwu@futurewei.com> | 2019-05-28 17:22:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-28 17:22:50 +0000 |
| commit | 8a0cfc9b928b57d1e950774d6a7e4ad8d9a81fac (patch) | |
| tree | 18c62b80da247af2531feed9bff6897d9580babd /plans | |
| parent | 7027bed4a8d1a34a49a268999f0cc28fdff99f0e (diff) | |
| parent | 0fc9eab94f101a9713c951b3c159065c72a31495 (diff) | |
Merge "Use single PRH container with ssl configuration Generating new certificates since the old ones have expired"
Diffstat (limited to 'plans')
| -rw-r--r-- | plans/dcaegen2/prh-testsuites/setup.sh | 5 | ||||
| -rw-r--r-- | plans/dcaegen2/prh-testsuites/teardown.sh | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh index 46871fd8..28882c84 100644 --- a/plans/dcaegen2/prh-testsuites/setup.sh +++ b/plans/dcaegen2/prh-testsuites/setup.sh @@ -3,7 +3,6 @@ source ${SCRIPTS}/common_functions.sh export PRH_SERVICE="prh" -export SSL_PRH_SERVICE="ssl_prh" export DMAAP_SIMULATOR="dmaap_simulator" export AAI_SIMULATOR="aai_simulator" export CONSUL="consul" @@ -23,7 +22,6 @@ 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}) @@ -31,7 +29,6 @@ CONSUL_CONFIG_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{ 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} @@ -39,7 +36,6 @@ 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} @@ -48,7 +44,6 @@ echo CBS_IP=${CBS_IP} # Wait for initialization of PRH services wait_for_service_init localhost:8100/heartbeat -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 -v CONSUL_SETUP:${CONSUL_IP}:8500"
\ No newline at end of file diff --git a/plans/dcaegen2/prh-testsuites/teardown.sh b/plans/dcaegen2/prh-testsuites/teardown.sh index bb5f8f90..382b22eb 100644 --- a/plans/dcaegen2/prh-testsuites/teardown.sh +++ b/plans/dcaegen2/prh-testsuites/teardown.sh @@ -16,7 +16,6 @@ # kill-instance.sh prh -kill-instance.sh ssl_prh kill-instance.sh dmaap_simulator kill-instance.sh aai_simulator kill-instance.sh consul |