X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fclean.sh;h=4cf6b64a7f4c960c335ceae4e36561851e1c083a;hb=42d7a0189ad5c138f79b5a522bfda0d75b7977c4;hp=dc76f323f5f540ca07894bf3972aaa11d7d11241;hpb=4ddb226d84c629493626b8ad0bad0ed7136357b8;p=apex.git

diff --git a/ci/clean.sh b/ci/clean.sh
index dc76f323..4cf6b64a 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -13,13 +13,19 @@
 #author: Tim Rozet (trozet@redhat.com)
 
 # Use default if no param passed
-CONFIG=${1-"/var/opt/opnfv"}
+CONFIG=${CONFIG:-'/var/opt/opnfv'}
+RESOURCES=${RESOURCES:-"$CONFIG/images"}
+LIB=${LIB:-"$CONFIG/lib"}
 
 ##LIBRARIES
-source $CONFIG/lib/common-functions.sh
+if ! source $LIB/common-functions.sh; then
+  echo "Failed to source $LIB/common-functions.sh"
+  exit 1
+fi
 
 vm_index=4
 ovs_bridges="br-admin br-private br-public br-storage"
+OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network api_network"
 
 # Clean off instack/undercloud VM
 for vm in instack undercloud; do
@@ -39,12 +45,16 @@ for i in $(seq 0 $vm_index); do
   rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
 done
 
+for network in ${OPNFV_NETWORK_TYPES}; do
+  virsh net-destroy ${network} 2> /dev/null
+  virsh net-undefine ${network} 2> /dev/null
+done
+
 # Clean off created bridges
 for bridge in ${ovs_bridges}; do
-  virsh net-destroy ${bridge} 2> /dev/null | xargs echo -n
-  virsh net-undefine ${bridge} 2> /dev/null | xargs echo -n
   if detach_interface_from_ovs ${bridge} 2> /dev/null; then
     ovs-vsctl del-br ${bridge} 2> /dev/null
+    rm -f /etc/sysconfig/network-scripts/ifcfg-${bridge}
   fi
 done
 
@@ -56,4 +66,7 @@ sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys
 # force storage cleanup
 virsh pool-refresh default
 
+# remove temporary files
+rm -f /tmp/network-environment.yaml
+
 echo "Cleanup Completed"