From cd415612a48153a7c6061c278156dad6f0b52678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Mon, 21 May 2012 16:31:42 +0200
Subject: [PATCH] Make it possible to reset vcpu/spindle ratio to default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cli.py | 37 +++++++++++++++++++++++++++++++------
lib/cmdlib.py | 3 ++-
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index 7ee82a83f..2af473832 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -617,6 +617,18 @@ def check_list(option, opt, value): # pylint: disable=W0613
return utils.UnescapeAndSplit(value)
+def check_maybefloat(option, opt, value): # pylint: disable=W0613
+ """Custom parser for float numbers which might be also defaults.
+
+ """
+ value = value.lower()
+
+ if value == constants.VALUE_DEFAULT:
+ return value
+ else:
+ return float(value)
+
+
# completion_suggestion is normally a list. Using numeric values not evaluating
# to False for dynamic completion.
(OPT_COMPL_MANY_NODES,
@@ -651,6 +663,7 @@ class CliOption(Option):
"unit",
"bool",
"list",
+ "maybefloat",
)
TYPE_CHECKER = Option.TYPE_CHECKER.copy()
TYPE_CHECKER["identkeyval"] = check_ident_key_val
@@ -658,6 +671,7 @@ class CliOption(Option):
TYPE_CHECKER["unit"] = check_unit
TYPE_CHECKER["bool"] = check_bool
TYPE_CHECKER["list"] = check_list
+ TYPE_CHECKER["maybefloat"] = check_maybefloat
# optparse.py sets make_option, so we do it for our own option class, too
@@ -844,12 +858,12 @@ IPOLICY_DISK_TEMPLATES = cli_option("--ipolicy-disk-templates",
IPOLICY_VCPU_RATIO = cli_option("--ipolicy-vcpu-ratio",
dest="ipolicy_vcpu_ratio",
- type="float", default=None,
+ type="maybefloat", default=None,
help="The maximum allowed vcpu-to-cpu ratio")
IPOLICY_SPINDLE_RATIO = cli_option("--ipolicy-spindle-ratio",
dest="ipolicy_spindle_ratio",
- type="float", default=None,
+ type="maybefloat", default=None,
help=("The maximum allowed instances to"
" spindle ratio"))
@@ -3423,6 +3437,19 @@ def ConfirmOperation(names, list_type, text, extra=""):
return choice
+def _MaybeParseUnit(elements):
+ """Parses and returns an array of potential values with units.
+
+ """
+ parsed = []
+ for e in elements:
+ if e == constants.VALUE_DEFAULT:
+ parsed.append(e)
+ else:
+ parsed.append(utils.ParseUnit(e))
+ return parsed
+
+
def CreateIPolicyFromOpts(ispecs_mem_size=None,
ispecs_cpu_count=None,
ispecs_disk_count=None,
@@ -3443,11 +3470,9 @@ def CreateIPolicyFromOpts(ispecs_mem_size=None,
"""
try:
if ispecs_mem_size:
- for k in ispecs_mem_size:
- ispecs_mem_size[k] = utils.ParseUnit(ispecs_mem_size[k])
+ ispecs_mem_size = _MaybeParseUnit(ispecs_mem_size)
if ispecs_disk_size:
- for k in ispecs_disk_size:
- ispecs_disk_size[k] = utils.ParseUnit(ispecs_disk_size[k])
+ ispecs_disk_size = _MaybeParseUnit(ispecs_disk_size)
except (TypeError, ValueError, errors.UnitParseError), err:
raise errors.OpPrereqError("Invalid disk (%s) or memory (%s) size"
" in policy: %s" %
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 6e4fff4d5..b9cd7ad3d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -793,7 +793,8 @@ def _GetUpdatedIPolicy(old_ipolicy, new_ipolicy, group_policy=False):
use_none=use_none,
use_default=use_default)
else:
- if not value or value == [constants.VALUE_DEFAULT]:
+ if (not value or value == [constants.VALUE_DEFAULT] or
+ value == constants.VALUE_DEFAULT):
if group_policy:
del ipolicy[key]
else:
--
GitLab