From 0406d1f85fa93db4e4d5ab8b37d298951d4c4193 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 8 Nov 2012 20:41:07 +0100 Subject: make diagnostics workable for libvirt with Xen When using "diagnostics" with libvirt as driver on nova-compute and Xen as hypervisor the call to domain.memoryStats() in get_diagnostics() doesn't fail with a libvirt.libvirtError, but with an AttributeError. This exception should be catched, too. The method virDomainMemoryStats is not implemented in libvirt for Xen. fixes bug 1076527 Change-Id: I16645654b346e3c40ff3dd63f20600c802cbeb3f --- nova/virt/libvirt/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index c59876d95..7f962b45d 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2986,7 +2986,7 @@ class LibvirtDriver(driver.ComputeDriver): mem = domain.memoryStats() for key in mem.keys(): output["memory-" + key] = mem[key] - except libvirt.libvirtError: + except (libvirt.libvirtError, AttributeError): pass return output -- cgit