diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/performance/performance_display.robot | 26 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_utils.robot | 17 |
2 files changed, 20 insertions, 23 deletions
diff --git a/resources/libraries/robot/performance/performance_display.robot b/resources/libraries/robot/performance/performance_display.robot index e8dfdbbfbd..c34fddaa7b 100644 --- a/resources/libraries/robot/performance/performance_display.robot +++ b/resources/libraries/robot/performance/performance_display.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 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: @@ -34,15 +34,15 @@ | | [Arguments] | ${interval} | ${packet_loss_ratio}=${0.0} | | | | ${lower_bound} = | Set Variable | ${interval.measured_low} -| | ${lower_bound_lf} = | Set Variable | ${lower_bound.loss_fraction} -| | Return From Keyword If | ${lower_bound_lf} <= ${packet_loss_ratio} -| | Set Test Variable | \${rate_for_teardown} | ${lower_bound_lf} +| | ${lower_bound_lr} = | Set Variable | ${lower_bound.loss_ratio} +| | Return From Keyword If | ${lower_bound_lr} <= ${packet_loss_ratio} +| | Set Test Variable | \${rate_for_teardown} | ${lower_bound_lr} | | ${message}= | Catenate | SEPARATOR=${SPACE} -| | ... | Minimal rate loss fraction ${lower_bound_lf} +| | ... | Minimal rate loss ratio ${lower_bound_lr} | | ... | does not reach target ${packet_loss_ratio}. | | ${message_zero} = | Set Variable | Zero packets forwarded! | | ${message_other} = | Set Variable | ${lower_bound.loss_count} packets lost. -| | ${message} = | Set Variable If | ${lower_bound_lf} >= 1.0 +| | ${message} = | Set Variable If | ${lower_bound_lr} >= 1.0 | | ... | ${message}${\n}${message_zero} | ${message}${\n}${message_other} | | Fail | ${message} @@ -52,7 +52,7 @@ | | ... | due to reconfiguration under traffic. | | | | ... | *Arguments:* -| | ... | - result - Result of bidirectional measurtement. +| | ... | - result - Result of bidirectional measurement. | | ... | Type: ReceiveRateMeasurement | | | | ... | *Example:* @@ -100,15 +100,15 @@ | | [Arguments] | ${result} | | | | Display single bound | NDR_LOWER -| | ... | ${result.ndr_interval.measured_low.target_tr} -| | ... | ${result.ndr_interval.measured_low.latency} +| | ... | ${result[0].measured_low.target_tr} +| | ... | ${result[0].measured_low.latency} | | Display single bound | NDR_UPPER -| | ... | ${result.ndr_interval.measured_high.target_tr} +| | ... | ${result[0].measured_high.target_tr} | | Display single bound | PDR_LOWER -| | ... | ${result.pdr_interval.measured_low.target_tr} -| | ... | ${result.pdr_interval.measured_low.latency} +| | ... | ${result[1].measured_low.target_tr} +| | ... | ${result[1].measured_low.latency} | | Display single bound | PDR_UPPER -| | ... | ${result.pdr_interval.measured_high.target_tr} +| | ... | ${result[1].measured_high.target_tr} | Display result of soak search | | [Documentation] diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot index 638a834fc1..59423304a2 100644 --- a/resources/libraries/robot/performance/performance_utils.robot +++ b/resources/libraries/robot/performance/performance_utils.robot @@ -149,7 +149,7 @@ | | ... | Find boundaries for RFC2544 compatible NDR and PDR values | | ... | using an optimized search algorithm. | | ... | Display findings as a formatted test message. -| | ... | Fail if a resulting lower bound has too high loss fraction. +| | ... | Fail if a resulting lower bound has too high loss ratio. | | ... | Input rates are unidirectional, in transaction per second. | | ... | Reported result may contain aggregate pps rates, depending on test. | | ... | Additional latency measurements are performed for smaller loads, @@ -202,7 +202,6 @@ | | ... | initial_trial_duration=${1.0} | | ... | number_of_intermediate_phases=${2} | | ... | timeout=${720.0} -| | ... | doublings=${2} | | ... | ppta=${ppta} | | ... | resetter=${resetter} | | ... | traffic_directions=${traffic_directions} @@ -213,11 +212,11 @@ | | ... | ramp_up_duration=${ramp_up_duration} | | ... | ramp_up_rate=${ramp_up_rate} | | Display result of NDRPDR search | ${result} -| | Check NDRPDR interval validity | ${result.pdr_interval} +| | Check NDRPDR interval validity | ${result[1]} | | ... | ${packet_loss_ratio} -| | Check NDRPDR interval validity | ${result.ndr_interval} -| | ${pdr} = | Set Variable | ${result.pdr_interval.measured_low.target_tr} -| | ${ndr} = | Set Variable | ${result.ndr_interval.measured_low.target_tr} +| | Check NDRPDR interval validity | ${result[0]} +| | ${pdr} = | Set Variable | ${result[1].measured_low.target_tr} +| | ${ndr} = | Set Variable | ${result[0].measured_low.target_tr} | | # We expect NDR and PDR to have different-looking stats. | | Send traffic at specified rate | | ... | rate=${pdr} @@ -290,7 +289,6 @@ | | ... | initial_trial_duration=${1.0} | | ... | number_of_intermediate_phases=${1} | | ... | timeout=${720} -| | ... | doublings=${2} | | ... | ppta=${ppta} | | ... | resetter=${resetter} | | ... | traffic_directions=${traffic_directions} @@ -300,9 +298,8 @@ | | ... | use_latency=${use_latency} | | ... | ramp_up_duration=${ramp_up_duration} | | ... | ramp_up_rate=${ramp_up_rate} -| | Check NDRPDR interval validity | ${result.pdr_interval} -| | ... | ${0.0} -| | Return From Keyword | ${result.pdr_interval.measured_low.target_tr} +| | Check NDRPDR interval validity | ${result[0]} +| | Return From Keyword | ${result[0].measured_low.target_tr} | Measure and show latency at specified rate | | [Documentation] |