Where we used/forgot to validate beparams we now use the new common function.
Reviewed-by: imsnah
raise errors.OpPrereqError("Init.d script '%s' missing or not"
" executable." % constants.NODE_INITD_SCRIPT)
raise errors.OpPrereqError("Init.d script '%s' missing or not"
" executable." % constants.NODE_INITD_SCRIPT)
+ utils.CheckBEParams(beparams)
+
# set up the inter-node password and certificate
_InitGanetiServerSetup()
# set up the inter-node password and certificate
_InitGanetiServerSetup()
(node, vgstatus))
self.cluster = cluster = self.cfg.GetClusterInfo()
(node, vgstatus))
self.cluster = cluster = self.cfg.GetClusterInfo()
- # beparams changes do not need validation (we can't validate?),
- # but we still process here
+ # validate beparams changes
+ utils.CheckBEParams(self.op.beparams)
self.new_beparams = cluster.FillDict(
cluster.beparams[constants.BEGR_DEFAULT], self.op.beparams)
self.new_beparams = cluster.FillDict(
cluster.beparams[constants.BEGR_DEFAULT], self.op.beparams)
hv_type.CheckParameterSyntax(filled_hvp)
# fill and remember the beparams dict
hv_type.CheckParameterSyntax(filled_hvp)
# fill and remember the beparams dict
+ utils.CheckBEParams(self.op.beparams)
self.be_full = cluster.FillDict(cluster.beparams[constants.BEGR_DEFAULT],
self.op.beparams)
self.be_full = cluster.FillDict(cluster.beparams[constants.BEGR_DEFAULT],
self.op.beparams)
self.op.hvparams or self.op.beparams):
raise errors.OpPrereqError("No changes submitted")
self.op.hvparams or self.op.beparams):
raise errors.OpPrereqError("No changes submitted")
- for item in (constants.BE_MEMORY, constants.BE_VCPUS):
- val = self.op.beparams.get(item, None)
- if val is not None:
- try:
- val = int(val)
- except ValueError, err:
- raise errors.OpPrereqError("Invalid %s size: %s" % (item, str(err)))
- self.op.beparams[item] = val
+ utils.CheckBEParams(self.op.beparams)
+
# Disk validation
disk_addremove = 0
for disk_op, disk_dict in self.op.disks:
# Disk validation
disk_addremove = 0
for disk_op, disk_dict in self.op.disks: