summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glustolibs-gluster/glustolibs/gluster/gluster_base_class.py2
-rw-r--r--glustolibs-gluster/glustolibs/gluster/gluster_init.py8
-rwxr-xr-xglustolibs-gluster/glustolibs/gluster/quota_libs.py2
-rwxr-xr-xglustolibs-misc/glustolibs/misc/misc_libs.py2
-rw-r--r--tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py4
5 files changed, 9 insertions, 9 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
index 97a9fe365..b475eddd1 100644
--- a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
+++ b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
@@ -856,7 +856,7 @@ class GlusterBlockBaseClass(GlusterBaseClass):
# Log the block_info_dict
g.log.info("Logging Block Info:")
- for key, value in cls.block_info_dict.iteritems():
+ for key, value in cls.block_info_dict.items():
g.log.info("Glusto block info: %s\n %s" % (key, value))
return True
diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_init.py b/glustolibs-gluster/glustolibs/gluster/gluster_init.py
index e59d36fa1..10812c289 100644
--- a/glustolibs-gluster/glustolibs/gluster/gluster_init.py
+++ b/glustolibs-gluster/glustolibs/gluster/gluster_init.py
@@ -40,7 +40,7 @@ def start_glusterd(servers):
results = g.run_parallel(servers, cmd)
_rc = True
- for server, ret_values in results.iteritems():
+ for server, ret_values in results.items():
retcode, _, _ = ret_values
if retcode != 0:
g.log.error("Unable to start glusterd on server %s", server)
@@ -69,7 +69,7 @@ def stop_glusterd(servers):
results = g.run_parallel(servers, cmd)
_rc = True
- for server, ret_values in results.iteritems():
+ for server, ret_values in results.items():
retcode, _, _ = ret_values
if retcode != 0:
g.log.error("Unable to stop glusterd on server %s", server)
@@ -98,7 +98,7 @@ def restart_glusterd(servers):
results = g.run_parallel(servers, cmd)
_rc = True
- for server, ret_values in results.iteritems():
+ for server, ret_values in results.items():
retcode, _, _ = ret_values
if retcode != 0:
g.log.error("Unable to restart glusterd on server %s", server)
@@ -131,7 +131,7 @@ def is_glusterd_running(servers):
cmd2_results = g.run_parallel(servers, cmd2)
_rc = 0
- for server, ret_values in cmd1_results.iteritems():
+ for server, ret_values in cmd1_results.items():
retcode, _, _ = ret_values
if retcode != 0:
g.log.error("glusterd is not running on the server %s", server)
diff --git a/glustolibs-gluster/glustolibs/gluster/quota_libs.py b/glustolibs-gluster/glustolibs/gluster/quota_libs.py
index 5da4d8698..279b90203 100755
--- a/glustolibs-gluster/glustolibs/gluster/quota_libs.py
+++ b/glustolibs-gluster/glustolibs/gluster/quota_libs.py
@@ -54,7 +54,7 @@ def quota_validate(mnode, volname, path, **kwargs):
listinfo = quotalist[path]
ret = True
- for key, value in kwargs.iteritems():
+ for key, value in kwargs.items():
if key and listinfo[key] != value:
g.log.error("%s = %s does not match with expected value %s",
key, str(listinfo[key]), str(value))
diff --git a/glustolibs-misc/glustolibs/misc/misc_libs.py b/glustolibs-misc/glustolibs/misc/misc_libs.py
index 7b8010cd9..b66de5efe 100755
--- a/glustolibs-misc/glustolibs/misc/misc_libs.py
+++ b/glustolibs-misc/glustolibs/misc/misc_libs.py
@@ -557,7 +557,7 @@ def drop_caches(hosts):
cmd = "echo 3 > /proc/sys/vm/drop_caches"
results = g.run_parallel(hosts, cmd)
_rc = True
- for host, ret_values in results.iteritems():
+ for host, ret_values in results.items():
retcode, _, _ = ret_values
if retcode != 0:
g.log.error("Unable to drop cache on host %s", host)
diff --git a/tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py b/tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py
index e9f38b3f9..c31041703 100644
--- a/tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py
+++ b/tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py
@@ -339,8 +339,8 @@ class ClientSideQuorumTestsMultipleVols(GlusterBaseClass):
temp_dict))
# create files on all volumes and check for result
- for volname, file_and_mountpoint in \
- file_to_delete_to_mountpoint_dict.iteritems():
+ for volname, file_and_mountpoint in (
+ file_to_delete_to_mountpoint_dict.items()):
filename, mountpoint = file_and_mountpoint
# check for ROFS error for read-only file system for