diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-02-14 15:28:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-14 15:28:00 +0000 |
| commit | de57b6bcc922d933af34f7b3088c9b7a02129a16 (patch) | |
| tree | 3a73a807ac3d85d00f6fbf67c089242134410210 /plans | |
| parent | b82e804560e4628758915cd4f3e4c166326d9b4f (diff) | |
| parent | 140bfd2c8572f13a8499066bc8c2eea8ce96f641 (diff) | |
Merge "New Test Cases for PM Mapper"
Diffstat (limited to 'plans')
| -rw-r--r-- | plans/dcaegen2-pmmapper/pmmapper/setup.sh | 17 | ||||
| -rw-r--r-- | plans/dcaegen2-pmmapper/pmmapper/teardown.sh | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh index e896190e..01e14689 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh @@ -88,7 +88,7 @@ for i in {1..10}; do [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \ [ $(docker inspect --format '{{ .State.Running }}' buscontroller) ] then - echo "DR Service Running" + echo "Data Router, Consul, Config Binding Service, Buscontroller Services Running" break else echo sleep $i @@ -122,9 +122,22 @@ CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddres sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml sed -i 's/BUSIP/'$DMAAPBC_IP'/g' docker-compose.yml docker-compose up -d + +# Wait for initialization of Docker container for 3GPP PM Mapper +for i in {1..10}; do + if [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ] + then + echo "PM Mapper Service Running" + break + else + echo sleep $i + sleep $i + fi +done PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper) +docker exec datarouter-prov /bin/sh -c "echo '${PMMAPPER_IP}' 3gpppmmapper >> /etc/hosts" sleep 10 -docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" +docker exec pmmapper /bin/sh -c "head -n 5 /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" >> /tmp/pmmapper.log curl -k https://$DR_PROV_IP:8443/internal/prov #Pass any variables required by Robot test suites in ROBOT_VARIABLES diff --git a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh index 5b910121..08e1c770 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh @@ -7,4 +7,6 @@ kill-instance.sh datarouter-node kill-instance.sh datarouter-prov kill-instance.sh mariadb kill-instance.sh cbs -kill-instance.sh consul
\ No newline at end of file +kill-instance.sh consul +kill-instance.sh buscontroller +kill-instance.sh pmmapper
\ No newline at end of file |