Merge "Fix empty device_name for bdm_v2 Nova::Server"
This commit is contained in:
commit
eb8799b2de
@ -837,8 +837,13 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin,
|
|||||||
cls.BLOCK_DEVICE_MAPPING_SWAP_SIZE),
|
cls.BLOCK_DEVICE_MAPPING_SWAP_SIZE),
|
||||||
}
|
}
|
||||||
|
|
||||||
update_props = (cls.BLOCK_DEVICE_MAPPING_DEVICE_NAME,
|
# NOTE(prazumovsky): In case of server doesn't take empty value of
|
||||||
cls.BLOCK_DEVICE_MAPPING_DEVICE_TYPE,
|
# device name, need to escape from such situation.
|
||||||
|
device_name = mapping.get(cls.BLOCK_DEVICE_MAPPING_DEVICE_NAME)
|
||||||
|
if device_name:
|
||||||
|
bmd_dict[cls.BLOCK_DEVICE_MAPPING_DEVICE_NAME] = device_name
|
||||||
|
|
||||||
|
update_props = (cls.BLOCK_DEVICE_MAPPING_DEVICE_TYPE,
|
||||||
cls.BLOCK_DEVICE_MAPPING_DISK_BUS,
|
cls.BLOCK_DEVICE_MAPPING_DISK_BUS,
|
||||||
cls.BLOCK_DEVICE_MAPPING_BOOT_INDEX,
|
cls.BLOCK_DEVICE_MAPPING_BOOT_INDEX,
|
||||||
cls.BLOCK_DEVICE_MAPPING_VOLUME_SIZE,
|
cls.BLOCK_DEVICE_MAPPING_VOLUME_SIZE,
|
||||||
|
@ -2622,6 +2622,10 @@ class ServersTest(common.HeatTestCase):
|
|||||||
{'swap_size': 1}
|
{'swap_size': 1}
|
||||||
]))
|
]))
|
||||||
|
|
||||||
|
self.assertEqual([], servers.Server._build_block_device_mapping_v2([
|
||||||
|
{'device_name': ''}
|
||||||
|
]))
|
||||||
|
|
||||||
def test_validate_with_both_blk_dev_map_and_blk_dev_map_v2(self):
|
def test_validate_with_both_blk_dev_map_and_blk_dev_map_v2(self):
|
||||||
stack_name = 'invalid_stack'
|
stack_name = 'invalid_stack'
|
||||||
tmpl, stack = self._setup_test_stack(stack_name)
|
tmpl, stack = self._setup_test_stack(stack_name)
|
||||||
|
Loading…
Reference in New Issue
Block a user