summaryrefslogtreecommitdiffstats
path: root/libs/utils/glusterutils.py
diff options
context:
space:
mode:
Diffstat (limited to 'libs/utils/glusterutils.py')
-rw-r--r--libs/utils/glusterutils.py38
1 files changed, 19 insertions, 19 deletions
diff --git a/libs/utils/glusterutils.py b/libs/utils/glusterutils.py
index f55d260..afd5db0 100644
--- a/libs/utils/glusterutils.py
+++ b/libs/utils/glusterutils.py
@@ -45,7 +45,7 @@ def glusterd_start(serverkey, force=False):
restart glusterd process"""
command = commands_to_execute.pop()
output = host_connection.executecommand(command)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
if not return_status:
if force:
return_status = glusterd_restart(serverkey)
@@ -57,7 +57,7 @@ def glusterd_start(serverkey, force=False):
output = host_connection.executecommand(command)
if output["exitstatus"]:
logger.error("Unable to start glusterd")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
return return_status
else:
if output["stdoutdata"]:
@@ -65,7 +65,7 @@ def glusterd_start(serverkey, force=False):
gluster_path = output["stdoutdata"][0].strip("\n")
else:
logger.error("Unable to find gluster path")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
return return_status
if gluster_path:
@@ -76,7 +76,7 @@ def glusterd_start(serverkey, force=False):
logger.debug('%s: Executing Command: %s'
%(serverkey, gluster_path))
output = host_connection.executecommand(gluster_path)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return return_status
@@ -114,7 +114,7 @@ def glusterd_stop(serverkey):
gluster_pid_list = []
output = host_connection.executecommand("pidof glusterd")
- return_status = atfutils.assert_failure(**output)
+ return_status = atfutils.assert_failure(output['exitstatus'])
if not return_status:
return return_status
@@ -127,7 +127,7 @@ def glusterd_stop(serverkey):
command = base_command + pid
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
if return_status:
@@ -181,7 +181,7 @@ def glusterd_remove_dir(serverkey):
command = ' '.join([base_command, glusterd_dir])
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = server_connection.executecommand(command)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return 0
@@ -230,7 +230,7 @@ def glusterd_remove_logs(serverkey):
command = ' '.join([base_command, path])
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = server_connection.executecommand(command)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
@@ -268,7 +268,7 @@ def volume_delete(serverkey):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return return_status
@@ -309,7 +309,7 @@ def volume_create(serverkey):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
if return_status:
if str(output["stdoutdata"]).rfind("already exists"):
return_status = 0
@@ -341,7 +341,7 @@ def volume_start(serverkey, force=False):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
if return_status:
if str(output["stdoutdata"]).rfind("already started"):
return_status = 0
@@ -373,7 +373,7 @@ def volume_stop(serverkey, force=False):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return return_status
@@ -411,7 +411,7 @@ def volume_addbrick(serverkey, *bricks):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
if not return_status:
if env.addBricksToVolume(*bricks):
return 1
@@ -450,7 +450,7 @@ def volume_replacebrick(serverkey, brick, newbrick, operation):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
if not return_status:
if env.replaceBrickInVolume(brick, newbrick):
return 1
@@ -484,7 +484,7 @@ def volume_set(serverkey, key, value):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return return_status
@@ -510,7 +510,7 @@ def volume_reset(serverkey):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = host_connection.executecommand(command, commandInput="y\n")
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return return_status
@@ -543,7 +543,7 @@ def peer_probe(fromserverkey):
logger.debug('%s: Executing Command: %s' % (fromserverkey, command))
output = host_connection.executecommand(command)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return return_status
@@ -611,7 +611,7 @@ def umount_device(serverkey, device):
command = base_command + mountpoint
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = server_connection.executecommand(command)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
if return_status:
@@ -650,7 +650,7 @@ def mount_exportdir(serverkey, device, fstype, options, dirpath):
logger.debug('%s: Executing Command: %s' % (serverkey, command))
output = server_connection.executecommand(command)
- return_status = atfutils.assert_success(**output)
+ return_status = atfutils.assert_success(output['exitstatus'])
atfutils.print_stdout(output['stdoutdata'])
atfutils.print_stderr(output['stderrdata'])
return return_status
generated by cgit (git 2.34.1) at 2024-04-18 03:57:34 +0000