Skip to content

Commit 5f488d8

Browse files
author
Balazs Gibizer
committed
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 (cherry picked from commit 52d6cd9)
1 parent 30317e6 commit 5f488d8

File tree

2 files changed

+77
-77
lines changed

2 files changed

+77
-77
lines changed

‎nova/tests/unit/virt/libvirt/test_driver.py‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -24631,83 +24631,6 @@ def test_instance_on_disk_rbd(self):
2463124631
instance = objects.Instance(uuid=uuids.instance, id=1)
2463224632
self.assertTrue(drvr.instance_on_disk(instance))
2463324633

24634-
def test_get_disk_xml(self):
24635-
dom_xml = """
24636-
<domain type="kvm">
24637-
<devices>
24638-
<disk type="file">
24639-
<source file="disk1_file"/>
24640-
<target dev="vda" bus="virtio"/>
24641-
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
24642-
</disk>
24643-
<disk type="block">
24644-
<source dev="/path/to/dev/1"/>
24645-
<target dev="vdb" bus="virtio" serial="1234"/>
24646-
</disk>
24647-
</devices>
24648-
</domain>
24649-
"""
24650-
24651-
diska_xml = """<disk type="file" device="disk">
24652-
<source file="disk1_file"/>
24653-
<target bus="virtio" dev="vda"/>
24654-
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
24655-
</disk>"""
24656-
24657-
diskb_xml = """<disk type="block" device="disk">
24658-
<source dev="/path/to/dev/1"/>
24659-
<target bus="virtio" dev="vdb"/>
24660-
</disk>"""
24661-
24662-
dom = mock.MagicMock()
24663-
dom.XMLDesc.return_value = dom_xml
24664-
guest = libvirt_guest.Guest(dom)
24665-
24666-
# NOTE(gcb): etree.tostring(node) returns an extra line with
24667-
# some white spaces, need to strip it.
24668-
actual_diska_xml = guest.get_disk('vda').to_xml()
24669-
self.assertXmlEqual(diska_xml, actual_diska_xml)
24670-
24671-
actual_diskb_xml = guest.get_disk('vdb').to_xml()
24672-
self.assertXmlEqual(diskb_xml, actual_diskb_xml)
24673-
24674-
self.assertIsNone(guest.get_disk('vdc'))
24675-
24676-
dom.XMLDesc.assert_has_calls([mock.call(0)] * 3)
24677-
24678-
def test_get_disk_xml_from_persistent_config(self):
24679-
dom_xml = """
24680-
<domain type="kvm">
24681-
<devices>
24682-
<disk type="file">
24683-
<source file="disk1_file"/>
24684-
<target dev="vda" bus="virtio"/>
24685-
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
24686-
</disk>
24687-
<disk type="block">
24688-
<source dev="/path/to/dev/1"/>
24689-
<target dev="vdb" bus="virtio" serial="1234"/>
24690-
</disk>
24691-
</devices>
24692-
</domain>
24693-
"""
24694-
24695-
diska_xml = """<disk type="file" device="disk">
24696-
<source file="disk1_file"/>
24697-
<target bus="virtio" dev="vda"/>
24698-
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
24699-
</disk>"""
24700-
24701-
dom = mock.MagicMock()
24702-
dom.XMLDesc.return_value = dom_xml
24703-
guest = libvirt_guest.Guest(dom)
24704-
24705-
actual_diska_xml = guest.get_disk(
24706-
'vda', from_persistent_config=True).to_xml()
24707-
self.assertXmlEqual(diska_xml, actual_diska_xml)
24708-
dom.XMLDesc.assert_called_once_with(
24709-
fakelibvirt.VIR_DOMAIN_XML_INACTIVE)
24710-
2471124634
def test_vcpu_model_from_config(self):
2471224635
drv = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
2471324636
vcpu_model = drv._cpu_config_to_vcpu_model(None, None)

‎nova/tests/unit/virt/libvirt/test_guest.py‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,83 @@ def test_set_metadata_persistent_live(self):
624624
vconfig.NOVA_NS, flags=fakelibvirt.VIR_DOMAIN_AFFECT_LIVE |
625625
fakelibvirt.VIR_DOMAIN_AFFECT_CONFIG)
626626

627+
def test_get_disk_xml(self):
628+
dom_xml = """
629+
<domain type="kvm">
630+
<devices>
631+
<disk type="file">
632+
<source file="disk1_file"/>
633+
<target dev="vda" bus="virtio"/>
634+
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
635+
</disk>
636+
<disk type="block">
637+
<source dev="/path/to/dev/1"/>
638+
<target dev="vdb" bus="virtio" serial="1234"/>
639+
</disk>
640+
</devices>
641+
</domain>
642+
"""
643+
644+
diska_xml = """<disk type="file" device="disk">
645+
<source file="disk1_file"/>
646+
<target bus="virtio" dev="vda"/>
647+
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
648+
</disk>"""
649+
650+
diskb_xml = """<disk type="block" device="disk">
651+
<source dev="/path/to/dev/1"/>
652+
<target bus="virtio" dev="vdb"/>
653+
</disk>"""
654+
655+
dom = mock.MagicMock()
656+
dom.XMLDesc.return_value = dom_xml
657+
guest = libvirt_guest.Guest(dom)
658+
659+
# NOTE(gcb): etree.tostring(node) returns an extra line with
660+
# some white spaces, need to strip it.
661+
actual_diska_xml = guest.get_disk('vda').to_xml()
662+
self.assertXmlEqual(diska_xml, actual_diska_xml)
663+
664+
actual_diskb_xml = guest.get_disk('vdb').to_xml()
665+
self.assertXmlEqual(diskb_xml, actual_diskb_xml)
666+
667+
self.assertIsNone(guest.get_disk('vdc'))
668+
669+
dom.XMLDesc.assert_has_calls([mock.call(0)] * 3)
670+
671+
def test_get_disk_xml_from_persistent_config(self):
672+
dom_xml = """
673+
<domain type="kvm">
674+
<devices>
675+
<disk type="file">
676+
<source file="disk1_file"/>
677+
<target dev="vda" bus="virtio"/>
678+
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
679+
</disk>
680+
<disk type="block">
681+
<source dev="/path/to/dev/1"/>
682+
<target dev="vdb" bus="virtio" serial="1234"/>
683+
</disk>
684+
</devices>
685+
</domain>
686+
"""
687+
688+
diska_xml = """<disk type="file" device="disk">
689+
<source file="disk1_file"/>
690+
<target bus="virtio" dev="vda"/>
691+
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
692+
</disk>"""
693+
694+
dom = mock.MagicMock()
695+
dom.XMLDesc.return_value = dom_xml
696+
guest = libvirt_guest.Guest(dom)
697+
698+
actual_diska_xml = guest.get_disk(
699+
'vda', from_persistent_config=True).to_xml()
700+
self.assertXmlEqual(diska_xml, actual_diska_xml)
701+
dom.XMLDesc.assert_called_once_with(
702+
fakelibvirt.VIR_DOMAIN_XML_INACTIVE)
703+
627704

628705
class GuestBlockTestCase(test.NoDBTestCase):
629706

0 commit comments

Comments
 (0)