From 25f50d9aa5000248959073fd47814f05efea3a3e Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Fri, 3 Aug 2012 15:38:32 -0400
Subject: 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
---
 nova/virt/libvirt/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

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
-- 
cgit