Revision a8282327 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
12955 | 12955 |
self.op.ndparams, |
12956 | 12956 |
self.op.diskparams, |
12957 | 12957 |
self.op.alloc_policy, |
12958 |
self.op.hv_state, |
|
12959 |
self.op.disk_state |
|
12958 | 12960 |
] |
12959 | 12961 |
|
12960 | 12962 |
if all_changes.count(None) == len(all_changes): |
... | ... | |
12994 | 12996 |
utils.ForceDictType(new_templ_params, constants.DISK_DT_TYPES) |
12995 | 12997 |
self.new_diskparams[templ] = new_templ_params |
12996 | 12998 |
|
12999 |
if self.op.hv_state: |
|
13000 |
self.new_hv_state = _MergeAndVerifyHvState(self.op.hv_state, |
|
13001 |
self.group.hv_state_static) |
|
13002 |
|
|
13003 |
if self.op.disk_state: |
|
13004 |
self.new_disk_state = \ |
|
13005 |
_MergeAndVerifyDiskState(self.op.disk_state, |
|
13006 |
self.group.disk_state_static) |
|
13007 |
|
|
12997 | 13008 |
def BuildHooksEnv(self): |
12998 | 13009 |
"""Build hooks env. |
12999 | 13010 |
|
... | ... | |
13027 | 13038 |
if self.op.alloc_policy: |
13028 | 13039 |
self.group.alloc_policy = self.op.alloc_policy |
13029 | 13040 |
|
13041 |
if self.op.hv_state: |
|
13042 |
self.group.hv_state_static = self.new_hv_state |
|
13043 |
|
|
13044 |
if self.op.disk_state: |
|
13045 |
self.group.disk_state_static = self.new_disk_state |
|
13046 |
|
|
13030 | 13047 |
self.cfg.Update(self.group, feedback_fn) |
13031 | 13048 |
return result |
13032 | 13049 |
|
Also available in: Unified diff