From b6fbffad32515ccf94404680cb5280c2cb561af5 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Mon, 22 Mar 2021 17:11:21 +0100 Subject: MLRsearch: Support other than just two ratios + Change some method names and argument types: + Do not mention NDR and PDR, except as examples. + Return list of ReceiveRateInterval instead of NdrPdrResult. + The resulting intervals can be degenerate when hitting min/max rate. + Rename quantity name parts from "fraction" to "ratio". + Intervals are no longer tracked for each target ratio. + They are found dynamically from known results. + Add effective_loss_ratio field to avoid loss inversion effects. + Move some functions to separate files. + Bound search logic moved to MeasurementDatabase.py + ProgressState moved to its file. + WidthArithmetics.py holds small computation functions. + Use parameter expansion_coefficient instead of "doublings". + Do uneven bisect to save time when width is not power of two times goal. + Timeout now correctly tracked for the whole search, not just the current phase. + Make logging (debug) function pluggable. + Added debug log messages for initial phase. + Do not mark as subclass if contructor signature differs. + Avoid re-measure on scale-limited (ASTF) profiles. + Remove outdated comments. + Bump copyright years. Change-Id: I93f693b4f186f59030ee5ac21b78acc890109813 Signed-off-by: Vratko Polak --- .../robot/performance/performance_display.robot | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'resources/libraries/robot/performance/performance_display.robot') 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] -- cgit 1.2.3-korg