From 52d6cd941ce65baadb140551233406ad642e1e70 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Tue, 23 Feb 2021 16:30:34 +0100 Subject: [PATCH] Move the guest.get_disk test to test_guest As a follow up of I86153d31b02e6b74b42d53a6800297cbd0e5cbb4 the two get_disk test that was mistakenly added to test_driver is now moved to test_guest where they belong. Change-Id: I17bd591ffb96b9b296bea04c87e286a83d40570e Related-Bug: #1882521 --- nova/tests/unit/virt/libvirt/test_driver.py | 77 --------------------- nova/tests/unit/virt/libvirt/test_guest.py | 77 +++++++++++++++++++++ 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 90eb7305b1c8..98e2d1418055 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -24631,83 +24631,6 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin): instance = objects.Instance(uuid=uuids.instance, id=1) self.assertTrue(drvr.instance_on_disk(instance)) - def test_get_disk_xml(self): - dom_xml = """ - - - - - - 0e38683e-f0af-418f-a3f1-6b67ea0f919d - - - - - - - - """ - - diska_xml = """ - - - 0e38683e-f0af-418f-a3f1-6b67ea0f919d -""" - - diskb_xml = """ - - -""" - - dom = mock.MagicMock() - dom.XMLDesc.return_value = dom_xml - guest = libvirt_guest.Guest(dom) - - # NOTE(gcb): etree.tostring(node) returns an extra line with - # some white spaces, need to strip it. - actual_diska_xml = guest.get_disk('vda').to_xml() - self.assertXmlEqual(diska_xml, actual_diska_xml) - - actual_diskb_xml = guest.get_disk('vdb').to_xml() - self.assertXmlEqual(diskb_xml, actual_diskb_xml) - - self.assertIsNone(guest.get_disk('vdc')) - - dom.XMLDesc.assert_has_calls([mock.call(0)] * 3) - - def test_get_disk_xml_from_persistent_config(self): - dom_xml = """ - - - - - - 0e38683e-f0af-418f-a3f1-6b67ea0f919d - - - - - - - - """ - - diska_xml = """ - - - 0e38683e-f0af-418f-a3f1-6b67ea0f919d -""" - - dom = mock.MagicMock() - dom.XMLDesc.return_value = dom_xml - guest = libvirt_guest.Guest(dom) - - actual_diska_xml = guest.get_disk( - 'vda', from_persistent_config=True).to_xml() - self.assertXmlEqual(diska_xml, actual_diska_xml) - dom.XMLDesc.assert_called_once_with( - fakelibvirt.VIR_DOMAIN_XML_INACTIVE) - def test_vcpu_model_from_config(self): drv = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) vcpu_model = drv._cpu_config_to_vcpu_model(None, None) diff --git a/nova/tests/unit/virt/libvirt/test_guest.py b/nova/tests/unit/virt/libvirt/test_guest.py index 87b189882581..32294f6b78b4 100644 --- a/nova/tests/unit/virt/libvirt/test_guest.py +++ b/nova/tests/unit/virt/libvirt/test_guest.py @@ -624,6 +624,83 @@ class GuestTestCase(test.NoDBTestCase): vconfig.NOVA_NS, flags=fakelibvirt.VIR_DOMAIN_AFFECT_LIVE | fakelibvirt.VIR_DOMAIN_AFFECT_CONFIG) + def test_get_disk_xml(self): + dom_xml = """ + + + + + + 0e38683e-f0af-418f-a3f1-6b67ea0f919d + + + + + + + + """ + + diska_xml = """ + + + 0e38683e-f0af-418f-a3f1-6b67ea0f919d +""" + + diskb_xml = """ + + +""" + + dom = mock.MagicMock() + dom.XMLDesc.return_value = dom_xml + guest = libvirt_guest.Guest(dom) + + # NOTE(gcb): etree.tostring(node) returns an extra line with + # some white spaces, need to strip it. + actual_diska_xml = guest.get_disk('vda').to_xml() + self.assertXmlEqual(diska_xml, actual_diska_xml) + + actual_diskb_xml = guest.get_disk('vdb').to_xml() + self.assertXmlEqual(diskb_xml, actual_diskb_xml) + + self.assertIsNone(guest.get_disk('vdc')) + + dom.XMLDesc.assert_has_calls([mock.call(0)] * 3) + + def test_get_disk_xml_from_persistent_config(self): + dom_xml = """ + + + + + + 0e38683e-f0af-418f-a3f1-6b67ea0f919d + + + + + + + + """ + + diska_xml = """ + + + 0e38683e-f0af-418f-a3f1-6b67ea0f919d +""" + + dom = mock.MagicMock() + dom.XMLDesc.return_value = dom_xml + guest = libvirt_guest.Guest(dom) + + actual_diska_xml = guest.get_disk( + 'vda', from_persistent_config=True).to_xml() + self.assertXmlEqual(diska_xml, actual_diska_xml) + dom.XMLDesc.assert_called_once_with( + fakelibvirt.VIR_DOMAIN_XML_INACTIVE) + class GuestBlockTestCase(test.NoDBTestCase):