openstack/nova
Code Issues Proposed changes

Merge "Add ppc64le architecture to some libvirt unit tests"

Browse Source
This commit is contained in:
Jenkins authored and Gerrit Code Review committed 2016-05-05 02:13:34 +00:00
2 parents a62e9df74a 83574aa273
commit 38033b9b2f
2 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

nova/tests/unit/virt/libvirt/test_blockinfo.py
+2 -2
View File
@@ -359,7 +359,7 @@ class LibvirtBlockInfoTest(test.NoDBTestCase):
# is sdz
bus_ppc = ("scsi", "sdz")
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc}
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc, "ppc64le": bus_ppc}
bus, dev = expect_bus.get(blockinfo.libvirt_utils.get_arch({}),
("ide", "hdd"))
@@ -392,7 +392,7 @@ class LibvirtBlockInfoTest(test.NoDBTestCase):
image_meta)
bus_ppc = ("scsi", "sdz")
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc}
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc, "ppc64le": bus_ppc}
bus, dev = expect_bus.get(blockinfo.libvirt_utils.get_arch({}),
("ide", "hdd"))
nova/tests/unit/virt/libvirt/test_driver.py
+5 -3
View File
@@ -3059,7 +3059,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
# device (hdd). Since power only support scsi, the last device
# is sdz
expect = {"ppc": "sdz", "ppc64": "sdz"}
expect = {"ppc": "sdz", "ppc64": "sdz", "ppc64le": "sdz"}
disk = expect.get(blockinfo.libvirt_utils.get_arch({}), "hdd")
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestDisk)
@@ -5324,7 +5324,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
# all ide calls to scsi
expected = {arch.PPC: ("cdrom", "scsi", "sda"),
arch.PPC64: ("cdrom", "scsi", "sda")}
arch.PPC64: ("cdrom", "scsi", "sda"),
arch.PPC64LE: ("cdrom", "scsi", "sda")}
expec_val = expected.get(blockinfo.libvirt_utils.get_arch({}),
("cdrom", "ide", "hda"))
@@ -5340,7 +5341,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
# all ide calls to scsi
expected = {arch.PPC: ("cdrom", "scsi", "sda"),
arch.PPC64: ("cdrom", "scsi", "sda")}
arch.PPC64: ("cdrom", "scsi", "sda"),
arch.PPC64LE: ("cdrom", "scsi", "sda")}
swap = {'device_name': '/dev/vdc',
'swap_size': 1}