From 08e7b8758cf60f7f5974d66df3faf63650ca4bd6 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 5 Jul 2019 05:08:13 +0000
Subject: Remove pkt_trace as global variable

- Use explicit parameters

Change-Id: I21cbc8cf13ec5e455b20c685c4427a53a655f71f
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 resources/libraries/robot/performance/performance_utils.robot | 5 +++--
 resources/libraries/robot/shared/test_teardown.robot          | 3 +--
 tests/vpp/device/__init__.robot                               | 2 --
 tests/vpp/perf/__init__.robot                                 | 2 --
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index 71e20afc72..8507ae68f5 100644
--- a/resources/libraries/robot/performance/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -363,15 +363,16 @@
 | | ... | - unidirection - False if traffic is bidirectional. Type: boolean
 | | ... | - tx_port - TX port of TG, default 0. Type: integer
 | | ... | - rx_port - RX port of TG, default 1. Type: integer
+| | ... | - pkt_trace - True to enable packet trace. Type: boolean
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Send traffic at specified rate \| ${1.0} \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4 \| ${10} \| ${False} \| ${0} | ${1} \|
+| | ... | \| 3-node-IPv4 \| ${10} \| ${False} \| ${0} | ${1} \| ${False}
 | | ...
 | | [Arguments] | ${trial_duration} | ${rate} | ${frame_size}
 | | ... | ${traffic_profile} | ${subsamples}=${1} | ${unidirection}=${False}
-| | ... | ${tx_port}=${0} | ${rx_port}=${1}
+| | ... | ${tx_port}=${0} | ${rx_port}=${1} | ${pkt_trace}=${False}
 | | ...
 | | Clear and show runtime counters with running traffic | ${trial_duration}
 | | ... | ${rate} | ${frame_size} | ${traffic_profile}
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index f95e369b65..cec0655e19 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -44,10 +44,9 @@
 | | [Documentation]
 | | ... | Additional teardown for tests which uses performance measurement.
 | | ...
-| | Set Test Variable | ${pkt_trace} | ${True}
 | | Run Keyword If Test Failed
 | | ... | Send traffic at specified rate | ${perf_trial_duration} | 10000pps
-| | ... | ${frame_size} | ${traffic_profile}
+| | ... | ${frame_size} | ${traffic_profile} | pkt_trace=${True}
 
 | Additional Test Tear Down Action For packet_trace
 | | [Documentation]
diff --git a/tests/vpp/device/__init__.robot b/tests/vpp/device/__init__.robot
index d7e3990e7f..595f27097e 100644
--- a/tests/vpp/device/__init__.robot
+++ b/tests/vpp/device/__init__.robot
@@ -35,12 +35,10 @@
 | | ... | Setup suite Variables. Variables are used across device testing.
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - pkt_trace - Switch to enable packet trace for test
 | | ... | - dut_stats - Switch to enable DUT statistics
 | | ... | - vm_image - Guest VM disk image.
 | | ... | - packages_dir - Path to directory where VPP packages are stored.
 | | ...
-| | Set Global Variable | ${pkt_trace} | ${False}
 | | Set Global Variable | ${dut_stats} | ${True}
 | | Set Global Variable | ${vm_image} | /var/lib/vm/csit-nested-1.7.img
 | | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/
diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index 578c57312b..d86a76db79 100644
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -37,10 +37,8 @@
 | | ... | Setup suite Variables. Variables are used across performance testing.
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - pkt_trace - Switch to enable packet trace for test.
 | | ... | - dut_stats - Switch to enable DUT statistics.
 | | ... | - packages_dir - Directory with VPP binary packages.
 | | ...
-| | Set Global Variable | ${pkt_trace} | ${False}
 | | Set Global Variable | ${dut_stats} | ${True}
 | | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/
-- 
cgit 1.2.3-korg