aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/libraries/python/TelemetryUtil.py16
-rw-r--r--resources/libraries/robot/performance/performance_actions.robot8
-rw-r--r--resources/libraries/robot/performance/performance_utils.robot8
3 files changed, 16 insertions, 16 deletions
diff --git a/resources/libraries/python/TelemetryUtil.py b/resources/libraries/python/TelemetryUtil.py
index 70efa13fff..63d0bf60a7 100644
--- a/resources/libraries/python/TelemetryUtil.py
+++ b/resources/libraries/python/TelemetryUtil.py
@@ -26,20 +26,20 @@ class TelemetryUtil:
@staticmethod
def _run_telemetry(
- node, profile, sid=None, spath=None, oload="", export=False):
+ node, profile, sid=None, spath=None, rate="", export=False):
"""Get telemetry read on node.
:param node: Node in the topology.
:param profile: Telemetry configuration profile.
:param sid: Socket ID used to describe recipient side of socket.
:param spath: Socket path.
- :param oload: Telemetry offered load, unique within the test (optional).
+ :param rate: Telemetry load, unique within the test (optional).
:param export: If false, do not attempt JSON export (default false).
:type node: dict
:type profile: str
:type sid: str
:type spath: str
- :type oload: str
+ :type rate: str
:type export: bool
"""
config = ""
@@ -68,23 +68,23 @@ class TelemetryUtil:
prefix += f"hostname=\"{hostname}\","
if sid:
prefix += f"hook=\"{sid}\","
- prefix += f"oload=\"{oload}\","
+ prefix += f"rate=\"{rate}\","
for line in stdout.splitlines():
if line and not line.startswith("#"):
append_telemetry(
prefix.join(line.rsplit("{", 1)).replace("\"", "'")
)
- def run_telemetry_on_all_duts(self, nodes, profile, oload="", export=False):
+ def run_telemetry_on_all_duts(self, nodes, profile, rate="", export=False):
"""Get telemetry read on all DUTs.
:param nodes: Nodes in the topology.
:param profile: Telemetry configuration profile.
- :param oload: Telemetry offered load, unique within the test (optional).
+ :param rate: Telemetry load, unique within the test (optional).
:param export: If false, do not attempt JSON export (default false).
:type nodes: dict
:type profile: str
- :type oload: str
+ :type rate: str
:type export: bool
"""
for node in nodes.values():
@@ -93,7 +93,7 @@ class TelemetryUtil:
for sid, spath in node["sockets"]["CLI"].items():
self._run_telemetry(
node, profile=profile, sid=sid, spath=spath,
- oload=oload, export=export
+ rate=rate, export=export
)
except IndexError:
pass
diff --git a/resources/libraries/robot/performance/performance_actions.robot b/resources/libraries/robot/performance/performance_actions.robot
index 0404ce2a52..96d46c5b65 100644
--- a/resources/libraries/robot/performance/performance_actions.robot
+++ b/resources/libraries/robot/performance/performance_actions.robot
@@ -95,7 +95,7 @@
| | ... | ramp_up_rate=${ramp_up_rate}
| | Run Telemetry On All DUTs
| | ... | ${nodes} | profile=vppctl_runtime.yaml
-| | ... | oload=${telemetry_oload} | export=${True}
+| | ... | rate=${telemetry_rate} | export=${True}
| | Stop traffic on tg
| Additional Statistics Action For bpf-runtime
@@ -132,7 +132,7 @@
| | ... | ramp_up_rate=${ramp_up_rate}
| | Run Telemetry On All DUTs
| | ... | ${nodes} | profile=bpf_runtime.yaml
-| | ... | oload=${telemetry_oload} | export=${False}
+| | ... | rate=${telemetry_rate} | export=${False}
| | Stop traffic on tg
| Additional Statistics Action For perf-stat-runtime
@@ -169,7 +169,7 @@
| | ... | ramp_up_rate=${ramp_up_rate}
| | Run Telemetry On All DUTs
| | ... | ${nodes} | profile=perf_stat_runtime.yaml
-| | ... | oload=${telemetry_oload} | export=${False}
+| | ... | rate=${telemetry_rate} | export=${False}
| | Stop traffic on tg
| Additional Statistics Action For vpp-runtime-iperf3
@@ -195,7 +195,7 @@
| | | ... | affinity=${iperf_client_affinity}
| | Run Telemetry On All DUTs
| | ... | ${nodes} | profile=vppctl_runtime.yaml
-| | ... | oload=${telemetry_oload} | export=${True}
+| | ... | rate=${telemetry_rate} | export=${True}
| | 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 1eb6710eff..ddd813360a 100644
--- a/resources/libraries/robot/performance/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -113,7 +113,7 @@
| | ... | ${average} | ${stdev}
| | Set Test Variable | \${rate for teardown} | ${lower}
| | # Stats at the discovered critical rate.
-| | Set Test Variable | ${telemetry_oload} | plr
+| | Set Test Variable | ${telemetry_rate} | plr
| | Send traffic at specified rate
| | ... | rate=${lower}
| | ... | trial_duration=${1.0}
@@ -197,14 +197,14 @@
| | ${pdr} = | Set Variable | ${result[1].measured_low.target_tr}
| | ${ndr} = | Set Variable | ${result[0].measured_low.target_tr}
| | # We expect NDR and PDR to have different-looking stats.
-| | Set Test Variable | ${telemetry_oload} | pdr
+| | Set Test Variable | ${telemetry_rate} | pdr
| | Send traffic at specified rate
| | ... | rate=${pdr}
| | ... | trial_duration=${1.0}
| | ... | trial_multiplicity=${1}
| | ... | use_latency=${use_latency}
| | ... | duration_limit=${1.0}
-| | Set Test Variable | ${telemetry_oload} | ndr
+| | Set Test Variable | ${telemetry_rate} | ndr
| | Run Keyword If | ${ndr} != ${pdr}
| | ... | Send traffic at specified rate
| | ... | rate=${ndr}
@@ -674,7 +674,7 @@
| | ${unit} = | Set Variable If | """_cps""" in """${transaction_type}"""
| | ... | cps | pps
| | # The following also sets \${rate_for_teardown}
-| | Set Test Variable | ${telemetry_oload} | mrr
+| | Set Test Variable | ${telemetry_rate} | mrr
| | ${results} = | Send traffic at specified rate
| | ... | rate=${max_rate}
| | ... | trial_duration=${trial_duration}