From 467ae11e0685fc6638484bf29ef69c46cb41f140 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 2 Dec 2008 10:25:34 +0000
Subject: [PATCH] SetInstanceParams: handle default/none values
If the hv/be parameter lowercase value is set to "default" we'll pass
constants.VALUE_DEFAULT, if it's set to "none" we'll pass
constants.VALUE_NONE.
Reviewed-by: imsnah
---
scripts/gnt-instance | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 8fa6b1dc8..ac616f655 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1046,9 +1046,20 @@ def SetInstanceParams(opts, args):
ToStderr("Please give at least one of the parameters.")
return 1
- if constants.BE_MEMORY in opts.beparams:
- opts.beparams[constants.BE_MEMORY] = utils.ParseUnit(
- opts.beparams[constants.BE_MEMORY])
+ for param in opts.beparams:
+ if opts.beparams[param].lower() == "default":
+ opts.beparams[param] = constants.VALUE_DEFAULT
+ elif opts.beparams[param].lower() == "none":
+ opts.beparams[param] = constants.VALUE_NONE
+ elif param == constants.BE_MEMORY:
+ opts.beparams[constants.BE_MEMORY] = \
+ utils.ParseUnit(opts.beparams[constants.BE_MEMORY])
+
+ for param in opts.hypervisor:
+ if opts.hypervisor[param].lower() == "default":
+ opts.hypervisor[param] = constants.VALUE_DEFAULT
+ elif opts.hypervisor[param].lower() == "none":
+ opts.hypervisor[param] = constants.VALUE_NONE
for idx, (nic_op, nic_dict) in enumerate(opts.nics):
try:
--
GitLab