openstack/nova
Code Issues Proposed changes

Merge "bdm: Make sure that delete_on_termination is a boolean"

Browse Source
This commit is contained in:
Jenkins
2015-06-03 05:55:43 +00:00
committed by Gerrit Code Review
parent 6684be2703 aa2f5dcc5f
commit 93cbba96fa
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/block_device.py
View File

@@ -86,6 +86,8 @@ class BlockDeviceDict(dict):
self._validate(bdm_dict) self._validate(bdm_dict)
if bdm_dict.get('device_name'): if bdm_dict.get('device_name'):
bdm_dict['device_name'] = prepend_dev(bdm_dict['device_name']) bdm_dict['device_name'] = prepend_dev(bdm_dict['device_name'])
bdm_dict['delete_on_termination'] = bool(
bdm_dict.get('delete_on_termination'))
# NOTE (ndipanov): Never default db fields # NOTE (ndipanov): Never default db fields
self.update({field: None for field in self._fields - do_not_default}) self.update({field: None for field in self._fields - do_not_default})
self.update(list(six.iteritems(bdm_dict))) self.update(list(six.iteritems(bdm_dict)))

2
nova/tests/unit/compute/test_compute_api.py
View File

@@ -1989,7 +1989,7 @@ class _ComputeAPIUnitTestMixIn(object):
'image_id': None, 'volume_id': None, 'disk_bus': None, 'image_id': None, 'volume_id': None, 'disk_bus': None,
'volume_size': None, 'source_type': 'snapshot', 'volume_size': None, 'source_type': 'snapshot',
'device_type': None, 'snapshot_id': '1-snapshot', 'device_type': None, 'snapshot_id': '1-snapshot',
'destination_type': 'volume', 'delete_on_termination': None}) 'destination_type': 'volume', 'delete_on_termination': False})
# All the db_only fields and the volume ones are removed # All the db_only fields and the volume ones are removed
self.compute_api.snapshot_volume_backed( self.compute_api.snapshot_volume_backed(

12
nova/tests/unit/test_block_device.py
View File

@@ -427,6 +427,18 @@ class TestBlockDeviceDict(test.NoDBTestCase):
bdm_dict = block_device.BlockDeviceDict(bdm) bdm_dict = block_device.BlockDeviceDict(bdm)
self.assertIsNone(bdm_dict['device_name']) self.assertIsNone(bdm_dict['device_name'])
def test_init_boolify_delete_on_termination(self):
# Make sure that when delete_on_termination is not passed it's
# still set to False and not None
bdm = {'id': 3, 'instance_uuid': 'fake-instance',
'device_name': 'vda',
'source_type': 'volume',
'destination_type': 'volume',
'volume_id': 'fake-volume-id-1',
'boot_index': 0}
bdm_dict = block_device.BlockDeviceDict(bdm)
self.assertEqual(False, bdm_dict['delete_on_termination'])
def test_validate(self): def test_validate(self):
self.assertRaises(exception.InvalidBDMFormat, self.assertRaises(exception.InvalidBDMFormat,
block_device.BlockDeviceDict, block_device.BlockDeviceDict,