openstack
/
nova
Code Issues Proposed changes

block_device_info: Add swap to inline 

A trivial cleanup to make the contents of block_device_info clear to
the reader.

Change-Id: Idf8aaf77c593d433cd4f6d9e835acadc7a19a9d1
This commit is contained in:
Lee Yarwood 2022-01-18 11:00:14 +00:00 committed by melanie witt
parent 4ca7955365
commit 003f1d2b45
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/virt/driver.py
View File

@ -52,18 +52,16 @@ def get_block_device_info(instance, block_device_mapping):
specialized subclasses.
"""
from nova.virt import block_device as virt_block_device
block_device_info = {
return {
'root_device_name': instance.root_device_name,
'ephemerals': virt_block_device.convert_ephemerals(
block_device_mapping),
'block_device_mapping':
virt_block_device.convert_all_volumes(*block_device_mapping)
virt_block_device.convert_all_volumes(*block_device_mapping),
'swap':
virt_block_device.get_swap(
virt_block_device.convert_swap(block_device_mapping))
}
swap_list = virt_block_device.convert_swap(block_device_mapping)
block_device_info['swap'] = virt_block_device.get_swap(swap_list)
return block_device_info
def block_device_info_get_root_device(block_device_info):