Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: use len parameter name in prefix structure in ip_route_add_del
[csit.git]
/
resources
/
libraries
/
python
/
Trace.py
diff --git
a/resources/libraries/python/Trace.py
b/resources/libraries/python/Trace.py
index
10a55ce
..
6e3ac2a
100644
(file)
--- a/
resources/libraries/python/Trace.py
+++ b/
resources/libraries/python/Trace.py
@@
-1,4
+1,4
@@
-# Copyright (c) 201
6
Cisco and/or its affiliates.
+# Copyright (c) 201
9
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:
# 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."""
"""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
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.
:param nodes: Nodes from which the packet trace will be displayed.
:param maximum: Maximum number of packet traces to be displayed.
- :type nodes:
lis
t
+ :type nodes:
dic
t
:type maximum: int
"""
maximum = "max {count}".format(count=maximum) if maximum is not None\
else ""
: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:
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.
@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:
lis
t
+ :type nodes:
dic
t
"""
for node in nodes.values():
if node['type'] == NodeType.DUT:
"""
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")