X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVppCounters.py;h=6b2265db2770ac5f5c7a1732846848a5792c0008;hp=4bb7d63135a56baa6de20213f04901e7d084979f;hb=21702fb09c470511cc3ed7b34ca5ab0f8d30b68f;hpb=180d17939d123c04bf142cedf02daa325e3f4fa6 diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py index 4bb7d63135..6b2265db27 100644 --- a/resources/libraries/python/VppCounters.py +++ b/resources/libraries/python/VppCounters.py @@ -57,6 +57,23 @@ class VppCounters(object): vat = VatExecutor() vat.execute_script("show_errors_verbose.vat", node, json_out=False) + @staticmethod + def vpp_show_errors_on_all_duts(nodes, verbose=False): + """Show errors on all DUTs. + + :param nodes: VPP nodes + :param verbose: If True show verbose output. + :type nodes: dict + :type verbose: bool + """ + + for node in nodes.values(): + if node['type'] == NodeType.DUT: + if verbose: + VppCounters.vpp_show_errors_verbose(node) + else: + VppCounters.vpp_show_errors(node) + @staticmethod def vpp_show_runtime(node): """Run "show runtime" CLI command. @@ -108,12 +125,34 @@ class VppCounters(object): vat.execute_script('clear_interface.vat', node) vat.script_should_have_passed() + @staticmethod + def vpp_clear_hardware_counters(node): + """Clear interface hardware counters on VPP node. + + :param node: Node to clear hardware counters on. + :type node: dict + """ + vat = VatExecutor() + vat.execute_script('clear_hardware.vat', node) + vat.script_should_have_passed() + + @staticmethod + def vpp_clear_errors_counters(node): + """Clear errors counters on VPP node. + + :param node: Node to clear errors counters on. + :type node: dict + """ + vat = VatExecutor() + vat.execute_script('clear_errors.vat', node) + vat.script_should_have_passed() + def vpp_dump_stats_table(self, node): """Dump stats table on VPP node. :param node: Node to dump stats table on. :type node: dict - :return: Stats table. + :returns: Stats table. """ with VatTerminal(node) as vat: vat.vat_terminal_exec_cmd('want_stats enable') @@ -127,9 +166,27 @@ class VppCounters(object): return None def vpp_get_ipv4_interface_counter(self, node, interface): + """ + + :param node: Node to get interface IPv4 counter on. + :param interface: Interface name. + :type node: dict + :type interface: str + :returns: Interface IPv4 counter. + :rtype: int + """ return self.vpp_get_ipv46_interface_counter(node, interface, False) def vpp_get_ipv6_interface_counter(self, node, interface): + """ + + :param node: Node to get interface IPv6 counter on. + :param interface: Interface name. + :type node: dict + :type interface: str + :returns: Interface IPv6 counter. + :rtype: int + """ return self.vpp_get_ipv46_interface_counter(node, interface, True) def vpp_get_ipv46_interface_counter(self, node, interface, is_ipv6=True): @@ -141,7 +198,7 @@ class VppCounters(object): :type node: dict :type interface: str :type is_ipv6: bool - :return: Interface IPv4/IPv6 counter. + :returns: Interface IPv4/IPv6 counter. :rtype: int """ version = 'ip6' if is_ipv6 else 'ip4'