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/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot            | 2 +-
 tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot                  | 2 +-
 .../perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot   | 2 +-
 .../perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot   | 2 +-
 .../perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot  | 2 +-
 .../perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot  | 2 +-
 tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-mrr.robot              | 2 +-
 tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale100kmaclrn-mrr.robot         | 2 +-
 tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale10kmaclrn-mrr.robot          | 2 +-
 tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot           | 2 +-
 tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-mrr.robot                    | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot            | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot                  | 2 +-
 .../perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot   | 2 +-
 .../perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot   | 2 +-
 .../perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot  | 2 +-
 .../perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot  | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-mrr.robot              | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-mrr.robot         | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-mrr.robot          | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-mrr.robot           | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-mrr.robot                    | 2 +-
 tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-mrr.robot             | 2 +-
 tests/vpp/perf/l2/40ge2p1xl710-eth-l2xcbase-mrr.robot                   | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot
index 11e1a5e701..1905eefb47 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot
@@ -79,7 +79,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
-| | 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/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot
index 0afce82342..8436affa64 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot
@@ -81,7 +81,7 @@
 | | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | 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/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot
index 7314f7808e..9de8e8b5ef 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot
index a7989c5037..192cf48b3b 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
index d1693bbd08..1467f1a82d 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
index a5040df0be..9a31d7b7ea 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x520-eth-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-mrr.robot
index 8c2ed7f529..686c5be2e5 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-mrr.robot
@@ -68,7 +68,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 bridge domain 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/l2/10ge2p1x520-eth-l2bdscale100kmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale100kmaclrn-mrr.robot
index 2194b03ab9..ab3ec3aa4f 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale100kmaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale100kmaclrn-mrr.robot
@@ -67,7 +67,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain 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/l2/10ge2p1x520-eth-l2bdscale10kmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale10kmaclrn-mrr.robot
index bf45f87a1d..a53d6b8b7b 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale10kmaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale10kmaclrn-mrr.robot
@@ -67,7 +67,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain 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/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot
index 0cc6bb627f..2b2f348915 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot
@@ -73,7 +73,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain 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/l2/10ge2p1x520-eth-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-mrr.robot
index 151ed158ca..60cda67c90 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-mrr.robot
@@ -67,7 +67,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect 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/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot
index 390bdd68bf..9afd686d9a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot
@@ -79,7 +79,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
-| | 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/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot
index cdb9ef9f03..006267cb65 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot
@@ -81,7 +81,7 @@
 | | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | 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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot
index 01c0551114..75188cb724 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot
index eeb8319809..14d482ce5f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
index 744b32e29d..74bc15cea1 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
index b0fa8af710..c486b38cce 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
@@ -91,7 +91,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 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/l2/10ge2p1x710-eth-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-mrr.robot
index 65fcf97cf9..384c33b0e8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-mrr.robot
@@ -68,7 +68,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 bridge domain 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/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-mrr.robot
index 3c484a6433..c93e8dab44 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-mrr.robot
@@ -67,7 +67,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain 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/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-mrr.robot
index 1c46c0567d..e1af0b8389 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-mrr.robot
@@ -67,7 +67,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain 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/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-mrr.robot
index 76fe934ffb..7c3517eb50 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-mrr.robot
@@ -73,7 +73,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain 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/l2/10ge2p1x710-eth-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-mrr.robot
index cabff8943e..29b54b17d8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-mrr.robot
@@ -67,7 +67,7 @@
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect 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/l2/40ge2p1xl710-eth-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-mrr.robot
index 3c772b75ee..195168e657 100644
--- a/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-mrr.robot
@@ -76,7 +76,7 @@
 | | And Add DPDK dev default TXD to all DUTs | 2048
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain 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/l2/40ge2p1xl710-eth-l2xcbase-mrr.robot b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2xcbase-mrr.robot
index 41196e28e3..65db8c4393 100644
--- a/tests/vpp/perf/l2/40ge2p1xl710-eth-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2xcbase-mrr.robot
@@ -77,7 +77,7 @@
 | | And Add DPDK dev default TXD to all DUTs | 2048
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 xconnect 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}
 
 
-- 
cgit 1.2.3-korg