Revision d4b72030 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 1279 | 1279 |
(node, vgstatus)) |
| 1280 | 1280 |
|
| 1281 | 1281 |
self.cluster = cluster = self.cfg.GetClusterInfo() |
| 1282 |
# beparams changes do not need validation (we can't validate?), |
|
| 1283 |
# but we still process here |
|
| 1282 |
# validate beparams changes |
|
| 1284 | 1283 |
if self.op.beparams: |
| 1284 |
utils.CheckBEParams(self.op.beparams) |
|
| 1285 | 1285 |
self.new_beparams = cluster.FillDict( |
| 1286 | 1286 |
cluster.beparams[constants.BEGR_DEFAULT], self.op.beparams) |
| 1287 | 1287 |
|
| ... | ... | |
| 3560 | 3560 |
hv_type.CheckParameterSyntax(filled_hvp) |
| 3561 | 3561 |
|
| 3562 | 3562 |
# fill and remember the beparams dict |
| 3563 |
utils.CheckBEParams(self.op.beparams) |
|
| 3563 | 3564 |
self.be_full = cluster.FillDict(cluster.beparams[constants.BEGR_DEFAULT], |
| 3564 | 3565 |
self.op.beparams) |
| 3565 | 3566 |
|
| ... | ... | |
| 4874 | 4875 |
self.op.hvparams or self.op.beparams): |
| 4875 | 4876 |
raise errors.OpPrereqError("No changes submitted")
|
| 4876 | 4877 |
|
| 4877 |
for item in (constants.BE_MEMORY, constants.BE_VCPUS): |
|
| 4878 |
val = self.op.beparams.get(item, None) |
|
| 4879 |
if val is not None: |
|
| 4880 |
try: |
|
| 4881 |
val = int(val) |
|
| 4882 |
except ValueError, err: |
|
| 4883 |
raise errors.OpPrereqError("Invalid %s size: %s" % (item, str(err)))
|
|
| 4884 |
self.op.beparams[item] = val |
|
| 4878 |
utils.CheckBEParams(self.op.beparams) |
|
| 4879 |
|
|
| 4885 | 4880 |
# Disk validation |
| 4886 | 4881 |
disk_addremove = 0 |
| 4887 | 4882 |
for disk_op, disk_dict in self.op.disks: |
Also available in: Unified diff