Revision 57987785 lib/objects.py
| b/lib/objects.py | ||
|---|---|---|
| 112 | 112 |
return ret_dict |
| 113 | 113 |
|
| 114 | 114 |
|
| 115 |
def FillDiskParams(default_dparams, custom_dparams, skip_keys=None): |
|
| 116 |
"""Fills the disk parameter defaults. |
|
| 117 |
|
|
| 118 |
@see FillDict: For parameters and return value |
|
| 119 |
|
|
| 120 |
""" |
|
| 121 |
assert frozenset(default_dparams.keys()) == constants.DISK_TEMPLATES |
|
| 122 |
|
|
| 123 |
return dict((dt, FillDict(default_dparams[dt], custom_dparams.get(dt, {}),
|
|
| 124 |
skip_keys=skip_keys)) |
|
| 125 |
for dt in constants.DISK_TEMPLATES) |
|
| 126 |
|
|
| 127 |
|
|
| 115 | 128 |
def UpgradeGroupedParams(target, defaults): |
| 116 | 129 |
"""Update all groups for the target parameter. |
| 117 | 130 |
|
| ... | ... | |
| 155 | 168 |
if diskparams is None: |
| 156 | 169 |
result = constants.DISK_DT_DEFAULTS.copy() |
| 157 | 170 |
else: |
| 158 |
# Update the disk parameter values for each disk template. |
|
| 159 |
# The code iterates over constants.DISK_TEMPLATES because new templates |
|
| 160 |
# might have been added. |
|
| 161 |
result = dict((dt, FillDict(constants.DISK_DT_DEFAULTS[dt], |
|
| 162 |
diskparams.get(dt, {})))
|
|
| 163 |
for dt in constants.DISK_TEMPLATES) |
|
| 171 |
result = FillDiskParams(constants.DISK_DT_DEFAULTS, diskparams) |
|
| 164 | 172 |
|
| 165 | 173 |
return result |
| 166 | 174 |
|
Also available in: Unified diff