openstack
/
nova
Code Issues Proposed changes

Merge "Modify the disk bus and device name for Aarch64"

This commit is contained in:
Jenkins 2016-06-23 11:49:00 +00:00 committed by Gerrit Code Review
parent 09a63c5aeb 033701402c
commit 884d53dd4f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/unit/virt/libvirt/test_blockinfo.py
View File

@ -360,7 +360,9 @@ class LibvirtBlockInfoTest(test.NoDBTestCase):
# is sdz
bus_ppc = ("scsi", "sdz")
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc, "ppc64le": bus_ppc}
bus_aarch64 = ("scsi", "sdz")
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc,
"ppc64le": bus_ppc, "aarch64": bus_aarch64}
bus, dev = expect_bus.get(blockinfo.libvirt_utils.get_arch({}),
("ide", "hdd"))
@ -393,7 +395,9 @@ class LibvirtBlockInfoTest(test.NoDBTestCase):
image_meta)
bus_ppc = ("scsi", "sdz")
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc, "ppc64le": bus_ppc}
bus_aarch64 = ("scsi", "sdz")
expect_bus = {"ppc": bus_ppc, "ppc64": bus_ppc,
"ppc64le": bus_ppc, "aarch64": bus_aarch64}
bus, dev = expect_bus.get(blockinfo.libvirt_utils.get_arch({}),
("ide", "hdd"))

9
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -3073,7 +3073,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
# device (hdd). Since power only support scsi, the last device
# is sdz
expect = {"ppc": "sdz", "ppc64": "sdz", "ppc64le": "sdz"}
expect = {"ppc": "sdz", "ppc64": "sdz",
"ppc64le": "sdz", "aarch64": "sdz"}
disk = expect.get(blockinfo.libvirt_utils.get_arch({}), "hdd")
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestDisk)
@ -5423,7 +5424,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
expected = {arch.PPC: ("cdrom", "scsi", "sda"),
arch.PPC64: ("cdrom", "scsi", "sda"),
arch.PPC64LE: ("cdrom", "scsi", "sda")}
arch.PPC64LE: ("cdrom", "scsi", "sda"),
arch.AARCH64: ("cdrom", "scsi", "sda")}
expec_val = expected.get(blockinfo.libvirt_utils.get_arch({}),
("cdrom", "ide", "hda"))
@ -5440,7 +5442,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
expected = {arch.PPC: ("cdrom", "scsi", "sda"),
arch.PPC64: ("cdrom", "scsi", "sda"),
arch.PPC64LE: ("cdrom", "scsi", "sda")}
arch.PPC64LE: ("cdrom", "scsi", "sda"),
arch.AARCH64: ("cdrom", "scsi", "sda")}
swap = {'device_name': '/dev/vdc',
'swap_size': 1}