diff options
Diffstat (limited to 'resources/libraries/python')
| -rw-r--r-- | resources/libraries/python/DUTSetup.py | 14 | ||||
| -rw-r--r-- | resources/libraries/python/VhostUser.py | 12 | ||||
| -rw-r--r-- | resources/libraries/python/VppCounters.py | 84 |
3 files changed, 106 insertions, 4 deletions
diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 7260292959..bccf108524 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -15,8 +15,7 @@ from robot.api import logger -from resources.libraries.python.topology import NodeType -from resources.libraries.python.topology import Topology +from resources.libraries.python.topology import NodeType, Topology from resources.libraries.python.ssh import SSH from resources.libraries.python.constants import Constants from resources.libraries.python.VatExecutor import VatExecutor @@ -50,6 +49,17 @@ class DUTSetup(object): vat.execute_script("show_version_verbose.vat", node, json_out=False) @staticmethod + def show_vpp_version_on_all_duts(nodes): + """Show VPP version verbose on all DUTs. + + :param nodes: VPP nodes + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + DUTSetup.vpp_show_version_verbose(node) + + @staticmethod def vpp_api_trace_save(node): """Run "api trace save" CLI command. diff --git a/resources/libraries/python/VhostUser.py b/resources/libraries/python/VhostUser.py index 385d0f24cc..680d4ae300 100644 --- a/resources/libraries/python/VhostUser.py +++ b/resources/libraries/python/VhostUser.py @@ -14,6 +14,7 @@ """Vhost-user interfaces library.""" from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal +from resources.libraries.python.topology import NodeType class VhostUser(object): @@ -86,3 +87,14 @@ class VhostUser(object): """ vat = VatExecutor() vat.execute_script("show_vhost.vat", node, json_out=False) + + @staticmethod + def show_vpp_vhost_on_all_duts(nodes): + """Show Vhost User on all DUTs. + + :param nodes: VPP nodes. + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VhostUser.vpp_show_vhost(node) diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py index 6b2265db27..8247a1e8ab 100644 --- a/resources/libraries/python/VppCounters.py +++ b/resources/libraries/python/VppCounters.py @@ -16,7 +16,6 @@ import time from robot.api import logger - from resources.libraries.python.topology import NodeType, Topology from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal @@ -61,7 +60,7 @@ class VppCounters(object): def vpp_show_errors_on_all_duts(nodes, verbose=False): """Show errors on all DUTs. - :param nodes: VPP nodes + :param nodes: VPP nodes. :param verbose: If True show verbose output. :type nodes: dict :type verbose: bool @@ -85,6 +84,17 @@ class VppCounters(object): vat.execute_script("show_runtime.vat", node, json_out=False) @staticmethod + def show_runtime_counters_on_all_duts(nodes): + """Clear VPP runtime counters on all DUTs. + + :param nodes: VPP nodes. + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VppCounters.vpp_show_runtime(node) + + @staticmethod def vpp_show_runtime_verbose(node): """Run "show runtime verbose" CLI command. @@ -115,6 +125,17 @@ class VppCounters(object): vat.execute_script("clear_runtime.vat", node, json_out=False) @staticmethod + def clear_runtime_counters_on_all_duts(nodes): + """Run "clear runtime" CLI command on all DUTs. + + :param nodes: VPP nodes. + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VppCounters.vpp_clear_runtime(node) + + @staticmethod def vpp_clear_interface_counters(node): """Clear interface counters on VPP node. @@ -126,6 +147,17 @@ class VppCounters(object): vat.script_should_have_passed() @staticmethod + def clear_interface_counters_on_all_duts(nodes): + """Clear interface counters on all DUTs. + + :param nodes: VPP nodes. + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VppCounters.vpp_clear_interface_counters(node) + + @staticmethod def vpp_clear_hardware_counters(node): """Clear interface hardware counters on VPP node. @@ -137,6 +169,17 @@ class VppCounters(object): vat.script_should_have_passed() @staticmethod + def clear_hardware_counters_on_all_duts(nodes): + """Clear hardware counters on all DUTs. + + :param nodes: VPP nodes. + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VppCounters.vpp_clear_hardware_counters(node) + + @staticmethod def vpp_clear_errors_counters(node): """Clear errors counters on VPP node. @@ -147,6 +190,17 @@ class VppCounters(object): vat.execute_script('clear_errors.vat', node) vat.script_should_have_passed() + @staticmethod + def clear_error_counters_on_all_duts(nodes): + """Clear VPP errors counters on all DUTs. + + :param nodes: VPP nodes. + :type nodes: dict + """ + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VppCounters.vpp_clear_errors_counters(node) + def vpp_dump_stats_table(self, node): """Dump stats table on VPP node. @@ -219,3 +273,29 @@ class VppCounters(object): logger.trace('{i} {v} counter not found.'.format(i=interface, v=version)) return 0 + + @staticmethod + def show_vpp_statistics(node): + """Show [error, hardware, interface] stats. + + :param node: VPP node. + :type node: dict + """ + VppCounters.vpp_show_errors(node) + VppCounters.vpp_show_hardware_detail(node) + VppCounters.vpp_show_runtime(node) + + @staticmethod + def show_statistics_on_all_duts(nodes, sleeptime=5): + """Show VPP statistics on all DUTs. + + :param nodes: VPP nodes. + :type nodes: dict + :param sleeptime: Time to wait for traffic to arrive back to TG. + :type sleeptime: int + """ + logger.trace('Waiting for statistics to be collected') + time.sleep(sleeptime) + for node in nodes.values(): + if node['type'] == NodeType.DUT: + VppCounters.show_vpp_statistics(node) |