From 182107f041d9582e7e20ceb0e5247e6081704ea3 Mon Sep 17 00:00:00 2001
From: pmikus <peter.mikus@protonmail.ch>
Date: Tue, 21 Feb 2023 15:02:55 +0000
Subject: [PATCH] fix(core): log but not export from teardown

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I0f5f1000f55110455e86db4c461fba3c87fb198e
---
 resources/libraries/robot/performance/performance_actions.robot | 6 +++---
 resources/libraries/robot/performance/performance_utils.robot   | 8 ++++++--
 resources/libraries/robot/shared/test_teardown.robot            | 4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/resources/libraries/robot/performance/performance_actions.robot b/resources/libraries/robot/performance/performance_actions.robot
index 96d46c5b65..1d2ea52274 100644
--- a/resources/libraries/robot/performance/performance_actions.robot
+++ b/resources/libraries/robot/performance/performance_actions.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -95,7 +95,7 @@
 | | ... | ramp_up_rate=${ramp_up_rate}
 | | Run Telemetry On All DUTs
 | | ... | ${nodes} | profile=vppctl_runtime.yaml
-| | ... | rate=${telemetry_rate} | export=${True}
+| | ... | rate=${telemetry_rate} | export=${telemetry_export}
 | | Stop traffic on tg
 
 | Additional Statistics Action For bpf-runtime
@@ -195,7 +195,7 @@
 | | | ... | affinity=${iperf_client_affinity}
 | | Run Telemetry On All DUTs
 | | ... | ${nodes} | profile=vppctl_runtime.yaml
-| | ... | rate=${telemetry_rate} | export=${True}
+| | ... | rate=${telemetry_rate} | export=${telemetry_export}
 | | iPerf Client Stop Remote Exec | ${nodes['${iperf_client_node}']} | ${pids}
 
 | Additional Statistics Action For noop
diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index a43f38e2fe..fe14215da5 100644
--- a/resources/libraries/robot/performance/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -114,6 +114,7 @@
 | | Set Test Variable | \${rate for teardown} | ${lower}
 | | # Stats at the discovered critical rate.
 | | Set Test Variable | ${telemetry_rate} | plr
+| | Set Test Variable | ${telemetry_export} | ${True}
 | | Send traffic at specified rate
 | | ... | rate=${lower}
 | | ... | trial_duration=${1.0}
@@ -198,6 +199,7 @@
 | | ${ndr} = | Set Variable | ${result[0].measured_low.target_tr}
 | | # We expect NDR and PDR to have different-looking stats.
 | | Set Test Variable | ${telemetry_rate} | pdr
+| | Set Test Variable | ${telemetry_export} | ${True}
 | | Send traffic at specified rate
 | | ... | rate=${pdr}
 | | ... | trial_duration=${1.0}
@@ -205,6 +207,7 @@
 | | ... | use_latency=${use_latency}
 | | ... | duration_limit=${1.0}
 | | Set Test Variable | ${telemetry_rate} | ndr
+| | Set Test Variable | ${telemetry_export} | ${True}
 | | Run Keyword If | ${ndr} != ${pdr}
 | | ... | Send traffic at specified rate
 | | ... | rate=${ndr}
@@ -479,6 +482,7 @@
 | | ... | ${traffic_directions}=${1}
 | |
 | | Set Test Variable | ${telemetry_rate} | mrr
+| | Set Test Variable | ${telemetry_export} | ${True}
 | | ${results}= | Send iPerf3 traffic at specified rate
 | | ... | ${trial_duration} | ${None} | ${None}
 | | ... | ${trial_multiplicity} | ${traffic_directions}
@@ -667,6 +671,8 @@
 | |
 | | ... | \| Traffic should pass with maximum rate \|
 | |
+| | Set Test Variable | ${telemetry_rate} | mrr
+| | Set Test Variable | ${telemetry_export} | ${False}
 | | ${max_rate} = | Get Max Rate
 | | ${transaction_type} = | Get Transaction Type
 | | ${trial_duration} = | Get Mrr Trial Duration
@@ -674,8 +680,6 @@
 | | ${use_latency} = | Get Use Latency
 | | ${unit} = | Set Variable If | """_cps""" in """${transaction_type}"""
 | | ... | cps | pps
-| | # The following also sets \${rate_for_teardown}
-| | Set Test Variable | ${telemetry_rate} | mrr
 | | ${results} = | Send traffic at specified rate
 | | ... | rate=${max_rate}
 | | ... | trial_duration=${trial_duration}
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index 6bfb532fbe..f590e8a7cd 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -199,6 +199,8 @@
 | | ${rate_for_teardown} = | Get Rate For Teardown
 | | Call Resetter
 | | Set Test Variable | \${extended_debug} | ${True}
+| | Set Test Variable | ${telemetry_rate} | ${EMPTY}
+| | Set Test Variable | ${telemetry_export} | ${False}
 | | Send traffic at specified rate
 | | ... | trial_duration=${1.0}
 | | ... | rate=${rate_for_teardown}
-- 
2.16.6