aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-10-02 08:15:03 +0000
committerPeter Mikus <pmikus@cisco.com>2018-10-02 08:38:50 +0000
commit5729b2d4248c03eae6d9ed6a6e4aa27cf6db0291 (patch)
treed2d55d6905ec602ce8837a6613e25894aaa51c91
parent9db603df1076b5ee56ef6326fd0e396b166ed5b1 (diff)
CSIT-1326 VLIB: barrier sync elog tracing
- API changed. Change-Id: If70e1a930aa14b129ad38ef544cff32ad5a08cdd Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/python/VPPUtil.py14
-rw-r--r--resources/libraries/robot/performance/performance_utils.robot2
-rw-r--r--resources/templates/vat/elog_trace_api_cli_barrier.vat1
-rw-r--r--resources/templates/vat/test_threads_barrier_elog.vat1
4 files changed, 9 insertions, 9 deletions
diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py
index f6b3afae28..9d2a2b9dd3 100644
--- a/resources/libraries/python/VPPUtil.py
+++ b/resources/libraries/python/VPPUtil.py
@@ -213,26 +213,26 @@ class VPPUtil(object):
VPPUtil.vpp_enable_traces_on_dut(node)
@staticmethod
- def vpp_enable_barrier_traces_on_dut(node):
- """Enable vpp barrier traces on the DUT node.
+ def vpp_enable_elog_traces_on_dut(node):
+ """Enable API/CLI/Barrier traces on the DUT node.
:param node: DUT node to set up.
:type node: dict
"""
vat = VatExecutor()
- vat.execute_script("test_threads_barrier_elog.vat", node,
+ vat.execute_script("elog_trace_api_cli_barrier.vat", node,
json_out=False)
@staticmethod
- def vpp_enable_barrier_traces_on_all_duts(nodes):
- """Enable vpp barrier traces on all DUTs in the given topology.
+ def vpp_enable_elog_traces_on_all_duts(nodes):
+ """Enable API/CLI/Barrier traces on all DUTs in the given topology.
:param nodes: Nodes in the topology.
:type nodes: dict
"""
for node in nodes.values():
if node['type'] == NodeType.DUT:
- VPPUtil.vpp_enable_barrier_traces_on_dut(node)
+ VPPUtil.vpp_enable_elog_traces_on_dut(node)
@staticmethod
def show_event_logger_on_dut(node):
@@ -253,4 +253,4 @@ class VPPUtil(object):
"""
for node in nodes.values():
if node['type'] == NodeType.DUT:
- VPPUtil.show_event_logger_on_dut(node) \ No newline at end of file
+ VPPUtil.show_event_logger_on_dut(node)
diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index e4ece560b8..ec4033a704 100644
--- a/resources/libraries/robot/performance/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -815,7 +815,7 @@
| | Run Keyword If | ${dut_stats}==${True} and ${pkt_trace}==${True}
| | ... | VPP Enable Traces On All DUTs | ${nodes}
| | Run Keyword If | ${dut_stats}==${True}
-| | ... | VPP enable barrier traces on all DUTs | ${nodes}
+| | ... | VPP enable elog traces on all DUTs | ${nodes}
| | ${results} = | Create List
| | :FOR | ${i} | IN RANGE | ${subsamples}
| | | Send traffic on tg | ${trial_duration} | ${rate} | ${framesize}
diff --git a/resources/templates/vat/elog_trace_api_cli_barrier.vat b/resources/templates/vat/elog_trace_api_cli_barrier.vat
new file mode 100644
index 0000000000..d2c8ce131d
--- /dev/null
+++ b/resources/templates/vat/elog_trace_api_cli_barrier.vat
@@ -0,0 +1 @@
+exec elog trace api cli barrier \ No newline at end of file
diff --git a/resources/templates/vat/test_threads_barrier_elog.vat b/resources/templates/vat/test_threads_barrier_elog.vat
deleted file mode 100644
index 5be3c41b92..0000000000
--- a/resources/templates/vat/test_threads_barrier_elog.vat
+++ /dev/null
@@ -1 +0,0 @@
-exec test threads barrier-elog enable