summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-06-25 16:05:33 -0400
committerTim Rozet <trozet@redhat.com>2018-06-25 16:05:33 -0400
commit6cb6b372fc0f74daf952e04b9d5712c6930cee42 (patch)
treeb4866e452b6d4110a64438a7f8f8ce06dd95a1b3 /apex
parentb813a4985727ccf98c2dc018a4406c504c0189b3 (diff)
Ignore error if network already undefined
In clean we destroy a network, then undefine it. When running snapshot deploy it uses manual virsh bash commands to create the networks and other virsh resources. This leaves an admin network which our clean eventually tries to delete. However when the libvirt api network destroy command is used it is somehow undefining the newtork at the same time. Therefore just catch that possible scenario and ignore the failure as the network has already been removed. Change-Id: Id1d861fbe2a338f0828e78721c09f110030d3a4a Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex')
-rw-r--r--apex/clean.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/apex/clean.py b/apex/clean.py
index f56287e..3e33c8e 100644
--- a/apex/clean.py
+++ b/apex/clean.py
@@ -114,7 +114,13 @@ def clean_networks():
logging.debug("Destroying virsh network: {}".format(network))
if virsh_net.isActive():
virsh_net.destroy()
- virsh_net.undefine()
+ try:
+ virsh_net.undefine()
+ except libvirt.libvirtError as e:
+ if 'Network not found' in e.get_error_message():
+ logging.debug('Network already undefined')
+ else:
+ raise
def main():