Minor fixes to deploy scripts

Change-Id: I56d0bb865ec621ae187a0d2008a3962a3913597f
Issue-ID: INT-414
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh
index fb5bd03..de33b08 100755 (executable)
--- 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 9b742e8..dbbee28 100755 (executable)
--- 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