From 8e47b5dadd113a15fc17946ff4f250701b934c16 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 25 Aug 2011 17:57:25 +0200
Subject: [PATCH] Two more PEP8 fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
cmdlib: Avoid wrapping using backslash
gnt_group: Avoid ** magic using keyword arguments (the βpep8β tool
doesn't like the inline comment in this case and will complain about
spaces around the β**β operator)
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/client/gnt_group.py | 12 ++++--------
lib/cmdlib.py | 8 ++++----
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index 538c1cbe9..2fb73e1b0 100644
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -130,17 +130,13 @@ def SetGroupParams(opts, args):
@return: the desired exit code
"""
- all_changes = {
- "ndparams": opts.ndparams,
- "alloc_policy": opts.alloc_policy,
- }
-
- if all_changes.values().count(None) == len(all_changes):
+ if opts.ndparams is None and opts.alloc_policy is None:
ToStderr("Please give at least one of the parameters.")
return 1
- op = opcodes.OpGroupSetParams(group_name=args[0], # pylint: disable-msg=W0142
- **all_changes)
+ op = opcodes.OpGroupSetParams(group_name=args[0],
+ ndparams=opts.ndparams,
+ alloc_policy=opts.alloc_policy)
result = SubmitOrSend(op, opts)
if result:
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 80795d2ab..5b1be95ce 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -9831,6 +9831,8 @@ class TLReplaceDisks(Tasklet):
"""
steps_total = 6
+ pnode = self.instance.primary_node
+
# Step: check device activation
self.lu.LogStep(1, steps_total, "Check device existence")
self._CheckDisksExistence([self.instance.primary_node])
@@ -9905,10 +9907,8 @@ class TLReplaceDisks(Tasklet):
" soon as possible"))
self.lu.LogInfo("Detaching primary drbds from the network (=> standalone)")
- result = self.rpc.call_drbd_disconnect_net([self.instance.primary_node],
- self.node_secondary_ip,
- self.instance.disks)\
- [self.instance.primary_node]
+ result = self.rpc.call_drbd_disconnect_net([pnode], self.node_secondary_ip,
+ self.instance.disks)[pnode]
msg = result.fail_msg
if msg:
--
GitLab