Revision b3230b32
| b/lib/cmdlib.py | ||
|---|---|---|
| 13939 | 13939 |
|
| 13940 | 13940 |
if self.op.diskparams: |
| 13941 | 13941 |
diskparams = self.group.diskparams |
| 13942 |
uavdp = self._UpdateAndVerifyDiskParams |
|
| 13943 |
# For each disktemplate subdict update and verify the values |
|
| 13942 | 13944 |
new_diskparams = dict((dt, |
| 13943 |
self._UpdateAndVerifyDiskParams(diskparams[dt],
|
|
| 13944 |
self.op.diskparams[dt]))
|
|
| 13945 |
uavdp(diskparams.get(dt, {}),
|
|
| 13946 |
self.op.diskparams[dt])) |
|
| 13945 | 13947 |
for dt in constants.DISK_TEMPLATES |
| 13946 | 13948 |
if dt in self.op.diskparams) |
| 13947 |
self.new_diskparams = objects.FillDiskParams(diskparams, new_diskparams) |
|
| 13949 |
# As we've all subdicts of diskparams ready, lets merge the actual |
|
| 13950 |
# dict with all updated subdicts |
|
| 13951 |
self.new_diskparams = objects.FillDict(diskparams, new_diskparams) |
|
| 13948 | 13952 |
|
| 13949 | 13953 |
if self.op.hv_state: |
| 13950 | 13954 |
self.new_hv_state = _MergeAndVerifyHvState(self.op.hv_state, |
Also available in: Unified diff