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/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot | 2 +- tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot | 2 +- tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot | 2 +- tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot | 2 +- tests/dpdk/perf/__init__.robot | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/dpdk/perf') diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot index 67c271b021..ca4faac946 100644 --- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot +++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot @@ -66,7 +66,7 @@ | | ... | ${get_framesize} < ${1522} | no | yes | | ... | | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames} -| | 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/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot index c9555473bb..1c16d9cc66 100644 --- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot +++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot @@ -65,7 +65,7 @@ | | ... | ${get_framesize} < ${1522} | no | yes | | ... | | Given Start L3FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames} -| | 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/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot index 9257cddb62..180c15ceb1 100644 --- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot +++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot @@ -66,7 +66,7 @@ | | ... | ${get_framesize} < ${1522} | no | yes | | ... | | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames} -| | 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/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot index 435512408d..65e901bbb7 100644 --- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot +++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot @@ -70,7 +70,7 @@ | | ... | ${get_framesize} < ${1522} | no | yes | | ... | | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames} -| | 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/dpdk/perf/__init__.robot b/tests/dpdk/perf/__init__.robot index 6d38c40229..d818f94e25 100644 --- a/tests/dpdk/perf/__init__.robot +++ b/tests/dpdk/perf/__init__.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 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: @@ -31,14 +31,12 @@ | | ... | Setup suite Variables. Variables are used across performance testing. | | ... | | ... | _NOTE:_ This KW sets following suite variables: -| | ... | - perf_trial_duration - Duration of traffic run [s]. | | ... | - perf_pdr_loss_acceptance - Loss acceptance treshold | | ... | - perf_pdr_loss_acceptance_type - Loss acceptance treshold type | | ... | - perf_vm_image - Guest VM disk image | | ... | - pkt_trace - Switch to enable packet trace for test | | ... | - dut_stats - Switch to enable DUT statistics | | ... -| | Set Global Variable | ${perf_trial_duration} | 10 | | Set Global Variable | ${perf_pdr_loss_acceptance} | 0.5 | | Set Global Variable | ${perf_pdr_loss_acceptance_type} | percentage | | Set Global Variable | ${perf_vm_image} | /var/lib/vm/csit-nested-1.7.img -- cgit 1.2.3-korg