Revision e4c03256 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 12786 | 12786 |
if self.op.ndparams: |
| 12787 | 12787 |
utils.ForceDictType(self.op.ndparams, constants.NDS_PARAMETER_TYPES) |
| 12788 | 12788 |
|
| 12789 |
if self.op.hv_state: |
|
| 12790 |
self.new_hv_state = _MergeAndVerifyHvState(self.op.hv_state, None) |
|
| 12791 |
else: |
|
| 12792 |
self.new_hv_state = None |
|
| 12793 |
|
|
| 12794 |
if self.op.disk_state: |
|
| 12795 |
self.new_disk_state = _MergeAndVerifyDiskState(self.op.disk_state, None) |
|
| 12796 |
else: |
|
| 12797 |
self.new_disk_state = None |
|
| 12798 |
|
|
| 12789 | 12799 |
if self.op.diskparams: |
| 12790 | 12800 |
for templ in constants.DISK_TEMPLATES: |
| 12791 | 12801 |
if templ not in self.op.diskparams: |
| ... | ... | |
| 12823 | 12833 |
alloc_policy=self.op.alloc_policy, |
| 12824 | 12834 |
ndparams=self.op.ndparams, |
| 12825 | 12835 |
diskparams=self.op.diskparams, |
| 12826 |
ipolicy=self.op.ipolicy) |
|
| 12836 |
ipolicy=self.op.ipolicy, |
|
| 12837 |
hv_state_static=self.new_hv_state, |
|
| 12838 |
disk_state_static=self.new_disk_state) |
|
| 12827 | 12839 |
|
| 12828 | 12840 |
self.cfg.AddNodeGroup(group_obj, self.proc.GetECId(), check_uuid=False) |
| 12829 | 12841 |
del self.remove_locks[locking.LEVEL_NODEGROUP] |
Also available in: Unified diff