Revision 99ccf8b9 lib/objects.py
| b/lib/objects.py | ||
|---|---|---|
| 165 | 165 |
@return: the upgraded disk parameters dict |
| 166 | 166 |
|
| 167 | 167 |
""" |
| 168 |
if diskparams is None:
|
|
| 169 |
result = constants.DISK_DT_DEFAULTS.copy()
|
|
| 168 |
if not diskparams:
|
|
| 169 |
result = {}
|
|
| 170 | 170 |
else: |
| 171 | 171 |
result = FillDiskParams(constants.DISK_DT_DEFAULTS, diskparams) |
| 172 | 172 |
|
| ... | ... | |
| 1660 | 1660 |
if self.use_external_mip_script is None: |
| 1661 | 1661 |
self.use_external_mip_script = False |
| 1662 | 1662 |
|
| 1663 |
self.diskparams = UpgradeDiskParams(self.diskparams) |
|
| 1663 |
if self.diskparams: |
|
| 1664 |
self.diskparams = UpgradeDiskParams(self.diskparams) |
|
| 1665 |
else: |
|
| 1666 |
self.diskparams = constants.DISK_DT_DEFAULTS.copy() |
|
| 1664 | 1667 |
|
| 1665 | 1668 |
# instance policy added before 2.6 |
| 1666 | 1669 |
if self.ipolicy is None: |
Also available in: Unified diff