MLRsearch: Support other than just two ratios

[csit.git] / resources / libraries / robot / performance / performance_utils.robot

diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index 638a834..5942330 100644 (file)
--- 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]