diff options
| -rw-r--r-- | resources/libraries/python/Trace.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/resources/libraries/python/Trace.py b/resources/libraries/python/Trace.py index 10a55ce140..6e3ac2a449 100644 --- 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) 2019 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,7 +13,7 @@ """Packet trace library.""" -from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal +from resources.libraries.python.PapiExecutor import PapiExecutor from resources.libraries.python.topology import NodeType @@ -26,25 +26,24 @@ class Trace(object): :param nodes: Nodes from which the packet trace will be displayed. :param maximum: Maximum number of packet traces to be displayed. - :type nodes: list + :type nodes: dict :type maximum: int """ maximum = "max {count}".format(count=maximum) if maximum is not None\ else "" + for node in nodes.values(): if node['type'] == NodeType.DUT: - with VatTerminal(node, json_param=False) as vat: - vat.vat_terminal_exec_cmd_from_template( - 'show_trace.vat', maximum=maximum) + PapiExecutor.run_cli_cmd(node, cmd="show trace {max}". + format(max=maximum)) @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: list + :type nodes: dict """ for node in nodes.values(): if node['type'] == NodeType.DUT: - vat = VatExecutor() - vat.execute_script("clear_trace.vat", node, json_out=False) + PapiExecutor.run_cli_cmd(node, cmd="clear trace") |