From 2dbb808dba8c16dcb26b12556fc7e97be8cc66e4 Mon Sep 17 00:00:00 2001 From: Ilya Etingof Date: Fri, 29 Mar 2019 15:26:09 +0100 Subject: [PATCH] Include all libvirt domains in Systems This patch fixes libvirt domains listing so that both active and inactive domains are rendered as available Systems resource. Before this fix, only inactive domains were listed. Change-Id: I7ca5c6e2b53a231c1913160e2f07b45eac6c5f18 --- releasenotes/notes/fix-libvirt-list-1ccf5a18bc89793d.yaml | 6 ++++++ sushy_tools/emulator/drivers/libvirtdriver.py | 3 +-- sushy_tools/tests/unit/emulator/test_libvirt.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/fix-libvirt-list-1ccf5a18bc89793d.yaml diff --git a/releasenotes/notes/fix-libvirt-list-1ccf5a18bc89793d.yaml b/releasenotes/notes/fix-libvirt-list-1ccf5a18bc89793d.yaml new file mode 100644 index 00000000..8fc8f77e --- /dev/null +++ b/releasenotes/notes/fix-libvirt-list-1ccf5a18bc89793d.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes libvirt domains listing so that both active and inactive domains + are rendered as available Systems resource. Before this fix, only inactive + domains were listed. diff --git a/sushy_tools/emulator/drivers/libvirtdriver.py b/sushy_tools/emulator/drivers/libvirtdriver.py index a96f2821..0c95c667 100644 --- a/sushy_tools/emulator/drivers/libvirtdriver.py +++ b/sushy_tools/emulator/drivers/libvirtdriver.py @@ -152,8 +152,7 @@ class LibvirtDriver(AbstractDriver): :returns: list of UUIDs representing the systems """ with libvirt_open(self._uri, readonly=True) as conn: - return [conn.lookupByName(domain).UUIDString() - for domain in conn.listDefinedDomains()] + return [domain.UUIDString() for domain in conn.listAllDomains()] def uuid(self, identity): """Get computer system UUID diff --git a/sushy_tools/tests/unit/emulator/test_libvirt.py b/sushy_tools/tests/unit/emulator/test_libvirt.py index d2440e68..0f984b28 100644 --- a/sushy_tools/tests/unit/emulator/test_libvirt.py +++ b/sushy_tools/tests/unit/emulator/test_libvirt.py @@ -60,7 +60,7 @@ class LibvirtDriverTestCase(base.BaseTestCase): conn_mock = libvirt_mock.return_value domain = mock.MagicMock() domain.UUIDString.return_value = self.uuid - conn_mock.listDefinedDomains.return_value = [domain] + conn_mock.listAllDomains.return_value = [domain] uuidstring_mock = conn_mock.lookupByName.return_value.UUIDString uuidstring_mock.return_value = self.uuid systems = self.test_driver.systems