From 2556424d9c66a5a509bdf07f391923cb3940a47a Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 21 Nov 2012 16:27:51 +0100
Subject: [PATCH] Small style fixes (' vs ") in network code
This is just trivial fixes; I think I caught all of them.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/client/gnt_network.py | 12 ++++++------
lib/cmdlib.py | 2 +-
lib/constants.py | 4 ++--
lib/rapi/client.py | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/client/gnt_network.py b/lib/client/gnt_network.py
index 5b0e8ad45..0a6c841b1 100644
--- a/lib/client/gnt_network.py
+++ b/lib/client/gnt_network.py
@@ -1,7 +1,7 @@
#
#
-# Copyright (C) 2011 Google Inc.
+# Copyright (C) 2011, 2012 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
@@ -90,10 +90,10 @@ def MapNetwork(opts, args):
mode = args[2]
link = args[3]
- #TODO: allow comma separated group names
- if groups == 'all':
+ # TODO: allow comma separated group names
+ if groups == "all":
cl = GetClient()
- (groups, ) = cl.QueryGroups([], ['name'], False)
+ (groups, ) = cl.QueryGroups([], ["name"], False)
else:
groups = [groups]
@@ -120,9 +120,9 @@ def UnmapNetwork(opts, args):
groups = args[1]
#TODO: allow comma separated group names
- if groups == 'all':
+ if groups == "all":
cl = GetClient()
- (groups, ) = cl.QueryGroups([], ['name'], False)
+ (groups, ) = cl.QueryGroups([], ["name"], False)
else:
groups = [groups]
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 66046f43b..57746f70a 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -15973,7 +15973,7 @@ class _NetworkQuery(_QueryBase):
netparams = group.networks[net_uuid]
mode = netparams[constants.NIC_MODE]
link = netparams[constants.NIC_LINK]
- info = group.name + '(' + mode + ', ' + link + ')'
+ info = group.name + "(" + mode + ", " + link + ")"
network_to_groups[net_uuid].append(info)
if do_instances:
diff --git a/lib/constants.py b/lib/constants.py
index 4f78766c9..180247f1d 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -1072,8 +1072,8 @@ NIC_IP_POOL = "pool"
NIC_VALID_MODES = frozenset([NIC_MODE_BRIDGED, NIC_MODE_ROUTED])
-RESERVE_ACTION = 'reserve'
-RELEASE_ACTION = 'release'
+RESERVE_ACTION = "reserve"
+RELEASE_ACTION = "release"
# An extra description of the network.
# Can be used by hooks/kvm-vif-bridge to apply different rules
diff --git a/lib/rapi/client.py b/lib/rapi/client.py
index d84bcfef7..04d4160f5 100644
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@ -1741,10 +1741,10 @@ class GanetiRapiClient(object): # pylint: disable=R0904
_AppendDryRunIf(query, dry_run)
if add_reserved_ips:
- add_reserved_ips = add_reserved_ips.split(',')
+ add_reserved_ips = add_reserved_ips.split(",")
if tags:
- tags = tags.split(',')
+ tags = tags.split(",")
body = {
"network_name": network_name,
--
GitLab