From e3bed8e21e3c8b60734ce95eb2bb2a2d371a9907 Mon Sep 17 00:00:00 2001 From: Vratko Polak 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 --- tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-mrr.robot | 2 +- .../perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot | 2 +- tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-mrr.robot | 2 +- tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-mrr.robot | 2 +- .../perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-mrr.robot | 2 +- tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-mrr.robot | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/vpp/perf/ip4_tunnels') diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-mrr.robot index a44a8605b6..a925929c8b 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-mrr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-mrr.robot @@ -83,7 +83,7 @@ | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency} -| | 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_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot index 5275dcb4e0..2273ef4b66 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-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 with VXLANoIPv4 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_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-mrr.robot index 908515be17..e611431f8c 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-mrr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-mrr.robot @@ -73,7 +73,7 @@ | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with VXLANoIPv4 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_tunnels/10ge2p1x710-ethip4lispip4-ip4base-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-mrr.robot index 47e7a48bf9..a804b72cac 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-mrr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-mrr.robot @@ -83,7 +83,7 @@ | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency} -| | 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_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-mrr.robot index cd7a7834da..6cc7f35537 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-mrr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-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 with VXLANoIPv4 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_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-mrr.robot index 2cc3293dbe..b8c3f5c2c2 100644 --- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-mrr.robot +++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-mrr.robot @@ -73,7 +73,7 @@ | | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 xconnect with VXLANoIPv4 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