X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrace.py;h=f54ae1060ec5ea04bae372d2642711c208cb4e40;hp=6e3ac2a449b37dda59ec4d78e8bf8ed8738688f0;hb=6da5a6920171682bd5bf6a77517bedfef91cbd0e;hpb=a5df75f5c9739ce84814d999ab3efc3142c47086

diff --git a/resources/libraries/python/Trace.py b/resources/libraries/python/Trace.py
index 6e3ac2a449..f54ae1060e 100644
--- a/resources/libraries/python/Trace.py
+++ b/resources/libraries/python/Trace.py
@@ -1,4 +1,4 @@
-# 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:
@@ -13,11 +13,11 @@
 
 """Packet trace library."""
 
-from resources.libraries.python.PapiExecutor import PapiExecutor
+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
@@ -29,13 +29,11 @@ class Trace(object):
         :type nodes: dict
         :type maximum: int
         """
-        maximum = "max {count}".format(count=maximum) if maximum is not None\
-            else ""
-
+        max_opt = f"" if maximum is None else f" max {maximum}"
         for node in nodes.values():
-            if node['type'] == NodeType.DUT:
-                PapiExecutor.run_cli_cmd(node, cmd="show trace {max}".
-                                         format(max=maximum))
+            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):
@@ -45,5 +43,6 @@ class Trace(object):
         :type nodes: dict
         """
         for node in nodes.values():
-            if node['type'] == NodeType.DUT:
-                PapiExecutor.run_cli_cmd(node, cmd="clear trace")
+            if node[u"type"] == NodeType.DUT:
+                PapiSocketExecutor.run_cli_cmd_on_all_sockets(
+                    node, u"clear trace")