X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2Fclean.sh;h=c031e5e4fa2865b45b93ae4db9dac8017b662a4c;hb=refs%2Fchanges%2F97%2F11597%2F1;hp=89e89aa485b658d78c41a123ca3a06006ced8b29;hpb=8c89bd4c207defd9312a22ee816fe7c5bb961555;p=apex.git

diff --git a/ci/clean.sh b/ci/clean.sh
index 89e89aa4..c031e5e4 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -1,14 +1,27 @@
 #!/usr/bin/env bash
+##############################################################################
+# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 
 #Clean script to uninstall provisioning server for Apex
 #author: Dan Radez (dradez@redhat.com)
-#
+#author: Tim Rozet (trozet@redhat.com)
+CONFIG=/var/opt/opnfv
+
+##LIBRARIES
+source $CONFIG/lib/common-functions.sh
+
 vm_index=4
-ovs_bridges="brbm brbm1 brbm2 brbm3"
+ovs_bridges="br-admin br-private br-public br-storage"
 # Clean off instack VM
 virsh destroy instack 2> /dev/null || echo -n ''
-virsh undefine instack --remove-all-storage 2> /dev/null || echo -n ''
-if ! virsh vol-delete instack.qcow2 --pool default; then
+virsh undefine instack 2> /dev/null || echo -n ''
+if ! virsh vol-delete instack.qcow2 --pool default 2> /dev/null; then
   if [ ! -e /var/lib/libvirt/images/instack.qcow2 ]; then
     /usr/bin/touch /var/lib/libvirt/images/instack.qcow2
     virsh vol-delete instack.qcow2 --pool default
@@ -19,17 +32,20 @@ rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null
 
 # Clean off baremetal VMs in case they exist
 for i in $(seq 0 $vm_index); do
-  virsh destroy baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n ''
-  virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i --remove-all-storage 2> /dev/null || echo -n ''
-  virsh vol-delete baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 --pool default 2> /dev/null
-  rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 2> /dev/null
+  virsh destroy baremetal$i 2> /dev/null || echo -n ''
+  virsh undefine baremetal$i 2> /dev/null || echo -n ''
+  /usr/bin/touch /var/lib/libvirt/images/baremetal${i}.qcow2
+  virsh vol-delete baremetal${i}.qcow2 --pool default 2> /dev/null
+  rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
 done
 
 # Clean off created bridges
 for bridge in ${ovs_bridges}; do
   virsh net-destroy ${bridge} 2> /dev/null
   virsh net-undefine ${bridge} 2> /dev/null
-  ovs-vsctl del-br ${bridge} 2> /dev/null
+  if detach_interface_from_ovs ${bridge} 2> /dev/null; then
+    ovs-vsctl del-br ${bridge} 2> /dev/null
+  fi
 done
 
 # clean pub keys from root's auth keys