VAT-to-PAPI: Fix HTTP/TCP tests

[csit.git] / resources / libraries / python / VppCounters.py

diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py
index dd15535..f847ca6 100644 (file)
--- a/resources/libraries/python/VppCounters.py
+++ b/resources/libraries/python/VppCounters.py
@@ -19,6 +19,7 @@ from pprint import pformat
 
 from robot.api import logger
 from resources.libraries.python.PapiExecutor import PapiExecutor
+from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 from resources.libraries.python.topology import NodeType, Topology
 
 
@@ -46,7 +47,7 @@ class VppCounters(object):
         :param node: Node to run command on.
         :type node: dict
         """
-        PapiExecutor.run_cli_cmd(node, 'show errors')
+        PapiSocketExecutor.run_cli_cmd(node, 'show errors')
 
     @staticmethod
     def vpp_show_errors_verbose(node):
@@ -55,7 +56,7 @@ class VppCounters(object):
         :param node: Node to run command on.
         :type node: dict
         """
-        PapiExecutor.run_cli_cmd(node, 'show errors verbose')
+        PapiSocketExecutor.run_cli_cmd(node, 'show errors verbose')
 
     @staticmethod
     def vpp_show_errors_on_all_duts(nodes, verbose=False):
@@ -155,13 +156,25 @@ class VppCounters(object):
                 VppCounters.vpp_show_runtime(node)
 
     @staticmethod
-    def vpp_show_hardware_detail(node):
-        """Run "show hardware-interfaces detail" debug CLI command.
+    def vpp_show_hardware_verbose(node):
+        """Run "show hardware-interfaces verbose" debug CLI command.
 
         :param node: Node to run command on.
         :type node: dict
         """
-        PapiExecutor.run_cli_cmd(node, 'show hardware detail')
+        PapiSocketExecutor.run_cli_cmd(node, 'show hardware verbose')
+
+    @staticmethod
+    def vpp_show_memory(node):
+        """Run "show memory" debug CLI command.
+
+        Currently, every flag is hardcoded, giving the longest output.
+
+        :param node: Node to run command on.
+        :type node: dict
+        """
+        PapiSocketExecutor.run_cli_cmd(
+            node, 'show memory verbose api-segment stats-segment main-heap')
 
     @staticmethod
     def vpp_clear_runtime(node):
@@ -172,7 +185,7 @@ class VppCounters(object):
         :returns: Verified data from PAPI response.
         :rtype: dict
         """
-        return PapiExecutor.run_cli_cmd(node, 'clear runtime', log=False)
+        return PapiSocketExecutor.run_cli_cmd(node, 'clear runtime', log=False)
 
     @staticmethod
     def clear_runtime_counters_on_all_duts(nodes):
@@ -194,7 +207,8 @@ class VppCounters(object):
         :returns: Verified data from PAPI response.
         :rtype: dict
         """
-        return PapiExecutor.run_cli_cmd(node, 'clear interfaces', log=False)
+        return PapiSocketExecutor.run_cli_cmd(
+            node, 'clear interfaces', log=False)
 
     @staticmethod
     def clear_interface_counters_on_all_duts(nodes):
@@ -216,7 +230,7 @@ class VppCounters(object):
         :returns: Verified data from PAPI response.
         :rtype: dict
         """
-        return PapiExecutor.run_cli_cmd(node, 'clear hardware', log=False)
+        return PapiSocketExecutor.run_cli_cmd(node, 'clear hardware', log=False)
 
     @staticmethod
     def clear_hardware_counters_on_all_duts(nodes):
@@ -238,7 +252,7 @@ class VppCounters(object):
         :returns: Verified data from PAPI response.
         :rtype: dict
         """
-        return PapiExecutor.run_cli_cmd(node, 'clear errors', log=False)
+        return PapiSocketExecutor.run_cli_cmd(node, 'clear errors', log=False)
 
     @staticmethod
     def clear_error_counters_on_all_duts(nodes):
@@ -314,8 +328,9 @@ class VppCounters(object):
         :type node: dict
         """
         VppCounters.vpp_show_errors(node)
-        VppCounters.vpp_show_hardware_detail(node)
+        VppCounters.vpp_show_hardware_verbose(node)
         VppCounters.vpp_show_runtime(node)
+        VppCounters.vpp_show_memory(node)
 
     @staticmethod
     def show_statistics_on_all_duts(nodes, sleeptime=5):