From f19734c4ae689dd8d0b12e1f090d2eab3e3419f7 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 19 Jan 2018 14:39:34 -0800 Subject: Delete Designate DNS zones during teardown Change-Id: I76751df257187a84c876ed2cd274f1336a4fa142 Issue-ID: INT-278 Signed-off-by: Gary Wu --- test/ete/scripts/teardown-onap.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test/ete/scripts') diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh index eecef876b..0d007c5d6 100755 --- a/test/ete/scripts/teardown-onap.sh +++ b/test/ete/scripts/teardown-onap.sh @@ -6,10 +6,16 @@ fi source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh -# delete all Designate DNS records; do this first since we rely on multi-vim for this +# 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 +# delete all Desigate DNS zones +ZONES=$(openstack zone list -c "Stack Name" -f value) +for ZONE in ${ZONES}; do + openstack zone delete $ZONE +done + # delete all instances openstack server delete $(openstack server list -c ID -f value) sleep 1 @@ -42,7 +48,6 @@ sleep 1 STACKS=$(openstack stack list -c "Stack Name" -f value) if [ ! -z "${STACKS}" ]; then - echo "Deleting Stacks ${STACKS}" openstack stack delete -y $STACKS for STACK in ${STACKS}; do until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do -- cgit 1.2.3-korg