diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2019-12-20 22:46:51 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2020-01-15 07:01:56 +0000 |
commit | 2da2aa12260143bc513b4dff5e2b2ef6755172ab (patch) | |
tree | 8bbd4b177bc7e12cd942b7a91a4af8641af24935 /resources/libraries/python/DUTSetup.py | |
parent | 6ae8614cf1459f977508f9f4ba3548ac0a16b231 (diff) |
Hoststack perf infrastructure refactoring
- DUT only topology (hoststack test
apps are co-located with vpp)
- Make vpp app specific keywords generic
where applicable
- Add IP4 Prefix to topology file
- Support running wrk in linux namespace
- Refactor namespace cleanup
- Remove redundant namespace creation code
- Refactor test/keyword dirs: tcp -> hoststack
- Add hoststack utility keywords
- Refactor wrk suite setup/teardown
- Update tests with recent perf infra changes
Change-Id: Ia1cf07978d579393eef94923819a87c8c1f36f34
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'resources/libraries/python/DUTSetup.py')
-rw-r--r-- | resources/libraries/python/DUTSetup.py | 82 |
1 files changed, 66 insertions, 16 deletions
diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index d0da4645d2..431ccfb8ae 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -13,10 +13,11 @@ """DUT setup library.""" +from time import sleep from robot.api import logger from resources.libraries.python.Constants import Constants -from resources.libraries.python.ssh import SSH, exec_cmd_no_error +from resources.libraries.python.ssh import SSH, exec_cmd, exec_cmd_no_error from resources.libraries.python.topology import NodeType, Topology @@ -157,11 +158,62 @@ class DUTSetup: DUTSetup.stop_service(node, service) @staticmethod - def get_vpp_pid(node): - """Get PID of running VPP process. + def kill_program(node, program, namespace=None): + """Kill program on the specified topology node. + + :param node: Topology node. + :param program: Program name. + :param namespace: Namespace program is running in. + :type node: dict + :type program: str + :type namespace: str + """ + host = node[u"host"] + cmd_timeout = 5 + if namespace in (None, u"default"): + shell_cmd = u"sh -c" + else: + shell_cmd = f"ip netns exec {namespace} sh -c" + + pgrep_cmd = f"{shell_cmd} \'pgrep {program}\'" + ret_code, _, _ = exec_cmd(node, pgrep_cmd, timeout=cmd_timeout, + sudo=True) + if ret_code == 0: + logger.trace(f"{program} is not running on {host}") + return + ret_code, _, _ = exec_cmd(node, f"{shell_cmd} \'pkill {program}\'", + timeout=cmd_timeout, sudo=True) + for attempt in range(5): + ret_code, _, _ = exec_cmd(node, pgrep_cmd, timeout=cmd_timeout, + sudo=True) + if ret_code != 0: + logger.trace(f"Attempt {attempt}: {program} is dead on {host}") + return + sleep(1) + logger.trace(f"SIGKILLing {program} on {host}") + ret_code, _, _ = exec_cmd(node, f"{shell_cmd} \'pkill -9 {program}\'", + timeout=cmd_timeout, sudo=True) + + @staticmethod + def verify_program_installed(node, program): + """Verify that program is installed on the specified topology node. + + :param node: Topology node. + :param program: Program name. + :type node: dict + :type program: str + """ + cmd = f"command -v {program}" + exec_cmd_no_error(node, cmd, message=f"{program} is not installed") + + @staticmethod + def get_pid(node, process): + """Get PID of running process. :param node: DUT node. + :param process: process name. :type node: dict + :type process: str :returns: PID :rtype: int :raises RuntimeError: If it is not possible to get the PID. @@ -171,26 +223,24 @@ class DUTSetup: retval = None for i in range(3): - logger.trace(f"Try {i}: Get VPP PID") - ret_code, stdout, stderr = ssh.exec_command(u"pidof vpp") + logger.trace(f"Try {i}: Get {process} PID") + ret_code, stdout, stderr = ssh.exec_command(f"pidof {process}") if int(ret_code): raise RuntimeError( - f"Not possible to get PID of VPP process on node: " + f"Not possible to get PID of {process} process on node: " f"{node[u'host']}\n {stdout + stderr}" ) pid_list = stdout.split() if len(pid_list) == 1: - retval = int(stdout) - elif not pid_list: - logger.debug(f"No VPP PID found on node {node[u'host']}") + return [int(stdout)] + if not pid_list: + logger.debug(f"No {process} PID found on node {node[u'host']}") continue - else: - logger.debug( - f"More then one VPP PID found on node {node[u'host']}" - ) - retval = [int(pid) for pid in pid_list] + logger.debug(f"More than one {process} PID found " \ + f"on node {node[u'host']}") + retval = [int(pid) for pid in pid_list] return retval @@ -206,7 +256,7 @@ class DUTSetup: pids = dict() for node in nodes.values(): if node[u"type"] == NodeType.DUT: - pids[node[u"host"]] = DUTSetup.get_vpp_pid(node) + pids[node[u"host"]] = DUTSetup.get_pid(node, u"vpp") return pids @staticmethod |