womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify the test case of get_disk_mapping_rescue_with_config"

Browse Source
This commit is contained in:
Zuul
2018-01-26 09:53:40 +00:00
committed by Gerrit Code Review
parent ac60fda9e5 a7a04e273e
commit d0d0262379
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/tests/unit/virt/libvirt/test_blockinfo.py
+6 -2
View File
@@ -253,12 +253,16 @@ class LibvirtBlockInfoTest(test.NoDBTestCase):
image_meta,
rescue=True)
expect_disk_config_rescue = {
'bus': 'ide', 'dev': 'hda', 'type': 'cdrom'}
if blockinfo.libvirt_utils.get_arch({}) == 'aarch64':
expect_disk_config_rescue['bus'] = 'scsi'
expect_disk_config_rescue['dev'] = 'sda'
expect = {
'disk.rescue': {'bus': 'virtio', 'dev': 'vda',
'type': 'disk', 'boot_index': '1'},
'disk': {'bus': 'virtio', 'dev': 'vdb', 'type': 'disk'},
'disk.config.rescue': {'bus': 'ide', 'dev': 'hda',
'type': 'cdrom'},
'disk.config.rescue': expect_disk_config_rescue,
'root': {'bus': 'virtio', 'dev': 'vda',
'type': 'disk', 'boot_index': '1'},
}