Commit 765ada2b authored by Iustin Pop's avatar Iustin Pop
Browse files

Small fixes to objects.UpgradeDiskParams

Fix a typo, and cleanup the code a bit.
Signed-off-by: default avatarIustin Pop <>
Reviewed-by: default avatarMichael Hanselmann <>
parent 202fb4e0
......@@ -149,22 +149,18 @@ def UpgradeDiskParams(diskparams):
@type diskparams: dict
@param diskparams: disk parameters to upgrade
@rtype: dict
@return: the upgraded disk parameters dit
@return: the upgraded disk parameters dict
result = dict()
if diskparams is None:
result = constants.DISK_DT_DEFAULTS.copy()
# Update the disk parameter values for each disk template.
# The code iterates over constants.DISK_TEMPLATES because new templates
# might have been added.
for template in constants.DISK_TEMPLATES:
if template not in diskparams:
result[template] = constants.DISK_DT_DEFAULTS[template].copy()
result[template] = FillDict(constants.DISK_DT_DEFAULTS[template],
result = dict((dt, FillDict(constants.DISK_DT_DEFAULTS[dt],
diskparams.get(dt, {})))
for dt in constants.DISK_TEMPLATES)
return result
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment