openstack/nova
Code Issues Proposed changes

bdm: Make sure that delete_on_termination is a boolean

Browse Source 
Make sure that 'delete_on_termination' is always a boolean, even if it
was not passed in and thus got defaulted to None up until now.

This patch is really more of a pedantic fix, as we use objects for BDMs
everywhere outside of the API service, and object fields are of the
correct type.

Related-bug: #1370177

Change-Id: I2724bcbe159490f3bdd85f833412f3b20c4e1e23
This commit is contained in:
Nikola Dipanov
2015-05-29 20:59:10 +01:00
parent 65d6eb01b9
commit aa2f5dcc5f
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)
if bdm_dict.get('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
self.update({field: None for field in self._fields - do_not_default})
self.update(list(six.iteritems(bdm_dict)))