summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2012-08-03 15:38:32 -0400
committerDan Prince <dprince@redhat.com>2012-08-03 20:21:11 -0400
commit25f50d9aa5000248959073fd47814f05efea3a3e (patch)
tree1ab64944437ff0072a559930f8bc84923bf9439b /nova/virt
parentfbd8bf5adb55f97536ce7d52a9662ae8099684e7 (diff)
Update list_instances to catch libvirtError.
Commit be590cfa4b0025587a956642dc859902d577f3f7 caught (and tested for) the wrong exception. lookupByID throws a libvirtError. Fixes LP Bug #1032741. Change-Id: I6745660658df4d0f2bc4cd423e173200fc23cd8e
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt/driver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 3b0ddbd92..88745aff0 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -417,7 +417,7 @@ class LibvirtDriver(driver.ComputeDriver):
if domain_id != 0:
domain = self._conn.lookupByID(domain_id)
names.append(domain.name())
- except exception.InstanceNotFound:
+ except libvirt.libvirtError:
# Instance was deleted while listing... ignore it
pass
return names