From eeaa5f6c00cf754a6b51676c92145f23bab1ffcc Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Thu, 7 Mar 2013 00:19:19 +0100
Subject: [PATCH] Remove duplicate filling of instance policy
Instance policy fields were manually filled in CreateIPolicyFromOpts() and
then filled again by the caller. Now they are filled once inside the
function.
Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
---
lib/cli.py | 13 +++----------
lib/client/gnt_cluster.py | 5 ++---
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index eb2884f16..e3d4dab8a 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -3739,16 +3739,6 @@ def CreateIPolicyFromOpts(ispecs_mem_size=None,
for key, val in specs.items(): # {min: .. ,max: .., std: ..}
ipolicy_out[key][name] = val
- # no filldict for non-dicts
- if not group_ipolicy and fill_all:
- if ipolicy_disk_templates is None:
- ipolicy_disk_templates = constants.DISK_TEMPLATES
- if ipolicy_vcpu_ratio is None:
- ipolicy_vcpu_ratio = \
- constants.IPOLICY_DEFAULTS[constants.IPOLICY_VCPU_RATIO]
- if ipolicy_spindle_ratio is None:
- ipolicy_spindle_ratio = \
- constants.IPOLICY_DEFAULTS[constants.IPOLICY_SPINDLE_RATIO]
if ipolicy_disk_templates is not None:
ipolicy_out[constants.IPOLICY_DTS] = list(ipolicy_disk_templates)
if ipolicy_vcpu_ratio is not None:
@@ -3758,6 +3748,9 @@ def CreateIPolicyFromOpts(ispecs_mem_size=None,
assert not (frozenset(ipolicy_out.keys()) - constants.IPOLICY_ALL_KEYS)
+ if not group_ipolicy and fill_all:
+ ipolicy_out = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy_out)
+
return ipolicy_out
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index a332c2d87..1ce13b4ac 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -1,7 +1,7 @@
#
#
-# Copyright (C) 2006, 2007, 2010, 2011, 2012 Google Inc.
+# Copyright (C) 2006, 2007, 2010, 2011, 2012, 2013 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -144,7 +144,7 @@ def InitCluster(opts, args):
utils.ForceDictType(diskparams[templ], constants.DISK_DT_TYPES)
# prepare ipolicy dict
- ipolicy_raw = CreateIPolicyFromOpts(
+ ipolicy = CreateIPolicyFromOpts(
ispecs_mem_size=opts.ispecs_mem_size,
ispecs_cpu_count=opts.ispecs_cpu_count,
ispecs_disk_count=opts.ispecs_disk_count,
@@ -154,7 +154,6 @@ def InitCluster(opts, args):
ipolicy_vcpu_ratio=opts.ipolicy_vcpu_ratio,
ipolicy_spindle_ratio=opts.ipolicy_spindle_ratio,
fill_all=True)
- ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy_raw)
if opts.candidate_pool_size is None:
opts.candidate_pool_size = constants.MASTER_POOL_SIZE_DEFAULT
--
GitLab