From a67ab8567895f2f50dd1bdd9fda0f86617457c71 Mon Sep 17 00:00:00 2001 From: sean mooney Date: Tue, 14 Jan 2025 17:11:59 +0000 Subject: [PATCH] Revert "libvirt: Wrap un-proxied listDevices() and listAllDevices()" This reverts commit 0fccb365ddea10b9d6d082c3d95dba24b7fec435. Reason for revert: the current version does not have test coverage to assert the proxy is used so we should revert this and fix it before backporting Change-Id: I51cf7da85e05131da72acdcf9be09121a326d414 --- nova/virt/libvirt/host.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nova/virt/libvirt/host.py b/nova/virt/libvirt/host.py index 73ceffdb10ac..7f6ae47b44d2 100644 --- a/nova/virt/libvirt/host.py +++ b/nova/virt/libvirt/host.py @@ -1647,9 +1647,7 @@ class Host(object): :returns: a list of virNodeDevice instance """ try: - devs = [self._wrap_libvirt_proxy(dev) - for dev in self.get_connection().listDevices(cap, flags)] - return devs + return self.get_connection().listDevices(cap, flags) except libvirt.libvirtError as ex: error_code = ex.get_error_code() if error_code == libvirt.VIR_ERR_NO_SUPPORT: @@ -1669,10 +1667,7 @@ class Host(object): :returns: a list of virNodeDevice instances. """ try: - alldevs = [ - self._wrap_libvirt_proxy(dev) - for dev in self.get_connection().listAllDevices(flags)] or [] - return alldevs + return self.get_connection().listAllDevices(flags) or [] except libvirt.libvirtError as ex: LOG.warning(ex) return []