diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/utils/clientutils.py | 2 | ||||
| -rw-r--r-- | libs/utils/serverutils.py | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libs/utils/clientutils.py b/libs/utils/clientutils.py index 9003c75..4de2998 100644 --- a/libs/utils/clientutils.py +++ b/libs/utils/clientutils.py @@ -176,7 +176,7 @@ def execute_on_mount(mountkey, command, commandInput=None): mountdir = mount_obj.dir command = "cd " + mountdir + " ;" + command output = hostutils.execute_command(clientkey, command, commandInput) - return output['exitstatus'] + return output __all__ = ['execute_on_mount', 'umount', diff --git a/libs/utils/serverutils.py b/libs/utils/serverutils.py index 226f35e..068dd17 100644 --- a/libs/utils/serverutils.py +++ b/libs/utils/serverutils.py @@ -7,6 +7,11 @@ from atfglobals import GlobalObj def execute_on_brick(brickkey, command, commandInput=None): """ """ + output = {} + output["exitstatus"] = None + output["stdoutdata"] = None + output["stderrdata"] = None + logger = GlobalObj.getLoggerObj() env = GlobalObj.getTestenvObj() @@ -14,19 +19,19 @@ def execute_on_brick(brickkey, command, commandInput=None): if not raw_brick_obj: logger.error("InValid Brick. %s not defined in TestEnvironment" % brickkey) - return 1 + return output serverkey = re.split("\.", raw_brick_obj.hostname, maxsplit=1)[0] brick_obj = env.getBrick(brickkey) if not brick_obj: logger.error("InValid Brick. %s not defined in TestEnvironment" % brickkey) - return 1 + return output exportdirpath = brick_obj.path command = "cd " + exportdirpath + ";" + command output = hostutils.execute_command(serverkey, command, commandInput) - return output['exitstatus'] + return output __all__ = ['execute_on_brick'] |