X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_utils.robot;h=7f971378e3db0bfaca452f31bc545a5234e1f7d9;hp=4acaec9c333e0195a6e759e7614c72ebaec87504;hb=1108807740e6c7d0b154ad8bb391bf0f35c550b9;hpb=73a01b1a7fc836c964627eea2c08106df0da5aee

diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index 4acaec9c33..7f971378e3 100644
--- a/resources/libraries/robot/performance/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -20,456 +20,257 @@
 | Library | resources.libraries.python.KubernetesUtils
 | Library | resources.libraries.python.VhostUser
 | Library | resources.libraries.python.TrafficGenerator
+| Library | resources.libraries.python.TrafficGenerator.OptimizedSearch
 | Library | resources.libraries.python.TrafficGenerator.TGDropRateSearchImpl
 | Library | resources.libraries.python.Trace
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/shared/counters.robot
-| Resource | resources/libraries/robot/shared/container.robot
-| Resource | resources/libraries/robot/shared/memif.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/l2/l2_xconnect.robot
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/vm/qemu.robot
-| Resource | resources/libraries/robot/l2/tagging.robot
-| Documentation | Performance suite keywords - utilities to find and verify NDR
-| ... | and PDR.
+| ...
+| Documentation
+| ... | Performance suite keywords - utilities to find and verify NDR and PDR.
 
 *** Keywords ***
-| Calculate pps
+| Find NDR and PDR intervals using optimized search
 | | [Documentation]
-| | ... | Calculate pps for given rate and L2 frame size,
-| | ... | additional 20B are added to L2 frame size as padding.
-| | ...
-| | ... | *Arguments*
-| | ... | - bps - Rate in bps. Type: integer
-| | ... | - framesize - L2 frame size in Bytes. Type: integer
-| | ...
-| | ... | *Return*
-| | ... | - Calculated pps. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Calculate pps \| 10000000000 \| 64 \|
-| | ...
-| | [Arguments] | ${bps} | ${framesize}
-| | ...
-| | ${framesize}= | Get Frame Size | ${framesize}
-| | ${ret}= | Evaluate | (${bps}/((${framesize}+20)*8)).__trunc__()
-| | Return From Keyword | ${ret}
-
-| Get Frame Size
-| | [Documentation]
-| | ... | Framesize can be either integer in case of a single packet
-| | ... | in stream, or set of packets in case of IMIX type or simmilar.
-| | ... | This keyword returns average framesize.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize. Type: integer or string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Get Frame Size \| IMIX_v4_1 \|
-| | ...
-| | [Arguments] | ${framesize}
-| | ...
-| | Return From Keyword If | '${framesize}' == 'IMIX_v4_1' | ${353.83333}
-| | Return From Keyword | ${framesize}
-
-| Find NDR using linear search and pps
-| | [Documentation]
-| | ... | Find throughput by using RFC2544 linear search with non drop rate.
+| | ... | Find boundaries for RFC2544 compatible NDR and PDR values
+| | ... | using an optimized search algorithm.
+| | ... | Display results as formatted test message.
+| | ... | Fail if a resulting lower bound has too high loss fraction.
+| | ... | Input rates are understood as uni-directional,
+| | ... | reported result contains bi-directional rates.
+| | ... | Currently, the min_rate value is hardcoded to match test teardowns.
+| | ...
+| | ... | TODO: Should the trial duration of the additional
+| | ... | measurements be configurable?
+| | ...
+| | ... | Some inputs are read from variables to streamline suites.
+| | ...
+| | ... | *Test (or broader scope) variables read:*
+| | ... | - traffic_profile - Name of module defining traffc for measurements.
+| | ... | Type: string
+| | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str
+| | ... | - max_rate - Calculated unidirectional maximal transmit rate [pps].
+| | ... | Type: float
 | | ...
 | | ... | *Arguments:*
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - start_rate - Initial start rate [pps]. Type: float
-| | ... | - step_rate - Step of linear search [pps]. Type: float
-| | ... | - topology_type - Topology type. Type: string
-| | ... | - min_rate - Lower limit of search [pps]. Type: float
-| | ... | - max_rate - Upper limit of search [pps]. Type: float
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
+| | ... | - packet_loss_ratio - Accepted loss during search. Type: float
+| | ... | - final_relative_width - Maximal width multiple of upper. Type: float
+| | ... | - final_trial_duration - Duration of final trials [s]. Type: float
+| | ... | - initial_trial_duration - Duration of initial trials [s]. Type: float
+| | ... | - intermediate phases - Number of intermediate phases [1]. Type: int
+| | ... | - timeout - Fail if search duration is longer [s]. Type: float
+| | ... | - doublings - How many doublings to do when expanding [1]. Type: int
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Find NDR using linear search and pps \| 64 \| 5000000 \
-| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \|
-| | ...
-| | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ... | ${topology_type} | ${min_rate} | ${max_rate}
-| | ...
-| | ${duration}= | Set Variable | ${perf_trial_duration}
-| | Set Duration | ${duration}
-| | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
-| | Set Search Linear Step | ${step_rate}
-| | Set Search Frame Size | ${framesize}
-| | Set Search Rate Type pps
-| | Linear Search | ${start_rate} | ${topology_type}
-| | ${rate_per_stream} | ${lat}= | Verify Search Result
-| | ${tmp}= | Create List | 100%NDR | ${lat}
-| | ${latency}= | Create List | ${tmp}
-| | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
-| | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
-| | ... | ${framesize} | ${topology_type}
-| | ${tmp}= | Create List | 50%NDR | ${lat_50p}
-| | Append To List | ${latency} | ${tmp}
-| | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
-| | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
-| | ... | ${framesize} | ${topology_type}
-| | ${tmp}= | Create List | 10%NDR | ${lat_10p}
-| | Append To List | ${latency} | ${tmp}
-| | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
-| | ... | ${latency}
-| | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
-| | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
+| | ... | \| Find NDR and PDR intervals using optimized search \| \${0.005}
+| | ... | \| \${0.005} \| \${30.0} \| \${1.0} \| \${2} \| ${600.0} \| ${2} \|
+| | ...
+| | [Arguments] | ${packet_loss_ratio}=${0.005}
+| | ... | ${final_relative_width}=${0.005} | ${final_trial_duration}=${30.0}
+| | ... | ${initial_trial_duration}=${1.0}
+| | ... | ${number_of_intermediate_phases}=${2} | ${timeout}=${720.0}
+| | ... | ${doublings}=${2}
+| | ...
+| | ${result} = | Perform optimized ndrpdr search | ${frame_size}
+| | ... | ${traffic_profile} | ${20000} | ${max_rate*2}
+| | ... | ${packet_loss_ratio} | ${final_relative_width}
+| | ... | ${final_trial_duration} | ${initial_trial_duration}
+| | ... | ${number_of_intermediate_phases} | timeout=${timeout}
+| | ... | doublings=${doublings}
+| | Display result of NDRPDR search | ${result} | ${frame_size}
+| | Check NDRPDR interval validity | ${result.pdr_interval}
+| | ... | ${packet_loss_ratio}
+| | Check NDRPDR interval validity | ${result.ndr_interval}
+| | Perform additional measurements based on NDRPDR result
+| | ... | ${result} | ${frame_size} | ${traffic_profile}
 
-| Find PDR using linear search and pps
+| Find critical load using PLRsearch
 | | [Documentation]
-| | ... | Find throughput by using RFC2544 linear search with partial drop rate
-| | ... | with PDR threshold and type specified by parameter.
+| | ... | Find boundaries for troughput (of given target loss ratio)
+| | ... | using PLRsearch algorithm.
+| | ... | Display results as formatted test message.
+| | ... | Fail if computed lower bound is below minimal rate.
+| | ... | Input rates are understood as uni-directional,
+| | ... | reported result contains bi-directional rates.
+| | ... | Currently, the min_rate value is hardcoded to match test teardowns.
+| | ... | Some inputs are read from variables to streamline suites.
+| | ...
+| | ... | *Test (or broader scope) variables read:*
+| | ... | - traffic_profile - Name of module defining traffc for measurements.
+| | ... | Type: string
+| | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str
+| | ... | - max_rate - Calculated unidirectional maximal transmit rate [pps].
+| | ... | Type: float
 | | ...
 | | ... | *Arguments:*
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - start_rate - Initial start rate [pps]. Type: float
-| | ... | - step_rate - Step of linear search [pps]. Type: float
-| | ... | - topology_type - Topology type. Type: string
-| | ... | - min_rate - Lower limit of search [pps]. Type: float
-| | ... | - max_rate - Upper limit of search [pps]. Type: float
-| | ... | - loss_acceptance - Accepted loss during search. Type: float
-| | ... | - loss_acceptance_type - Percentage or frames. Type: string
+| | ... | - packet_loss_ratio - Accepted loss during search. Type: float
+| | ... | - timeout - Stop when search duration is longer [s]. Type: float
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Find PDR using linear search and pps \| 64 \| 5000000 \
-| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 0.5 \| percentage \|
-| | ...
-| | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ... | ${topology_type} | ${min_rate} | ${max_rate}
-| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
-| | ...
-| | ${duration}= | Set Variable | ${perf_trial_duration}
-| | Set Duration | ${duration}
-| | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
-| | Set Search Linear Step | ${step_rate}
-| | Set Search Frame Size | ${framesize}
-| | Set Search Rate Type pps
-| | Set Loss Acceptance | ${loss_acceptance}
-| | Run Keyword If | '${loss_acceptance_type}' == 'percentage'
-| | ... | Set Loss Acceptance Type Percentage
-| | Linear Search | ${start_rate} | ${topology_type}
-| | ${rate_per_stream} | ${lat}= | Verify Search Result
-| | ${tmp}= | Create List | 100%PDR | ${lat}
-| | ${latency}= | Create List | ${tmp}
-| | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2
-| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
-| | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps
-| | ... | ${framesize} | ${topology_type} | ${loss_acceptance}
-| | ... | ${loss_acceptance_type} | fail_on_loss=${False}
-
-| Find NDR using binary search and pps
-| | [Documentation]
-| | ... | Find throughput by using RFC2544 binary search with non drop rate.
+| | ... | \| Find critical load using PLR search \| \${1e-7} \| \${120} \|
 | | ...
-| | ... | *Arguments:*
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - binary_min - Lower boundary of search [pps]. Type: float
-| | ... | - binary_max - Upper boundary of search [pps]. Type: float
-| | ... | - topology_type - Topology type. Type: string
-| | ... | - min_rate - Lower limit of search [pps]. Type: float
-| | ... | - max_rate - Upper limit of search [pps]. Type: float
-| | ... | - threshold - Threshold to stop search [pps]. Type: integer
-| | ...
-| | ... | *Example:*
+| | [Arguments] | ${packet_loss_ratio}=${1e-7} | ${timeout}=${7200.0}
 | | ...
-| | ... | \| Find NDR using binary search and pps \| 64 \| 6000000 \
-| | ... | \| 12000000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 50000 \|
-| | ...
-| | [Arguments] | ${framesize} | ${binary_min} | ${binary_max}
-| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | ...
-| | ${duration}= | Set Variable | ${perf_trial_duration}
-| | Set Duration | ${duration}
-| | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
-| | Set Search Frame Size | ${framesize}
-| | Set Search Rate Type pps
-| | Set Binary Convergence Threshold | ${threshold}
-| | Binary Search | ${binary_min} | ${binary_max} | ${topology_type}
-| | ${rate_per_stream} | ${lat}= | Verify Search Result
-| | ${tmp}= | Create List | 100%NDR | ${lat}
-| | ${latency}= | Create List | ${tmp}
-| | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
-| | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
-| | ... | ${framesize} | ${topology_type}
-| | ${tmp}= | Create List | 50%NDR | ${lat_50p}
-| | Append To List | ${latency} | ${tmp}
-| | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
-| | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
-| | ... | ${framesize} | ${topology_type}
-| | ${tmp}= | Create List | 10%NDR | ${lat_10p}
-| | Append To List | ${latency} | ${tmp}
-| | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
-| | ... | ${latency}
-| | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
-| | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
+| | ${min_rate} = | Set Variable | ${20000}
+| | ${average} | ${stdev} = | Perform soak search | ${frame_size}
+| | ... | ${traffic_profile} | ${min_rate} | ${max_rate*2}
+| | ... | ${packet_loss_ratio} | timeout=${timeout}
+| | ${lower} | ${upper} = | Display result of soak search
+| | ... | ${average} | ${stdev} | ${frame_size}
+| | Should Not Be True | ${lower} < ${min_rate}
+| | ... | Lower bound ${lower} is below bidirectional minimum ${min_rate}.
 
-| Find PDR using binary search and pps
+| Display single bound
 | | [Documentation]
-| | ... | Find throughput by using RFC2544 binary search with partial drop rate
-| | ... | with PDR threshold and type specified by parameter.
+| | ... | Display one bound of NDR+PDR search,
+| | ... | in packet per seconds (total and per stream)
+| | ... | and Gbps total bandwidth with untagged packet.
+| | ... | Througput is calculated as:
+| | ... | Measured rate per stream * Total number of streams
+| | ... | Bandwidth is calculated as:
+| | ... | (Throughput * (L2 Frame Size + IPG) * 8) / Max bitrate of NIC
+| | ... | The given result should contain latency data as well.
 | | ...
 | | ... | *Arguments:*
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - binary_min - Lower boundary of search [pps]. Type: float
-| | ... | - binary_max - Upper boundary of search [pps]. Type: float
-| | ... | - topology_type - Topology type. Type: string
-| | ... | - min_rate - Lower limit of search [pps]. Type: float
-| | ... | - max_rate - Upper limit of search [pps]. Type: float
-| | ... | - threshold - Threshold to stop search [pps]. Type: integer
-| | ... | - loss_acceptance - Accepted loss during search. Type: float
-| | ... | - loss_acceptance_type - Percentage or frames. Type: string
+| | ... | - text - Flavor text describing which bound is this. Type: string
+| | ... | - rate_total - Total (not per stream) measured Tr [pps]. Type: float
+| | ... | - frame_size - L2 Frame Size [B]. Type: integer
+| | ... | - latency - Latency data to display if non-empty. Type: string
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Find PDR using binary search and pps \| 64 \| 6000000 \
-| | ... | \| 12000000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 50000 \| 0.5 \
-| | ... | \| percentage \|
-| | ...
-| | [Arguments] | ${framesize} | ${binary_min} | ${binary_max}
-| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
-| | ...
-| | ${duration}= | Set Variable | ${perf_trial_duration}
-| | Set Duration | ${duration}
-| | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
-| | Set Search Frame Size | ${framesize}
-| | Set Search Rate Type pps
-| | Set Loss Acceptance | ${loss_acceptance}
-| | Run Keyword If | '${loss_acceptance_type}' == 'percentage'
-| | ... | Set Loss Acceptance Type Percentage
-| | Set Binary Convergence Threshold | ${threshold}
-| | Binary Search | ${binary_min} | ${binary_max} | ${topology_type}
-| | ${rate_per_stream} | ${lat}= | Verify Search Result
-| | ${tmp}= | Create List | 100%PDR | ${lat}
-| | ${latency}= | Create List | ${tmp}
-| | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2
-| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
-| | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps
-| | ... | ${framesize} | ${topology_type} | ${loss_acceptance}
-| | ... | ${loss_acceptance_type} | fail_on_loss=${False}
-
-| Find NDR using combined search and pps
-| | [Documentation]
-| | ... | Find throughput by using RFC2544 combined search (linear+binary) with
-| | ... | non drop rate.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - start_rate - Initial start rate [pps]. Type: float
-| | ... | - step_rate - Step of linear search [pps]. Type: float
-| | ... | - topology_type - Topology type. Type: string
-| | ... | - min_rate - Lower limit of search [pps]. Type: float
-| | ... | - max_rate - Upper limit of search [pps]. Type: float
-| | ... | - threshold - Threshold to stop search [pps]. Type: integer
-| | ...
-| | ... | *Example:*
+| | ... | \| Display single bound \| NDR lower bound \| \${12345.67} \
+| | ... | \| \${64} \| show_latency=\${EMPTY} \|
 | | ...
-| | ... | \| Find NDR using combined search and pps \| 64 \| 5000000 \
-| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 5000 \|
-| | ...
-| | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | ...
-| | ${duration}= | Set Variable | ${perf_trial_duration}
-| | Set Duration | ${duration}
-| | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
-| | Set Search Linear Step | ${step_rate}
-| | Set Search Frame Size | ${framesize}
-| | Set Search Rate Type pps
-| | Set Binary Convergence Threshold | ${threshold}
-| | Combined Search | ${start_rate} | ${topology_type}
-| | ${rate_per_stream} | ${lat}= | Verify Search Result
-| | ${tmp}= | Create List | 100%NDR | ${lat}
-| | ${latency}= | Create List | ${tmp}
-| | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
-| | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
-| | ... | ${framesize} | ${topology_type}
-| | ${tmp}= | Create List | 50%NDR | ${lat_50p}
-| | Append To List | ${latency} | ${tmp}
-| | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
-| | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
-| | ... | ${framesize} | ${topology_type}
-| | ${tmp}= | Create List | 10%NDR | ${lat_10p}
-| | Append To List | ${latency} | ${tmp}
-| | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
-| | ... | ${latency}
-| | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
-| | ... | ${framesize} | ${topology_type}
-| | ... | fail_on_loss=${False}
-
-| Find PDR using combined search and pps
-| | [Documentation]
-| | ... | Find throughput by using RFC2544 combined search (linear+binary) with
-| | ... | partial drop rate with PDR threshold and type specified by parameter.
+| | [Arguments] | ${text} | ${rate_total} | ${frame_size} | ${latency}=${EMPTY}
 | | ...
-| | ... | *Arguments:*
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - start_rate - Initial start rate [pps]. Type: float
-| | ... | - step_rate - Step of linear search [pps]. Type: float
-| | ... | - topology_type - Topology type. Type: string
-| | ... | - min_rate - Lower limit of search [pps]. Type: float
-| | ... | - max_rate - Upper limit of search [pps]. Type: float
-| | ... | - threshold - Threshold to stop search [pps]. Type: integer
-| | ... | - loss_acceptance - Accepted loss during search. Type: float
-| | ... | - loss_acceptance_type - Percentage or frames. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Find PDR using combined search and pps \| 64 \| 5000000 \
-| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 5000 \| 0.5 \
-| | ... | \| percentage \|
-| | ...
-| | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
-| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames'
-| | ...
-| | ${duration}= | Set Variable | ${perf_trial_duration}
-| | Set Duration | ${duration}
-| | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
-| | Set Search Linear Step | ${step_rate}
-| | Set Search Frame Size | ${framesize}
-| | Set Search Rate Type pps
-| | Set Loss Acceptance | ${loss_acceptance}
-| | Run Keyword If | '${loss_acceptance_type}' == 'percentage'
-| | ... | Set Loss Acceptance Type Percentage
-| | Set Binary Convergence Threshold | ${threshold}
-| | Combined Search | ${start_rate} | ${topology_type}
-| | ${rate_per_stream} | ${lat}= | Verify Search Result
-| | ${tmp}= | Create List | 100%PDR | ${lat}
-| | ${latency}= | Create List | ${tmp}
-| | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2
-| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
-| | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps
-| | ... | ${framesize} | ${topology_type} | ${loss_acceptance}
-| | ... | ${loss_acceptance_type} | fail_on_loss=${False}
+| | ${bandwidth_total} = | Evaluate | ${rate_total} * (${frame_size}+20)*8 / 1e9
+| | Set Test Message | ${\n}${text}: ${rate_total} pps, | append=yes
+| | Set Test Message | ${bandwidth_total} Gbps (untagged) | append=yes
+| | Return From Keyword If | not """${latency}"""
+| | Set Test Message | ${\n}LATENCY usec [min/avg/max] per stream: ${latency}
+| | ... | append=yes
 
-| Display result of NDR search
+| Display result of NDRPDR search
 | | [Documentation]
-| | ... | Display result of NDR search in packet per seconds (total and per
-| | ... | stream) and Gbps total bandwidth with untagged packet.
+| | ... | Display result of NDR+PDR search, both quantities, both bounds,
+| | ... | in packet per seconds (total and per stream)
+| | ... | and Gbps total bandwidth with untagged packet.
 | | ... | Througput is calculated as:
 | | ... | Measured rate per stream * Total number of streams
 | | ... | Bandwidth is calculated as:
 | | ... | (Throughput * (L2 Frame Size + IPG) * 8) / Max bitrate of NIC
+| | ... | The given result should contain latency data as well.
 | | ...
 | | ... | *Arguments:*
-| | ... | - rate_per_stream - Measured rate per stream [pps]. Type: string
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - nr_streams - Total number of streams. Type: integer
-| | ... | - latency - Latency stats. Type: dictionary
+| | ... | - result - Measured result data per stream [pps]. Type: NdrPdrResult
+| | ... | - frame_size - L2 Frame Size [B]. Type: integer
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Display result of NDR search \| 4400000 \| 64 \| 2 \
-| | ... | \| [100%NDR, [10/10/10, 1/2/3]] \|
-| | ...
-| | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams} | ${latency}
-| | ...
-| | ${framesize}= | Get Frame Size | ${framesize}
-| | ${rate_total}= | Evaluate | ${rate_per_stream}*${nr_streams}
-| | ${bandwidth_total}= | Evaluate | ${rate_total}*(${framesize}+20)*8/(10**9)
-| | Set Test Message | FINAL_RATE: ${rate_total} pps
-| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps) | append=yes
-| | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
-| | ... | append=yes
-| | Set Test Message | ${\n}LATENCY usec [min/avg/max] | append=yes
-| | :FOR | ${lat} | IN | @{latency}
-| | | Set Test Message | ${\n}LAT_${lat[0]}: ${lat[1]} | append=yes
+| | ... | \| Display result of NDRPDR search \| \${result} \| \${64} \|
+| | ...
+| | [Arguments] | ${result} | ${frame_size}
+| | ...
+| | ${frame_size} = | Get Average Frame Size | ${frame_size}
+| | Display single bound | NDR_LOWER
+| | ... | ${result.ndr_interval.measured_low.transmit_rate} | ${frame_size}
+| | ... | ${result.ndr_interval.measured_low.latency}
+| | Display single bound | NDR_UPPER
+| | ... | ${result.ndr_interval.measured_high.transmit_rate} | ${frame_size}
+| | Display single bound | PDR_LOWER
+| | ... | ${result.pdr_interval.measured_low.transmit_rate} | ${frame_size}
+| | ... | ${result.pdr_interval.measured_low.latency}
+| | Display single bound | PDR_UPPER
+| | ... | ${result.pdr_interval.measured_high.transmit_rate} | ${frame_size}
 
-| Display result of PDR search
+| Display result of soak search
 | | [Documentation]
-| | ... | Display result of PDR search in packet per seconds (total and per
-| | ... | stream) and Gbps total bandwidth with untagged packet.
+| | ... | Display result of soak search, avg+-stdev, as upper/lower bounds,
+| | ... | in packet per seconds (total and per stream)
+| | ... | and Gbps total bandwidth with untagged packet.
 | | ... | Througput is calculated as:
 | | ... | Measured rate per stream * Total number of streams
 | | ... | Bandwidth is calculated as:
 | | ... | (Throughput * (L2 Frame Size + IPG) * 8) / Max bitrate of NIC
+| | ... | TODO: Do we want to report some latency data,
+| | ... | even if not measured at the reported bounds?.
 | | ...
 | | ... | *Arguments:*
-| | ... | - rate_per_stream - Measured rate per stream [pps]. Type: string
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - nr_streams - Total number of streams. Type: integer
-| | ... | - loss_acceptance - Accepted loss during search. Type: float
-| | ... | - loss_acceptance_type - Percentage or frames. Type: string
-| | ... | - latency - Latency stats. Type: dictionary
+| | ... | - avg - Estimated average critical load [pps]. Type: float
+| | ... | - stdev - Standard deviation of critical load [pps]. Type: float
+| | ... | - frame_size - L2 Frame Size [B]. Type: integer
+| | ...
+| | ... | *Returns:*
+| | ... | - Lower and upper bound of critical load [pps]. Type: 2-tuple of float
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Display result of PDR search \| 4400000 \| 64 \| 2 \| 0.5 \
-| | ... | \| percentage \| [100%NDR, [10/10/10, 1/2/3]] \|
+| | ... | \| Display result of soak search \| \${100000} \| \${100} \| \${64} \|
 | | ...
-| | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams}
-| | ... | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
+| | [Arguments] | ${avg} | ${stdev} | ${frame_size}
 | | ...
-| | ${framesize}= | Get Frame Size | ${framesize}
-| | ${rate_total}= | Evaluate | ${rate_per_stream}*${nr_streams}
-| | ${bandwidth_total}= | Evaluate | ${rate_total}*(${framesize}+20)*8/(10**9)
-| | Set Test Message | FINAL_RATE: ${rate_total} pps
-| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps) | append=yes
-| | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
-| | ... | append=yes
-| | Set Test Message | ${\n}LATENCY usec [min/avg/max] | append=yes
-| | :FOR | ${lat} | IN | @{latency}
-| | | Set Test Message | ${\n}LAT_${lat[0]}: ${lat[1]} | append=yes
-| | Set Test Message
-| | ... | ${\n}LOSS_ACCEPTANCE: ${loss_acceptance} ${loss_acceptance_type}
-| | ... | append=yes
+| | ${frame_size} = | Get Average Frame Size | ${frame_size}
+| | ${avg} = | Convert To Number | ${avg}
+| | ${stdev} = | Convert To Number | ${stdev}
+| | ${lower} = | Evaluate | ${avg} - ${stdev}
+| | ${upper} = | Evaluate | ${avg} + ${stdev}
+| | Display single bound | PLRsearch lower bound: | ${lower} | ${frame_size}
+| | Display single bound | PLRsearch upper bound: | ${upper} | ${frame_size}
+| | Return From Keyword | ${lower} | ${upper}
 
-| Display raw results
+| Check NDRPDR interval validity
 | | [Documentation]
-| | ... | Display raw results from TG in total received/send packets over trial
-| | ... | duration in seconds.
+| | ... | Extract loss ratio of lower bound of the interval.
+| | ... | Fail if it does not reach the allowed value.
 | | ...
 | | ... | *Arguments:*
-| | ... | - framesize - L2 Frame Size [B]. Type: integer
-| | ... | - results - Measured results. Type: string
+| | ... | - interval - Measured interval. Type: ReceiveRateInterval
+| | ... | - packet_loss_ratio - Accepted loss (0.0 for NDR). Type: float
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Display raw results \| 64 \| results \|
-| | ...
-| | [Arguments] | ${framesize} | ${results}
-| | ...
-| | ${framesize}= | Get Frame Size | ${framesize}
-| | @{tokens}= | Split String | ${results} | ,
-| | @{received}= | Split String | @{tokens}[1] | =
-| | @{sent}= | Split String | @{tokens}[2] | =
-| | ${total_received} = | Set Variable | @{received}[1]
-| | ${total_sent} = | Set Variable | @{sent}[1]
-| | Set Test Message | MaxReceivedRate_Results [pkts/${perf_trial_duration}sec]:
-| | Set Test Message | tx ${total_sent}, rx ${total_received} | append=yes
+| | ... | \| Check NDRPDR interval validity \| \${result.pdr_interval} \
+| | ... | \| \${0.005} \|
+| | ...
+| | [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}
+| | ${message}= | Catenate | SEPARATOR=${SPACE}
+| | ... | Minimal rate loss fraction ${lower_bound_lf}
+| | ... | 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}${\n}${message_zero} | ${message}${\n}${message_other}
+| | Fail | ${message}
 
-| Measure latency pps
+| Perform additional measurements based on NDRPDR result
 | | [Documentation]
-| | ... | Send traffic at specified rate. Measure min/avg/max latency
+| | ... | Perform any additional measurements which are not directly needed
+| | ... | for determining NDR nor PDR, but which are needed for gathering
+| | ... | additional data for debug purposes.
+| | ... | Currently, just "Traffic should pass with no loss" is called.
+| | ... | TODO: Move latency measurements from optimized search here.
 | | ...
 | | ... | *Arguments:*
-| | ... | - duration - Duration of traffic run [s]. Type: integer
-| | ... | - rate - Rate for sending packets. Type: integer
-| | ... | - framesize - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
-| | ... | - topology_type - Topology type. Type: string
+| | ... | - result - Measured result data per stream [pps]. Type: NdrPdrResult
+| | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str
+| | ... | - traffic_profile - Topology profile. Type: string
 | | ...
 | | ... | *Example:*
+| | ... | \| Perform additional measurements based on NDRPDR result \
+| | ... | \| \${result} \| ${64} \| 3-node-IPv4 \|
 | | ...
-| | ... | \| Measure latency \| 10 \| 4.0 \| 64 \| 3-node-IPv4 \|
+| | [Arguments] | ${result} | ${framesize} | ${traffic_profile}
 | | ...
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | ...
-| | Return From Keyword If | ${rate} <= 10000 | ${-1}
-| | Send traffic on tg | ${duration} | ${rate}pps | ${framesize}
-| | ... | ${topology_type} | warmup_time=0
-| | Run keyword and return | Get latency
+| | ${duration}= | Set Variable | 2.0
+| | ${rate_per_stream}= | Evaluate
+| | ... | ${result.ndr_interval.measured_low.target_tr} / 2.0
+| | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
+| | ... | ${framesize} | ${traffic_profile} | fail_on_loss=${False}
 
 | Traffic should pass with no loss
 | | [Documentation]
@@ -479,8 +280,9 @@
 | | ... | *Arguments:*
 | | ... | - duration - Duration of traffic run [s]. Type: integer
 | | ... | - rate - Rate for sending packets. Type: string
-| | ... | - framesize - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
-| | ... | - topology_type - Topology type. Type: string
+| | ... | - frame_size - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
+| | ... | - traffic_profile - Name of module defining traffc for measurements.
+| | ... | Type: string
 | | ... | - fail_on_loss - If True, the keyword fails if loss occurred.
 | | ... | Type: boolean
 | | ...
@@ -489,88 +291,102 @@
 | | ... | \| Traffic should pass with no loss \| 10 \| 4.0mpps \| 64 \
 | | ... | \| 3-node-IPv4 \|
 | | ...
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | [Arguments] | ${duration} | ${rate} | ${frame_size} | ${traffic_profile}
 | | ... | ${fail_on_loss}=${True}
 | | ...
-| | Send traffic at specified rate | ${duration} | ${rate} | ${framesize}
-| | ... | ${topology_type}
+| | Send traffic at specified rate | ${duration} | ${rate} | ${frame_size}
+| | ... | ${traffic_profile}
 | | Run Keyword If | ${fail_on_loss} | No traffic loss occurred
 
-| Traffic should pass with partial loss
-| | [Documentation]
-| | ... | Send traffic at specified rate. Partial packet loss is accepted
-| | ... | within loss acceptance value specified as argument.
-| | ...
-| | ... | *Arguments:*
-| | ... | - duration - Duration of traffic run [s]. Type: integer
-| | ... | - rate - Rate for sending packets. Type: string
-| | ... | - framesize - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
-| | ... | - topology_type - Topology type. Type: string
-| | ... | - loss_acceptance - Accepted loss during search. Type: float
-| | ... | - loss_acceptance_type - Percentage or frames. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Traffic should pass with partial loss \| 10 \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4 \| 0.5 \| percentage \|
-| | ...
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | ... | ${loss_acceptance} | ${loss_acceptance_type}
-| | ... | ${fail_on_loss}=${True}
-| | ...
-| | Send traffic at specified rate | ${duration} | ${rate} | ${framesize}
-| | ... | ${topology_type}
-| | Run Keyword If | ${fail_on_loss} | Partial traffic loss accepted
-| | ... | ${loss_acceptance} | ${loss_acceptance_type}
-
 | Traffic should pass with maximum rate
 | | [Documentation]
 | | ... | Send traffic at maximum rate.
 | | ...
+| | ... | Some inputs are read from variables to streamline suites.
+| | ...
+| | ... | *Test (or broader scope) variables read:*
+| | ... | - traffic_profile - Name of module defining traffc for measurements.
+| | ... | Type: string
+| | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str
+| | ... | - max_rate - Calculated unidirectional maximal transmit rate [pps].
+| | ... | Type: float
+| | ...
 | | ... | *Arguments:*
-| | ... | - duration - Duration of traffic run [s]. Type: integer
-| | ... | - rate - Rate for sending packets. Type: string
-| | ... | - framesize - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
-| | ... | - topology_type - Topology type. Type: string
-| | ... | Type: boolean
+| | ... | - subsamples - How many trials in this measurement. Type: int
+| | ... | - trial_duration - Duration of single trial [s]. Type: float
+| | ... | - fail_no_traffic - Whether to fail on zero receive count. Type: boolean
+| | ... | - unidirection - False if traffic is bidirectional. Type: boolean
+| | ... | - tx_port - TX port of TG, default 0. Type: integer
+| | ... | - rx_port - RX port of TG, default 1. Type: integer
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Traffic should pass with no loss \| 10 \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4 \|
+| | ... | \| Traffic should pass with maximum rate \| ${1} \| ${10.0} \|
+| | ... | \| ${False} \| ${False} \| ${0} \| ${1} \|
 | | ...
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | [Arguments] | ${trial_duration}=${perf_trial_duration}
+| | ... | ${fail_no_traffic}=${True} | ${subsamples}=${perf_trial_multiplicity}
+| | ... | ${unidirection}=${False} | ${tx_port}=${0} | ${rx_port}=${1}
 | | ...
-| | ${results}= | Send traffic at specified rate | ${duration} | ${rate}
-| | ... | ${framesize} | ${topology_type}
-| | Display raw results | ${framesize} | ${results}
+| | ${results} = | Send traffic at specified rate | ${trial_duration}
+| | ... | ${max_rate}pps | ${frame_size} | ${traffic_profile} | ${subsamples}
+| | ... | ${unidirection} | ${tx_port} | ${rx_port}
+| | Set Test Message | ${\n}Maximum Receive Rate trial results
+| | Set Test Message | in packets per second: ${results}
+| | ... | append=yes
+| | # TODO: Should we also report the percentage relative to transmit rate,
+| | # so that people looking at console can decide how close to 100% it is?
+| | Run Keyword If | ${fail_no_traffic} | Fail if no traffic forwarded
 
 | Send traffic at specified rate
 | | [Documentation]
 | | ... | Send traffic at specified rate.
+| | ... | Return list of measured receive rates.
+| | ... | The rate argument should be TRex friendly, so it should include "pps".
 | | ...
 | | ... | *Arguments:*
-| | ... | - duration - Duration of traffic run [s]. Type: integer
+| | ... | - trial_duration - Duration of single trial [s]. Type: float
 | | ... | - rate - Rate for sending packets. Type: string
-| | ... | - framesize - L2 Frame Size [B]. Type: integer/string
-| | ... | - topology_type - Topology type. Type: string
-| | ... | Type: boolean
+| | ... | - frame_size - L2 Frame Size [B]. Type: integer/string
+| | ... | - traffic_profile - Name of module defining traffc for measurements.
+| | ... | Type: string
+| | ... | - subsamples - How many trials in this measurement. Type: int
+| | ... | - unidirection - False if traffic is bidirectional. Type: boolean
+| | ... | - tx_port - TX port of TG, default 0. Type: integer
+| | ... | - rx_port - RX port of TG, default 1. Type: integer
+| | ... | - pkt_trace - True to enable packet trace. Type: boolean
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send traffic at specific rate \| 10 \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4 \|
+| | ... | \| Send traffic at specified rate \| ${1.0} \| 4.0mpps \| 64 \
+| | ... | \| 3-node-IPv4 \| ${10} \| ${False} \| ${0} | ${1} \| ${False}
 | | ...
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | [Arguments] | ${trial_duration} | ${rate} | ${frame_size}
+| | ... | ${traffic_profile} | ${subsamples}=${1} | ${unidirection}=${False}
+| | ... | ${tx_port}=${0} | ${rx_port}=${1} | ${pkt_trace}=${False}
 | | ...
-| | Clear and show runtime counters with running traffic | ${duration}
-| | ... | ${rate} | ${framesize} | ${topology_type}
+| | Clear and show runtime counters with running traffic | ${trial_duration}
+| | ... | ${rate} | ${frame_size} | ${traffic_profile}
+| | ... | ${unidirection} | ${tx_port} | ${rx_port}
 | | Run Keyword If | ${dut_stats}==${True} | Clear all counters on all DUTs
 | | Run Keyword If | ${dut_stats}==${True} and ${pkt_trace}==${True}
-| | ... | VPP Enable Traces On All DUTs | ${nodes}
-| | ${results} = | Send traffic on tg | ${duration} | ${rate} | ${framesize}
-| | ... | ${topology_type} | warmup_time=0
-| | Run Keyword If | ${dut_stats}==${True} | Show statistics on all DUTs | ${nodes}
+| | ... | VPP Enable Traces On All DUTs | ${nodes} | fail_on_error=${False}
+| | Run Keyword If | ${dut_stats}==${True}
+| | ... | VPP enable elog traces on all DUTs | ${nodes}
+| | ${results} = | Create List
+| | :FOR | ${i} | IN RANGE | ${subsamples}
+| | | # The following line is skipping some default arguments,
+| | | # that is why subsequent arguments have to be named.
+| | | Send traffic on tg | ${trial_duration} | ${rate} | ${frame_size}
+| | | ... | ${traffic_profile} | warmup_time=${0} | unidirection=${unidirection}
+| | | ... | tx_port=${tx_port} | rx_port=${rx_port}
+| | | ${rx} = | Get Received
+| | | ${rr} = | Evaluate | ${rx} / ${trial_duration}
+| | | Append To List | ${results} | ${rr}
+| | Run Keyword If | ${dut_stats}==${True} | Show event logger on all DUTs
+| | ... | ${nodes}
+| | Run Keyword If | ${dut_stats}==${True} | Show statistics on all DUTs
+| | ... | ${nodes}
 | | Run Keyword If | ${dut_stats}==${True} and ${pkt_trace}==${True}
 | | ... | Show Packet Trace On All Duts | ${nodes} | maximum=${100}
 | | Return From Keyword | ${results}
@@ -584,18 +400,25 @@
 | | ... | *Arguments:*
 | | ... | - duration - Duration of traffic run [s]. Type: integer
 | | ... | - rate - Rate for sending packets. Type: string
-| | ... | - framesize - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
-| | ... | - topology_type - Topology type. Type: string
+| | ... | - frame_size - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
+| | ... | - traffic_profile - Name of module defining traffc for measurements.
+| | ... | Type: string
+| | ... | - unidirection - False if traffic is bidirectional. Type: boolean
+| | ... | - tx_port - TX port of TG, default 0. Type: integer
+| | ... | - rx_port - RX port of TG, default 1. Type: integer
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Traffic should pass with partial loss \| 10 \| 4.0mpps \| 64 \
-| | ... | \| 3-node-IPv4 \| 0.5 \| percentage \|
+| | ... | \| Clear and show runtime counters with running traffic \| 10 \
+| | ... | \| 4.0mpps \| 64 \| 3-node-IPv4 \| ${False} \| ${0} | ${1} \|
 | | ...
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | [Arguments] | ${duration} | ${rate} | ${frame_size} | ${traffic_profile}
+| | ... | ${unidirection}=${False} | ${tx_port}=${0} | ${rx_port}=${1}
 | | ...
-| | Send traffic on tg | -1 | ${rate} | ${framesize} | ${topology_type}
-| | ... | warmup_time=0 | async_call=${True} | latency=${False}
+| | # Duration of -1 means we will stop traffic manually.
+| | Send traffic on tg | ${-1} | ${rate} | ${frame_size} | ${traffic_profile}
+| | ... | warmup_time=${0} | async_call=${True} | latency=${False}
+| | ... | unidirection=${unidirection} | tx_port=${tx_port} | rx_port=${rx_port}
 | | Run Keyword If | ${dut_stats}==${True}
 | | ... | Clear runtime counters on all DUTs | ${nodes}
 | | Sleep | ${duration}