-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
f"stats runtime ({node[u'host']} - {socket}):\n"
f"{pformat(runtime_nz)}"
)
+ # Run also the CLI command, the above sometimes misses some info.
+ PapiSocketExecutor.run_cli_cmd_on_all_sockets(node, u"show runtime")
@staticmethod
- def vpp_show_runtime_counters_on_all_duts(nodes):
+ def vpp_show_runtime_on_all_duts(nodes):
"""Clear VPP runtime counters on all DUTs.
:param nodes: VPP nodes.
VppCounters.vpp_show_runtime(node)
@staticmethod
- def vpp_show_hardware_verbose(node):
- """Run "show hardware-interfaces verbose" debug CLI command.
+ def vpp_show_hardware(node):
+ """Run "show hardware" debug CLI command.
:param node: Node to run command on.
:type node: dict
:param node: Node to run command on.
:type node: dict
"""
- PapiSocketExecutor.run_cli_cmd(
+ PapiSocketExecutor.run_cli_cmd_on_all_sockets(
node, u"show memory verbose api-segment stats-segment main-heap"
)
+ @staticmethod
+ def vpp_show_memory_on_all_duts(nodes):
+ """Run "show memory" on all DUTs.
+
+ :param nodes: VPP nodes.
+ :type nodes: dict
+ """
+ for node in nodes.values():
+ if node[u"type"] == NodeType.DUT:
+ VppCounters.vpp_show_memory(node)
+
@staticmethod
def vpp_clear_runtime(node):
"""Run "clear runtime" CLI command.
)
@staticmethod
- def vpp_clear_runtime_counters_on_all_duts(nodes):
+ def vpp_clear_runtime_on_all_duts(nodes):
"""Run "clear runtime" CLI command on all DUTs.
:param nodes: VPP nodes.
VppCounters.vpp_clear_runtime(node)
@staticmethod
- def vpp_clear_hardware_counters(node):
+ def vpp_clear_hardware(node):
"""Run "clear hardware" CLI command.
:param node: Node to run command on.
)
@staticmethod
- def vpp_clear_hardware_counters_on_all_duts(nodes):
- """Clear hardware counters on all DUTs.
+ def vpp_clear_hardware_on_all_duts(nodes):
+ """Clear hardware on all DUTs.
:param nodes: VPP nodes.
:type nodes: dict
"""
for node in nodes.values():
if node[u"type"] == NodeType.DUT:
- VppCounters.vpp_clear_hardware_counters(node)
+ VppCounters.vpp_clear_hardware(node)
@staticmethod
- def vpp_clear_errors_counters(node):
+ def vpp_clear_errors(node):
"""Run "clear errors" CLI command.
:param node: Node to run command on.
)
@staticmethod
- def vpp_clear_error_counters_on_all_duts(nodes):
+ def vpp_clear_errors_on_all_duts(nodes):
"""Clear VPP errors counters on all DUTs.
:param nodes: VPP nodes.
"""
for node in nodes.values():
if node[u"type"] == NodeType.DUT:
- VppCounters.vpp_clear_errors_counters(node)
+ VppCounters.vpp_clear_errors(node)
@staticmethod
def show_vpp_statistics(node):
- """Show [error, hardware, interface] stats.
+ """Show [errors, hardware] stats.
:param node: VPP node.
:type node: dict
"""
VppCounters.vpp_show_errors(node)
- VppCounters.vpp_show_hardware_verbose(node)
- VppCounters.vpp_show_runtime(node)
- VppCounters.vpp_show_memory(node)
+ VppCounters.vpp_show_hardware(node)
@staticmethod
def show_statistics_on_all_duts(nodes):
@staticmethod
def clear_vpp_statistics(node):
- """Clear [error, hardware, interface] stats.
+ """Clear [errors, hardware] stats.
:param node: VPP node.
:type node: dict
"""
- VppCounters.vpp_clear_errors_counters(node)
- VppCounters.vpp_clear_hardware_counters(node)
- VppCounters.vpp_clear_runtime(node)
+ VppCounters.vpp_clear_errors(node)
+ VppCounters.vpp_clear_hardware(node)
@staticmethod
def clear_statistics_on_all_duts(nodes):