diff options
| author |   Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2021-08-25 13:29:02 +0200 |
|---|---|---|
| committer | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2021-08-25 14:16:34 +0200 |
| commit | ee72614cc6fe35737d24db1c99ceb13b7e5e54fd (patch) | |
| tree | bcf063c0416814643ed79f1dc4cc4996263bc568 /plans/dcaegen2 | |
| parent | 8b78bcc071ecba84d0dea67f97003e0d69c6a551 (diff) | |
Update PRH tests to use file based conifg
To remove Consul/CBS dependency in DCAE PRH was updated
to use file based configuration
CSIT updates:
- file based config use in PRH
- removal of Consul/CBS from PRH tests
Issue-ID: DCAEGEN2-2868
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Ida59374ae14e74f11893324e7a48aaa5e49a11e7
Diffstat (limited to 'plans/dcaegen2')
| -rw-r--r-- | plans/dcaegen2/prh-testsuites/setup.sh | 18 | ||||
| -rw-r--r-- | plans/dcaegen2/prh-testsuites/teardown.sh | 3 |
2 files changed, 8 insertions, 13 deletions
diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh index 9dc8de9a..bb8a8e95 100644 --- a/plans/dcaegen2/prh-testsuites/setup.sh +++ b/plans/dcaegen2/prh-testsuites/setup.sh @@ -5,12 +5,13 @@ source ${SCRIPTS}/common_functions.sh export PRH_SERVICE="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/ +#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 @@ -24,26 +25,17 @@ docker-compose up -d --build 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}) -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 ${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 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 # #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 -v PRH_SETUP:${PRH_IP}:8100"
\ No newline at end of file +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 diff --git a/plans/dcaegen2/prh-testsuites/teardown.sh b/plans/dcaegen2/prh-testsuites/teardown.sh index 382b22eb..faad03a6 100644 --- a/plans/dcaegen2/prh-testsuites/teardown.sh +++ b/plans/dcaegen2/prh-testsuites/teardown.sh @@ -21,3 +21,6 @@ kill-instance.sh aai_simulator kill-instance.sh consul kill-instance.sh consul-cfg kill-instance.sh cbs + +#Cleanup PRH config volume +rm -rf ${WORKSPACE}/tests/dcaegen2/prh-testcases/resources/prh_configs/prh_config_volume
\ No newline at end of file |