X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVppCounters.py;h=b2c3b01c60d4435cfd7bcbb556b802bc2c924636;hp=6b2265db2770ac5f5c7a1732846848a5792c0008;hb=4b84a3d0620c827aa9bc9c36776af50a88a180f4;hpb=cf561a6e3d4c4fbd78ab6c9d0a9aa817bb3300fc diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py index 6b2265db27..b2c3b01c60 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 @@ -27,16 +26,6 @@ class VppCounters(object): def __init__(self): self._stats_table = None - def vpp_nodes_clear_interface_counters(self, nodes): - """Clear interface counters on all VPP nodes in topology. - - :param nodes: Nodes in topology. - :type nodes: dict - """ - for node in nodes.values(): - if node['type'] == NodeType.DUT: - self.vpp_clear_interface_counters(node) - @staticmethod def vpp_show_errors(node): """Run "show errors" debug CLI command. @@ -46,6 +35,7 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("show_errors.vat", node, json_out=False) + vat.script_should_have_passed() @staticmethod def vpp_show_errors_verbose(node): @@ -56,12 +46,13 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("show_errors_verbose.vat", node, json_out=False) + vat.script_should_have_passed() @staticmethod 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 @@ -83,6 +74,18 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("show_runtime.vat", node, json_out=False) + vat.script_should_have_passed() + + @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): @@ -93,6 +96,7 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("show_runtime_verbose.vat", node, json_out=False) + vat.script_should_have_passed() @staticmethod def vpp_show_hardware_detail(node): @@ -103,6 +107,7 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("show_hardware_detail.vat", node, json_out=False) + vat.script_should_have_passed() @staticmethod def vpp_clear_runtime(node): @@ -113,6 +118,18 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("clear_runtime.vat", node, json_out=False) + vat.script_should_have_passed() + + @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): @@ -125,6 +142,17 @@ class VppCounters(object): vat.execute_script('clear_interface.vat', node) 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. @@ -136,6 +164,17 @@ class VppCounters(object): vat.execute_script('clear_hardware.vat', node) 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 +186,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. @@ -158,8 +208,7 @@ class VppCounters(object): vat.vat_terminal_exec_cmd('want_stats enable') for _ in range(0, 12): stats_table = vat.vat_terminal_exec_cmd('dump_stats_table') - if_counters = stats_table['interface_counters'] - if len(if_counters) > 0: + if stats_table['interface_counters']: self._stats_table = stats_table return stats_table time.sleep(1) @@ -209,13 +258,39 @@ class VppCounters(object): return 0 if_counters = self._stats_table.get('interface_counters') - if if_counters is None or len(if_counters) == 0: + if not if_counters: logger.trace('No interface counters.') return 0 for counter in if_counters: if counter['vnet_counter_type'] == version: data = counter['data'] return data[if_index] - logger.trace('{i} {v} counter not found.'.format(i=interface, - v=version)) + 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)