diff options
| author |   Helen Chen <helen.chen@huawei.com> | 2018-02-14 19:36:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-14 19:36:48 +0000 |
| commit | 63ce0211cdea1a85787d523aad1510456c85751b (patch) | |
| tree | a88c7523b79ee1df6d114777b7542bf5fabce391 | |
| parent | 35352d296f18904b27c5ce7a28aefcdf5ead94cc (diff) | |
| parent | 808b13d757e29c8e91cca168e39b9157916e46ea (diff) | |
Merge "Minor fixes to deploy scripts"
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/scripts/teardown-onap.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index fb5bd03e9..de33b08e0 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -10,6 +10,8 @@ if [ "$#" -ne 1 ]; then fi ENV_FILE=$1 +source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh + for n in $(seq 1 5); do $WORKSPACE/test/ete/scripts/teardown-onap.sh diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh index 9b742e8fd..dbbee2816 100755 --- a/test/ete/scripts/teardown-onap.sh +++ b/test/ete/scripts/teardown-onap.sh @@ -28,7 +28,7 @@ sleep 1 ROUTERS=$(openstack router list -c ID -f value) echo $ROUTERS for ROUTER in $ROUTERS; do - echo $ZONENAME; + echo $ROUTER; PORTS=$(openstack router show $ROUTER -c "interfaces_info" -f "value" | jq -r '.[].port_id') for PORT in $PORTS; do openstack router remove port $ROUTER $PORT |