Revision 363c0106 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 3835 | 3835 |
utils.ForceDictType(value, constants.ISPECS_PARAMETER_TYPES) |
| 3836 | 3836 |
ipolicy[key] = _GetUpdatedParams(cluster.ipolicy.get(key, {}),
|
| 3837 | 3837 |
value) |
| 3838 |
objects.InstancePolicy.CheckParameterSyntax(ipolicy) |
|
| 3838 |
try: |
|
| 3839 |
objects.InstancePolicy.CheckParameterSyntax(ipolicy) |
|
| 3840 |
except errors.ConfigurationError, err: |
|
| 3841 |
raise errors.OpPrereqError("Invalid instance policy: %s" % err,
|
|
| 3842 |
errors.ECODE_INVAL) |
|
| 3839 | 3843 |
self.new_ipolicy = ipolicy |
| 3840 | 3844 |
|
| 3841 | 3845 |
if self.op.nicparams: |
| ... | ... | |
| 12967 | 12971 |
if self.op.ipolicy: |
| 12968 | 12972 |
cluster = self.cfg.GetClusterInfo() |
| 12969 | 12973 |
full_ipolicy = cluster.SimpleFillIPolicy(self.op.ipolicy) |
| 12970 |
objects.InstancePolicy.CheckParameterSyntax(full_ipolicy) |
|
| 12974 |
try: |
|
| 12975 |
objects.InstancePolicy.CheckParameterSyntax(full_ipolicy) |
|
| 12976 |
except errors.ConfigurationError, err: |
|
| 12977 |
raise errors.OpPrereqError("Invalid instance policy: %s" % err,
|
|
| 12978 |
errors.ECODE_INVAL) |
|
| 12971 | 12979 |
|
| 12972 | 12980 |
def BuildHooksEnv(self): |
| 12973 | 12981 |
"""Build hooks env. |
| ... | ... | |
| 13305 | 13313 |
use_none=True) |
| 13306 | 13314 |
utils.ForceDictType(g_ipolicy[key], constants.ISPECS_PARAMETER_TYPES) |
| 13307 | 13315 |
self.new_ipolicy = g_ipolicy |
| 13308 |
objects.InstancePolicy.CheckParameterSyntax(self.new_ipolicy) |
|
| 13316 |
try: |
|
| 13317 |
objects.InstancePolicy.CheckParameterSyntax(self.new_ipolicy) |
|
| 13318 |
except errors.ConfigurationError, err: |
|
| 13319 |
raise errors.OpPrereqError("Invalid instance policy: %s" % err,
|
|
| 13320 |
errors.ECODE_INVAL) |
|
| 13309 | 13321 |
|
| 13310 | 13322 |
def BuildHooksEnv(self): |
| 13311 | 13323 |
"""Build hooks env. |
Also available in: Unified diff