diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-02-13 18:28:37 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-02-13 18:28:37 -0800 |
| commit | 808b13d757e29c8e91cca168e39b9157916e46ea (patch) | |
| tree | 01f4fb1a1835d7f3022ef1c5c885203cb86971f0 | |
| parent | 56cd8df0aca02a10c99744276f78a545eb20288a (diff) | |
Minor fixes to deploy scripts
Change-Id: I56d0bb865ec621ae187a0d2008a3962a3913597f
Issue-ID: INT-414
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -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 |