summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-02-06 21:39:05 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-02-06 21:39:05 -0800
commitedcb04b848e7abd33a609f11723a6e98a7104c4f (patch)
treed00f79c8fdc726b3c6daab0e9375378f72c8412d
parent5d325d0db34ffe738da71c260c5c259f94d46ff4 (diff)
Skip use of multi-vim APIs for DNS cleanup
Change-Id: I643c88c9f587d3c7689019c63f6cd88443f21b20 Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rwxr-xr-xtest/ete/scripts/teardown-onap.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh
index 37f72c010..9b742e8fd 100755
--- a/test/ete/scripts/teardown-onap.sh
+++ b/test/ete/scripts/teardown-onap.sh
@@ -6,9 +6,10 @@ fi
source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
+# skip use of multi-vim APIs for now
# delete all Proxy Designate DNS records; do this first since we rely on multi-vim for this
-$WORKSPACE/test/ete/scripts/dns-zones/delete-dns-zones.sh $OS_PROJECT_NAME
-sleep 1
+# $WORKSPACE/test/ete/scripts/dns-zones/delete-dns-zones.sh $OS_PROJECT_NAME
+# sleep 1
# delete all Desigate DNS zones
ZONES=$(openstack zone list -c "id" -f value)
@@ -39,7 +40,7 @@ openstack port delete $(openstack port list -f value -c ID)
openstack volume delete $(openstack volume list -f value -c ID)
# delete all except "default" security group
-SECURITY_GROUPS=$(openstack security group list -c Name -f ID | grep -v default)
+SECURITY_GROUPS=$(openstack security group list -c ID -f value | grep -v default)
openstack security group delete $SECURITY_GROUPS
sleep 1