summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitalii Koriakov <vkoriako@redhat.com>2018-11-05 13:14:44 +0200
committerVijay Avuthu <vavuthu@redhat.com>2018-11-08 11:02:58 +0000
commit35bc2eb0685109cf2e4d0053c1c6d3af6206e614 (patch)
treee6190903bdfb6bc86fe72881abb09482afab5bfb
parent0adfb628fbbd7a2edd5c2be6e8c8c1c5c8ecbba0 (diff)
Convert auth_ops.py and lib_utils.py to python3
Change-Id: I8baf97066c5ae47e2a298581eeb74374fc09a21e Signed-off-by: Vitalii Koriakov <vkoriako@redhat.com>
-rw-r--r--glustolibs-gluster/glustolibs/gluster/auth_ops.py8
-rwxr-xr-xglustolibs-gluster/glustolibs/gluster/lib_utils.py23
2 files changed, 16 insertions, 15 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/auth_ops.py b/glustolibs-gluster/glustolibs/gluster/auth_ops.py
index da8ac08..260120c 100644
--- a/glustolibs-gluster/glustolibs/gluster/auth_ops.py
+++ b/glustolibs-gluster/glustolibs/gluster/auth_ops.py
@@ -48,7 +48,7 @@ def set_auth_allow(volname, server, auth_dict):
# If authentication has to be set on sub-dirs, convert the key-value pair
# to gluster authentication set command format.
if 'all' not in auth_dict:
- for key, value in auth_dict.iteritems():
+ for key, value in list(auth_dict.items()):
auth_cmds.append("%s(%s)" % (key, "|".join(value)))
auth_cmd = ("gluster volume set %s auth.allow \"%s\""
@@ -111,7 +111,7 @@ def verify_auth_allow(volname, server, auth_dict):
# When authentication has to be verified on on sub-dirs, convert the key-
# value pair to a format which matches the value of auth.allow option.
- for key, value in auth_dict.iteritems():
+ for key, value in list(auth_dict.items()):
auth_details.append("%s(%s)" % (key, "|".join(value)))
# Check whether the required clients names are listed in auth.allow option
@@ -168,7 +168,7 @@ def verify_auth_reject(volname, server, auth_dict):
# When authentication has to be verified on on sub-dirs, convert the key-
# value pair to a format which matches the value of auth.reject option.
- for key, value in auth_dict.iteritems():
+ for key, value in list(auth_dict.items()):
auth_details.append("%s(%s)" % (key, "|".join(value)))
# Check if the required clients names are listed in auth.reject option
@@ -208,7 +208,7 @@ def set_auth_reject(volname, server, auth_dict):
# If authentication has to be set on sub-dirs, convert the key-value pair
# to gluster authentication set command format.
if 'all' not in auth_dict:
- for key, value in auth_dict.iteritems():
+ for key, value in list(auth_dict.items()):
auth_cmds.append("%s(%s)" % (key, "|".join(value)))
auth_cmd = ("gluster volume set %s auth.reject \"%s\""
diff --git a/glustolibs-gluster/glustolibs/gluster/lib_utils.py b/glustolibs-gluster/glustolibs/gluster/lib_utils.py
index 44ac6e3..95be23e 100755
--- a/glustolibs-gluster/glustolibs/gluster/lib_utils.py
+++ b/glustolibs-gluster/glustolibs/gluster/lib_utils.py
@@ -320,7 +320,7 @@ def get_servers_bricks_dict(servers, servers_info):
else:
servers_bricks_dict[server] = out.strip().split("\n")
- for key, value in servers_bricks_dict.items():
+ for key, value in list(servers_bricks_dict.items()):
value.sort()
return servers_bricks_dict
@@ -365,7 +365,7 @@ def get_servers_used_bricks_dict(mnode, servers):
else:
servers_used_bricks_dict[list2[0]] = [list2[1]]
- for key, value in servers_used_bricks_dict.items():
+ for key, value in list(servers_used_bricks_dict.items()):
value.sort()
return servers_used_bricks_dict
@@ -394,14 +394,14 @@ def get_servers_unused_bricks_dict(mnode, servers, servers_info):
dict1 = get_servers_bricks_dict(servers, servers_info)
dict2 = get_servers_used_bricks_dict(mnode, servers)
servers_unused_bricks_dict = OrderedDict()
- for key, value in dict1.items():
+ for key, value in list(dict1.items()):
if key in dict2:
unused_bricks = list(set(value) - set(dict2[key]))
servers_unused_bricks_dict[key] = unused_bricks
else:
servers_unused_bricks_dict[key] = value
- for key, value in servers_unused_bricks_dict.items():
+ for key, value in list(servers_unused_bricks_dict.items()):
value.sort()
return servers_unused_bricks_dict
@@ -436,7 +436,8 @@ def form_bricks_list(mnode, volname, number_of_bricks, servers, servers_info):
servers_unused_bricks_dict = get_servers_unused_bricks_dict(mnode, servers,
servers_info)
num_of_unused_bricks = 0
- for each_server_unused_bricks_list in servers_unused_bricks_dict.values():
+ for each_server_unused_bricks_list in list(
+ servers_unused_bricks_dict.values()):
num_of_unused_bricks = (num_of_unused_bricks +
len(each_server_unused_bricks_list))
@@ -451,9 +452,9 @@ def form_bricks_list(mnode, volname, number_of_bricks, servers, servers_info):
for num in range(brick_index, brick_index + number_of_bricks):
# current_server is the server from which brick path will be created
- current_server = servers_unused_bricks_dict.keys()[dict_index]
+ current_server = list(servers_unused_bricks_dict.keys())[dict_index]
current_server_unused_bricks_list = (
- servers_unused_bricks_dict.values()[dict_index])
+ list(servers_unused_bricks_dict.values())[dict_index])
brick_path = ''
if current_server_unused_bricks_list:
brick_path = ("%s:%s/%s_brick%s" %
@@ -462,7 +463,7 @@ def form_bricks_list(mnode, volname, number_of_bricks, servers, servers_info):
bricks_list.append(brick_path)
# Remove the added brick from the current_server_unused_bricks_list
- servers_unused_bricks_dict.values()[dict_index].pop(0)
+ list(servers_unused_bricks_dict.values())[dict_index].pop(0)
if dict_index < len(servers_unused_bricks_dict) - 1:
dict_index = dict_index + 1
@@ -486,7 +487,7 @@ def is_rhel6(servers):
results = g.run_parallel(servers, "cat /etc/redhat-release")
rc = True
- for server, ret_values in results.iteritems():
+ for server, ret_values in list(results.items()):
retcode, out, err = ret_values
if retcode != 0:
g.log.error("Unable to get the RHEL version on server %s" %
@@ -512,7 +513,7 @@ def is_rhel7(servers):
results = g.run_parallel(servers, "cat /etc/redhat-release")
rc = True
- for server, ret_values in results.iteritems():
+ for server, ret_values in list(results.items()):
retcode, out, err = ret_values
if retcode != 0:
g.log.error("Unable to get the RHEL version on server %s" %
@@ -569,7 +570,7 @@ def get_disk_usage(mnode, path, user="root"):
usage_info = dict()
keys = ['b_size', 'b_total', 'b_free', 'b_avail', 'i_total', 'i_free']
val = list(match.groups())
- info = dict(zip(keys, val))
+ info = dict(list(zip(keys, val)))
usage_info['total'] = ((int(info['b_total']) * int(info['b_size'])) /
ONE_GB_BYTES)
usage_info['free'] = ((int(info['b_free']) * int(info['b_size'])) /