openstack/nova
Code Issues Proposed changes

Rename block_device_info_get_root

Browse Source 
The other block_device_info_get_* methods return DriverBlockDevice
objects, but this method returns the root_device_name. We rename it in
preparation for a subsequent patch which adds a method returning a
DriverBlockDevice object for the root disk.

Change-Id: Ic2de01e62c5ed35c05f09ce2c74fd258f06a4109
This commit is contained in:
Matthew Booth
2017-12-08 00:22:15 +00:00
parent 640e656ad5
commit 3c0315179a
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/unit/virt/test_virt.py
View File

@@ -49,10 +49,11 @@ class TestVirtDriver(test.NoDBTestCase):
empty_block_device_info = {} empty_block_device_info = {}
self.assertEqual( self.assertEqual(
driver.block_device_info_get_root(block_device_info), '/dev/sda') driver.block_device_info_get_root_device(block_device_info),
'/dev/sda')
self.assertIsNone( self.assertIsNone(
driver.block_device_info_get_root(empty_block_device_info)) driver.block_device_info_get_root_device(empty_block_device_info))
self.assertIsNone(driver.block_device_info_get_root(None)) self.assertIsNone(driver.block_device_info_get_root_device(None))
self.assertEqual( self.assertEqual(
driver.block_device_info_get_swap(block_device_info), swap) driver.block_device_info_get_swap(block_device_info), swap)

2
nova/virt/driver.py
View File

@@ -63,7 +63,7 @@ def get_block_device_info(instance, block_device_mapping):
return block_device_info return block_device_info
def block_device_info_get_root(block_device_info): def block_device_info_get_root_device(block_device_info):
block_device_info = block_device_info or {} block_device_info = block_device_info or {}
return block_device_info.get('root_device_name') return block_device_info.get('root_device_name')

5
nova/virt/hyperv/block_device_manager.py
View File

@@ -127,8 +127,9 @@ class BlockDeviceInfoManager(object):
# either booting from volume, or booting from image/iso # either booting from volume, or booting from image/iso
root_disk = {} root_disk = {}
root_device = (driver.block_device_info_get_root(block_device_info) or root_device = driver.block_device_info_get_root_device(
self._DEFAULT_ROOT_DEVICE) block_device_info)
root_device = root_device or self._DEFAULT_ROOT_DEVICE
if self.is_boot_from_volume(block_device_info): if self.is_boot_from_volume(block_device_info):
root_volume = self._get_root_device_bdm( root_volume = self._get_root_device_bdm(

2
nova/virt/libvirt/blockinfo.py
View File

@@ -550,7 +550,7 @@ def get_disk_mapping(virt_type, instance,
driver.block_device_info_get_mapping(block_device_info)) driver.block_device_info_get_mapping(block_device_info))
root_device_name = block_device.strip_dev( root_device_name = block_device.strip_dev(
driver.block_device_info_get_root(block_device_info)) driver.block_device_info_get_root_device(block_device_info))
root_info = get_root_info( root_info = get_root_info(
instance, virt_type, image_meta, root_bdm, instance, virt_type, image_meta, root_bdm,
disk_bus, cdrom_bus, root_device_name) disk_bus, cdrom_bus, root_device_name)