diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/ip/ip4.robot | 8 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_utils.robot | 49 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/test_teardown.robot | 2 |
3 files changed, 32 insertions, 27 deletions
diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot index e555dc17ac..2dc2a72857 100644 --- a/resources/libraries/robot/ip/ip4.robot +++ b/resources/libraries/robot/ip/ip4.robot @@ -81,18 +81,18 @@ | | ... | interface=${DUT2_${int}1}[0] | | | | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' -| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 32 +| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 24 | | ... | gateway=10.10.10.2 | interface=${DUT1_${int}1}[0] | | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' -| | ... | Vpp Route Add | ${dut} | ${remote_host2_ip} | 32 +| | ... | Vpp Route Add | ${dut} | ${remote_host2_ip} | 24 | | ... | gateway=20.20.20.2 | interface=${dut_if2} | | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' | | ... | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 32 +| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 24 | | ... | gateway=1.1.1.2 | interface=${DUT1_${int}2}[0] | | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' | | ... | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | ${remote_host2_ip} | 32 +| | ... | Vpp Route Add | ${dut2} | ${remote_host2_ip} | 24 | | ... | gateway=1.1.1.1 | interface=${DUT2_${int}1}[0] | Initialize IPv4 forwarding with scaling in circular topology diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot index 4c8146e56a..f14d7bd13c 100644 --- a/resources/libraries/robot/performance/performance_utils.robot +++ b/resources/libraries/robot/performance/performance_utils.robot @@ -112,10 +112,10 @@ | | # Finally, trials with runtime and other stats. | | # We expect NDR and PDR to have different-looking stats. | | Send traffic at specified rate -| | ... | ${1.0} | ${pdr_per_stream}pps | ${framesize} | ${traffic_profile} +| | ... | ${1.0} | ${pdr_per_stream} | ${framesize} | ${traffic_profile} | | ... | traffic_directions=${traffic_directions} | | Send traffic at specified rate -| | ... | ${1.0} | ${ndr_per_stream}pps | ${framesize} | ${traffic_profile} +| | ... | ${1.0} | ${ndr_per_stream} | ${framesize} | ${traffic_profile} | | ... | traffic_directions=${traffic_directions} | Find Throughput Using MLRsearch @@ -247,7 +247,7 @@ | | | | ... | *Arguments:* | | ... | - result - Result of bidirectional measurtement. -| | ... | Type: ReceiveRateMeasurement +| | ... | Type: ReceiveRateMeasurement | | | | ... | *Example:* | | @@ -389,11 +389,12 @@ | | ... | ${fail_no_traffic}=${True} | | ... | ${trial_multiplicity}=${trial_multiplicity} | | ... | ${traffic_directions}=${2} | ${tx_port}=${0} | ${rx_port}=${1} +| | ... | ${latency}=${True} | | | | ${results}= | Send traffic at specified rate -| | ... | ${trial_duration} | ${max_rate}pps | ${frame_size} +| | ... | ${trial_duration} | ${max_rate} | ${frame_size} | | ... | ${traffic_profile} | ${trial_multiplicity} -| | ... | ${traffic_directions} | ${tx_port} | ${rx_port} +| | ... | ${traffic_directions} | ${tx_port} | ${rx_port} | latency=${latency} | | Set Test Message | ${\n}Maximum Receive Rate trial results | | Set Test Message | in packets per second: ${results} | | ... | append=yes @@ -405,15 +406,12 @@ | | ... | Then send traffic at specified rate, possibly multiple trials. | | ... | Show various DUT stats, optionally also packet trace. | | ... | Return list of measured receive rates. -| | ... | The rate argument should be TRex friendly, so it should include "pps". | | | | ... | *Arguments:* -| | ... | - trial_duration - Duration of single trial [s]. -| | ... | Type: float -| | ... | - rate - Rate for sending packets. -| | ... | Type: string -| | ... | - frame_size - L2 Frame Size [B]. -| | ... | Type: integer/string +| | ... | - trial_duration - Duration of single trial [s]. Type: float +| | ... | - rate - Target aggregate transmit rate [pps] / Connections per second +| | ... | (CPS) for UDP/TCP flows. Type: float +| | ... | - frame_size - L2 Frame Size [B]. Type: integer/string | | ... | - traffic_profile - Name of module defining traffc for measurements. | | ... | Type: string | | ... | - trial_multiplicity - How many trials in this measurement. @@ -429,13 +427,14 @@ | | | | ... | *Example:* | | -| | ... | \| Send traffic at specified rate \| \${1.0} \| 4.0mpps \| \${64} \ -| | ... | \| 3-node-IPv4 \| \${10} \| \${2} \| \${0} \| \${1} \| \${False} \| +| | ... | \| Send traffic at specified rate \| \${1.0} \| ${4000000.0} \ +| | ... | \| \${64} \| 3-node-IPv4 \| \${10} \| \${2} \| \${0} \| \${1} \ +| | ... | \${False} \| | | | | [Arguments] | ${trial_duration} | ${rate} | ${frame_size} | | ... | ${traffic_profile} | ${trial_multiplicity}=${trial_multiplicity} | | ... | ${traffic_directions}=${2} | ${tx_port}=${0} | ${rx_port}=${1} -| | ... | ${extended_debug}=${extended_debug} +| | ... | ${extended_debug}=${extended_debug} | ${latency}=${True} | | | | Set Test Variable | ${extended_debug} | | Clear and show runtime counters with running traffic | ${trial_duration} @@ -451,7 +450,7 @@ | | | Send traffic on tg | ${trial_duration} | ${rate} | ${frame_size} | | | ... | ${traffic_profile} | warmup_time=${0} | | | ... | traffic_directions=${traffic_directions} | tx_port=${tx_port} -| | | ... | rx_port=${rx_port} +| | | ... | rx_port=${rx_port} | latency=${latency} | | | ${rx} = | Get Received | | | ${rr} = | Evaluate | ${rx} / ${trial_duration} | | | Append To List | ${results} | ${rr} @@ -471,7 +470,9 @@ | | ... | *Arguments:* | | ... | - message_prefix - Preface to test message addition. Type: string | | ... | - trial_duration - Duration of single trial [s]. Type: float -| | ... | - rate - Rate for sending packets, in pps. Type: int +| | ... | - rate - Rate [pps] for sending packets in case of T-Rex stateless +| | ... | mode or multiplier of profile CPS in case of T-Rex astf mode. +| | ... | Type: float | | ... | - frame_size - L2 Frame Size [B]. Type: integer/string | | ... | - traffic_profile - Name of module defining traffic for measurements. | | ... | Type: string @@ -495,7 +496,7 @@ | | ${real_rate} = | Evaluate | max(${rate}, ${safe_rate}) | | # The following line is skipping some default arguments, | | # that is why subsequent arguments have to be named. -| | Send traffic on tg | ${trial_duration} | ${real_rate}pps | ${frame_size} +| | Send traffic on tg | ${trial_duration} | ${real_rate} | ${frame_size} | | ... | ${traffic_profile} | warmup_time=${0} | | ... | traffic_directions=${traffic_directions} | tx_port=${tx_port} | | ... | rx_port=${rx_port} @@ -510,7 +511,9 @@ | | | | ... | *Arguments:* | | ... | - duration - Duration of traffic run [s]. Type: integer -| | ... | - rate - Unidirectional rate for sending packets. Type: string +| | ... | - rate - Rate [pps] for sending packets in case of T-Rex stateless +| | ... | mode or multiplier of profile CPS in case of T-Rex astf mode. +| | ... | Type: float | | ... | - frame_size - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string | | ... | - traffic_profile - Name of module defining traffc for measurements. | | ... | Type: string @@ -522,7 +525,7 @@ | | ... | *Example:* | | | | ... | \| Clear and show runtime counters with running traffic \| \${10} \ -| | ... | \| 4.0mpps \| \${64} \| 3-node-IPv4 \| \${2} \| \${0} \| \${1} \| +| | ... | \| ${4000000.0} \| \${64} \| 3-node-IPv4 \| \${2} \| \${0} \| \${1} \| | | | | [Arguments] | ${duration} | ${rate} | ${frame_size} | ${traffic_profile} | | ... | ${traffic_directions}=${2} | ${tx_port}=${0} | ${rx_port}=${1} @@ -552,7 +555,9 @@ | | ... | Type: string | | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str | | ... | *Arguments:* -| | ... | - rate - Unidirectional rate for sending packets. Type: string +| | ... | - rate - Rate [pps] for sending packets in case of T-Rex stateless +| | ... | mode or multiplier of profile CPS in case of T-Rex astf mode. +| | ... | Type: float | | ... | - traffic_directions - Bi- (2) or uni- (1) directional traffic. | | ... | Type: int | | ... | - tx_port - TX port of TG, default 0. Type: integer @@ -560,7 +565,7 @@ | | | | ... | *Example:* | | -| | ... | \| Start Traffic on Background \| 4.0mpps \| \${2} \| \${0} \ +| | ... | \| Start Traffic on Background \| ${4000000.0} \| \${2} \| \${0} \ | | ... | \| \${1} \| | | | | [Arguments] | ${rate} | ${traffic_directions}=${2} | ${tx_port}=${0} diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot index e6ddc58c4b..68bbe716f2 100644 --- a/resources/libraries/robot/shared/test_teardown.robot +++ b/resources/libraries/robot/shared/test_teardown.robot @@ -51,7 +51,7 @@ | | ... | Additional teardown for tests which uses performance measurement. | | | | Run Keyword If Test Failed -| | ... | Send traffic at specified rate | ${1.0} | 10000pps +| | ... | Send traffic at specified rate | ${1.0} | 10000 | | ... | ${frame_size} | ${traffic_profile} | trial_multiplicity=${1} | | ... | extended_debug=${True} |