From e3bed8e21e3c8b60734ce95eb2bb2a2d371a9907 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 10 Jul 2018 13:41:58 +0200
Subject: CSIT-1178: Prepare for bursty MRR

+ All suites and tests still refer to MRR instead of BMRR (or FRMOBL).
+ API change: Traffic should pass with maximum rate
  first argument got a default value,
  thus it needs to be moved towards the end of argument list.
+ Consequently, the value for it has been deleted from suites.
+ Test message is now compatible only with BMRR parsing.
- Reporting of transmit rate is left as TODO.
+ Global test __init__ with new way of giving defaults to global variables.
+ The new keyword is put into robot_enhancements.robot resource.
+ Number of trials and trial duration are now configurable.
- Bootstrap scripts have no support for overriding the defaults yet.

Change-Id: I4b108cc9c256730e62c03fbacba0a1c314f8ae88
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-mrr.robot  | 2 +-
 tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-mrr.robot     | 2 +-
 tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot | 2 +-
 tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot                 | 2 +-
 tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-mrr.robot            | 2 +-
 tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-mrr.robot             | 2 +-
 tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-mrr.robot              | 2 +-
 .../perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot   | 2 +-
 .../perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot   | 2 +-
 .../perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot  | 2 +-
 .../perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot  | 2 +-
 tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-mrr.robot        | 2 +-
 .../10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot    | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-mrr.robot  | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-mrr.robot     | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-mrr.robot                 | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-mrr.robot            | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-mrr.robot             | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-mrr.robot              | 2 +-
 .../perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot   | 2 +-
 .../perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot   | 2 +-
 .../perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot  | 2 +-
 .../perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot  | 2 +-
 tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-mrr.robot        | 2 +-
 .../10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot    | 2 +-
 tests/vpp/perf/ip4/40ge2p1xl710-ethip4-ip4base-mrr.robot                | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'tests/vpp/perf/ip4')

diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-mrr.robot
index 9f72b465e8..1fb2d2e1cd 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-mrr.robot
@@ -80,7 +80,7 @@
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-mrr.robot
index ab2a4458d8..9264b06d8a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-mrr.robot
@@ -85,7 +85,7 @@
 | | ... | ip4 | dst | 10.10.10.2
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot
index e4b1c54448..0f4514e764 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot
@@ -81,7 +81,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
 | | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot
index 77f55a2b67..87f2f3c09c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot
@@ -69,7 +69,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-mrr.robot
index 2d16f36b88..dea047b5fe 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-mrr.robot
@@ -72,7 +72,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-mrr.robot
index 01833b9d55..808d23cc74 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-mrr.robot
@@ -72,7 +72,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-mrr.robot
index 781dac87a2..08b1279e90 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-mrr.robot
@@ -72,7 +72,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
index 1b42ecba7e..54a20fd19c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
index 90d7bb433c..ab48ea1f3d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
index 9076b58e8e..50071139ad 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
index c5c0a742e5..8d652973bc 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-mrr.robot
index f1191d5c0a..183392773c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-mrr.robot
@@ -76,7 +76,7 @@
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize NAT44 in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
index 09bc6a9913..f8c88a8433 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
@@ -76,7 +76,7 @@
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize NAT44 in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-mrr.robot
index 1a98e19ee8..670c26fd52 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-mrr.robot
@@ -80,7 +80,7 @@
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-mrr.robot
index cf97b665d1..38af1a0a52 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-mrr.robot
@@ -85,7 +85,7 @@
 | | ... | ip4 | dst | 10.10.10.2
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot
index 3bb19f3b01..d0c23c8f37 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-mrr.robot
@@ -81,7 +81,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
 | | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-mrr.robot
index 4d08b8e6f4..062b3e7f2c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-mrr.robot
@@ -69,7 +69,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-mrr.robot
index 17407317f6..369feba589 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-mrr.robot
@@ -72,7 +72,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-mrr.robot
index 19cc4067b8..3436d0ab3d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-mrr.robot
@@ -72,7 +72,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-mrr.robot
index 3f2576402c..91b95a8c5e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-mrr.robot
@@ -72,7 +72,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
index b29f665395..1dc5ae42f7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
index d1e6705ed9..8602970de4 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
index 300d8b74ea..2bf633d14f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
index 89e4228225..dd3273c7db 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
 | | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u1000p-conc
 | | Set Test Variable | ${traffic_profile}
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-mrr.robot
index 08957111fb..6826fd0383 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-mrr.robot
@@ -76,7 +76,7 @@
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize NAT44 in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
index 06a285358b..d297773bf4 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
@@ -76,7 +76,7 @@
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize NAT44 in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip4/40ge2p1xl710-ethip4-ip4base-mrr.robot b/tests/vpp/perf/ip4/40ge2p1xl710-ethip4-ip4base-mrr.robot
index c747191d44..c11f973397 100644
--- a/tests/vpp/perf/ip4/40ge2p1xl710-ethip4-ip4base-mrr.robot
+++ b/tests/vpp/perf/ip4/40ge2p1xl710-ethip4-ip4base-mrr.robot
@@ -73,7 +73,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-- 
cgit 1.2.3-korg