Line length: Fix recent merges

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

diff --git a/resources/libraries/python/Trace.py b/resources/libraries/python/Trace.py
index 8168b90..f54ae10 100644 (file)
--- a/resources/libraries/python/Trace.py
+++ b/resources/libraries/python/Trace.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 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:
@@ -11,14 +11,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from resources.libraries.python.VatExecutor import VatExecutor
+"""Packet trace library."""
+
+from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 from resources.libraries.python.topology import NodeType
 
-class Trace(object):
+
+class Trace:
+    """This class provides methods to manipulate the VPP packet trace."""
 
     @staticmethod
-    def show_packet_trace_on_all_duts(nodes):
+    def show_packet_trace_on_all_duts(nodes, maximum=None):
+        """Show VPP packet trace.
+
+        :param nodes: Nodes from which the packet trace will be displayed.
+        :param maximum: Maximum number of packet traces to be displayed.
+        :type nodes: dict
+        :type maximum: int
+        """
+        max_opt = f"" if maximum is None else f" max {maximum}"
+        for node in nodes.values():
+            if node[u"type"] == NodeType.DUT:
+                PapiSocketExecutor.run_cli_cmd_on_all_sockets(
+                    node, f"show trace{max_opt}")
+
+    @staticmethod
+    def clear_packet_trace_on_all_duts(nodes):
+        """Clear VPP packet trace.
+
+        :param nodes: Nodes where the packet trace will be cleared.
+        :type nodes: dict
+        """
         for node in nodes.values():
-            if node['type'] == NodeType.DUT:
-                vat = VatExecutor()
-                vat.execute_script("show_trace.vat", node, json_out=False)
+            if node[u"type"] == NodeType.DUT:
+                PapiSocketExecutor.run_cli_cmd_on_all_sockets(
+                    node, u"clear trace")