Re: [PATCH master 03/10] InitCluster supports instance policy

[Agata Murawska]

On Thu, Dec 8, 2011 at 11:45 AM, Michael Hanselmann <han...@google.com> wrote:
> Am 8. Dezember 2011 11:42 schrieb Agata Murawska <agatamuraw...@google.com>:
>> --- a/lib/client/gnt_cluster.py
>> +++ b/lib/client/gnt_cluster.py
>> @@ -140,11 +140,11 @@ def InitCluster(opts, args):
>>
>>   # prepare ipolicy dict
>>   ipolicy_raw = objects.CreateIPolicyFromOpts(\
>> -    mem_count_ispecs=opts.mem_count_ispecs,
>
> Incorrect style.
>
> - Don't use backslashes unless allowed
> - Don't break after an opening paren

Hmm so, assuming it is allowed sometimes, how about like this?

diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 7260e85..d798ecb 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -139,12 +139,12 @@ def InitCluster(opts, args):
     utils.ForceDictType(diskparams[templ], constants.DISK_DT_TYPES)

   # prepare ipolicy dict
-  ipolicy_raw = objects.CreateIPolicyFromOpts(\
-    ispecs_mem_size=opts.ispecs_mem_count,
-    ispecs_cpu_count=opts.ispecs_cpu_count,
-    ispecs_disk_count=opts.ispecs_disk_count,
-    ispecs_disk_size=opts.ispecs_disk_size,
-    ispecs_nic_count=opts.ispecs_nic_count)
+  ipolicy_raw = \
+    objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_count,
+                                  ispecs_cpu_count=opts.ispecs_cpu_count,
+                                  ispecs_disk_count=opts.ispecs_disk_count,
+                                  ispecs_disk_size=opts.ispecs_disk_size,
+                                  ispecs_nic_count=opts.ispecs_nic_count)
   ipolicy = objects.FillDictOfDicts(constants.IPOLICY_DEFAULTS, ipolicy_raw)
   for value in ipolicy.values():
     utils.ForceDictType(value, constants.ISPECS_PARAMETER_TYPES)


Agata

>
> Michael