From 21faa3ad42ab8dcf4e9405df5a40f2babdffa531 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 27 Nov 2012 08:52:52 +0100
Subject: [PATCH] LUNetwork*: Build dictionaries right away
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
β¦ instead of constructing an object, only to fill it separately.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
---
lib/cmdlib.py | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index df275c389..f105d7487 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -16062,10 +16062,11 @@ class LUNetworkConnect(LogicalUnit):
self.cfg.GetNodeGroupInstances(self.group_uuid)
def BuildHooksEnv(self):
- ret = {}
- ret["GROUP_NAME"] = self.group_name
- ret["GROUP_NETWORK_MODE"] = self.network_mode
- ret["GROUP_NETWORK_LINK"] = self.network_link
+ ret = {
+ "GROUP_NAME": self.group_name,
+ "GROUP_NETWORK_MODE": self.network_mode,
+ "GROUP_NETWORK_LINK": self.network_link,
+ }
ret.update(_BuildNetworkHookEnvByObject(self.network))
return ret
@@ -16077,9 +16078,10 @@ class LUNetworkConnect(LogicalUnit):
l = lambda value: ", ".join("%s: %s/%s" % (i[0], i[1], i[2])
for i in value)
- self.netparams = {}
- self.netparams[constants.NIC_MODE] = self.network_mode
- self.netparams[constants.NIC_LINK] = self.network_link
+ self.netparams = {
+ constants.NIC_MODE: self.network_mode,
+ constants.NIC_LINK: self.network_link,
+ }
objects.NIC.CheckParameterSyntax(self.netparams)
#if self.network_mode == constants.NIC_MODE_BRIDGED:
@@ -16158,8 +16160,9 @@ class LUNetworkDisconnect(LogicalUnit):
self.cfg.GetNodeGroupInstances(self.group_uuid)
def BuildHooksEnv(self):
- ret = {}
- ret["GROUP_NAME"] = self.group_name
+ ret = {
+ "GROUP_NAME": self.group_name,
+ }
ret.update(_BuildNetworkHookEnvByObject(self.network))
return ret
--
GitLab