CSIT-1186: Add srv6 NDRPDR suites

Delete the corresponding ndrpdrdisc suites.

MRR suites are also edited,
to make them less different from NDRPDR suites.

Now, there is a script to re-generate testcases of selected suites.
For that, resources/libraries/python/autogen is created,
with Regenerator holding the most of script logic.

The script looks at files matching a glob expression,
reuses a "prolog", but overwites test cases with the default template
and hardcoded set of testcase arguments.

Also, handling of overhead size has been simplified,
using new keyword Get Max Rate And Jumbo And Handle Multi Seg.

Default value for search timeout is increased to 12 minutes
to make timeout failures less frequent.

Change-Id: I394ad61f262b3078e5ca719034b15ada48987ee0
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

13 files changed, 616 insertions, 620 deletions

diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
index 1a42090412..689ff32e51 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
@@ -87,66 +87,62 @@
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${phy_cores} | ${framesize} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_nosrh}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_nosrh}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '1' x SID 'with' decapsulation in 3-node circular topology
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| tc01-78B-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Tags] | 78B | 1C
-| | phy_cores=${1} | framesize=${78}
-
-| tc02-1518B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 1518B | 1C
-| | phy_cores=${1} | framesize=${1518}
+| | framesize=${78} | phy_cores=${1}
 
-| tc03-9000B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 9000B | 1C
-| | phy_cores=${1} | framesize=${9000}
+| tc02-78B-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc04-IMIX-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | IMIX | 1C
-| | phy_cores=${1} | framesize=IMIX_v4_1
+| tc03-78B-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc05-78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 78B | 2C
-| | phy_cores=${2} | framesize=${78}
+| tc04-1518B-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc06-1518B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| tc05-1518B-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Tags] | 1518B | 2C
-| | phy_cores=${2} | framesize=${1518}
-
-| tc07-9000B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 9000B | 2C
-| | phy_cores=${2} | framesize=${9000}
+| | framesize=${1518} | phy_cores=${2}
 
-| tc08-IMIX-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | IMIX | 2C
-| | phy_cores=${2} | framesize=IMIX_v4_1
+| tc06-1518B-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc09-78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 78B | 4C
-| | phy_cores=${4} | framesize=${78}
+| tc07-9000B-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc10-1518B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 1518B | 4C
-| | phy_cores=${4} | framesize=${1518}
+| tc08-9000B-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc11-9000B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| tc09-9000B-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Tags] | 9000B | 4C
-| | phy_cores=${4} | framesize=${9000}
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
+| tc12-IMIX-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Tags] | IMIX | 4C
-| | phy_cores=${4} | framesize=IMIX_v4_1
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
index eef92a22b6..1b1d00e9c3 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,7 +26,7 @@
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *Packet throughput Segment routing over IPv6 dataplane with\
 | ... | one SID (SRH not inserted) test cases*
@@ -43,9 +43,8 @@
 | ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
 | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
 | ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
 | ... | (flow-group per direction, 253 flows per flow-group) with\
 | ... | all packets containing Ethernet header,IPv6 header with static payload.\
@@ -79,78 +78,79 @@
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 
 *** Keywords ***
-| Local template
-| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
-| | ... | ${min_rate}=${50000} | ${rxq}=${None}
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT1 and DUT2 are configured with IPv6\
+| | ... | routing and static route, SR policy and steering policy for one\
+| | ... | direction and one SR behaviour (function) - End - for other direction.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... |   Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_nosrh}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_nosrh}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '1' x SID 'with' decapsulation in 3-node circular topology
-| | Then Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
-| | [Tags] | 78B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${78}  | search_type=NDR
+| tc01-78B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 78B | 1C
+| | framesize=${78} | phy_cores=${1}
 
-| tc02-78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
-| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${78}  | search_type=PDR
+| tc02-78B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc03-78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
-| | [Tags] | 78B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${78}  | search_type=NDR
+| tc03-78B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc04-78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
-| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${78}  | search_type=PDR
+| tc04-1518B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc05-78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
-| | [Tags] | 78B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${78}  | search_type=NDR
+| tc05-1518B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
 
-| tc06-78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
-| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${78}  | search_type=PDR
+| tc06-1518B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc07-1518B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
-| | [Tags] | 1518B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${1518}  | search_type=NDR
+| tc07-9000B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc08-1518B-1t1c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${1518}  | search_type=PDR
+| tc08-9000B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc09-1518B-2t2c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
-| | [Tags] | 1518B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${1518}  | search_type=NDR
+| tc09-9000B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc10-1518B-2t2c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${1518}  | search_type=PDR
+| tc10-IMIX-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-1518B-4t4c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
-| | [Tags] | 1518B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${1518}  | search_type=NDR
+| tc11-IMIX-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-1518B-4t4c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${1518}  | search_type=PDR
+| tc12-IMIX-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
index 51af0b1f7a..a89c468f22 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
@@ -90,66 +90,62 @@
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${phy_cores} | ${framesize} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_2sids}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_2sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'with' decapsulation in 3-node circular topology
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Tags] | 78B | 1C
-| | phy_cores=${1} | framesize=${78}
-
-| tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 1518B | 1C
-| | phy_cores=${1} | framesize=${1518}
+| | framesize=${78} | phy_cores=${1}
 
-| tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 9000B | 1C
-| | phy_cores=${1} | framesize=${9000}
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | IMIX | 1C
-| | phy_cores=${1} | framesize=IMIX_v4_1
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc05-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 78B | 2C
-| | phy_cores=${2} | framesize=${78}
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Tags] | 1518B | 2C
-| | phy_cores=${2} | framesize=${1518}
-
-| tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 9000B | 2C
-| | phy_cores=${2} | framesize=${9000}
+| | framesize=${1518} | phy_cores=${2}
 
-| tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | IMIX | 2C
-| | phy_cores=${2} | framesize=IMIX_v4_1
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc09-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 78B | 4C
-| | phy_cores=${4} | framesize=${78}
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 1518B | 4C
-| | phy_cores=${4} | framesize=${1518}
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Tags] | 9000B | 4C
-| | phy_cores=${4} | framesize=${9000}
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Tags] | IMIX | 4C
-| | phy_cores=${4} | framesize=IMIX_v4_1
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
index 68f1bc4780..d481b7e89b 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,7 +26,7 @@
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *Packet throughput Segment routing over IPv6 dataplane with\
 | ... | two SIDs (SRH inserted) test cases*
@@ -44,9 +44,8 @@
 | ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
 | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
 | ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
 | ... | (flow-group per direction, 253 flows per flow-group) with\
 | ... | all packets containing Ethernet header,IPv6 header with static payload.\
@@ -62,6 +61,7 @@
 | ${dut1_sid2_1}= | 2003:2::
 | ${dut1_sid2_2}= | 2003:3::
 | ${dut1_bsid}= | 2002:1::1
+| ${dut2_sid1}= | 2002:2::
 | ${dut2_sid1_1}= | 2002:2::
 | ${dut2_sid1_2}= | 2002:3::
 | ${dut2_sid2}= | 2003:1::
@@ -82,78 +82,79 @@
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 
 *** Keywords ***
-| Local template
-| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
-| | ... | ${min_rate}=${50000} | ${rxq}=${None}
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT1 and DUT2 are configured with IPv6\
+| | ... | routing and static route, SR policy and steering policy for one\
+| | ... | direction and one SR behaviour (function) - End - for other direction.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... |   Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_2sids}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_2sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'with' decapsulation in 3-node circular topology
-| | Then Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
-| | [Tags] | 78B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${78}  | search_type=NDR
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 78B | 1C
+| | framesize=${78} | phy_cores=${1}
 
-| tc02-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
-| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${78}  | search_type=PDR
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc03-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
-| | [Tags] | 78B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${78}  | search_type=NDR
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc04-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
-| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${78}  | search_type=PDR
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc05-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
-| | [Tags] | 78B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${78}  | search_type=NDR
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
 
-| tc06-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
-| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${78}  | search_type=PDR
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
-| | [Tags] | 1518B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${1518}  | search_type=NDR
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${1518}  | search_type=PDR
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
-| | [Tags] | 1518B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${1518}  | search_type=NDR
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${1518}  | search_type=PDR
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
-| | [Tags] | 1518B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${1518}  | search_type=NDR
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${1518}  | search_type=PDR
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
index fd1139faea..017a317cf0 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
@@ -89,66 +89,62 @@
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${phy_cores} | ${framesize} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_2sids}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_2sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'without' decapsulation in 3-node circular topology
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Tags] | 78B | 1C
-| | phy_cores=${1} | framesize=${78}
-
-| tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 1518B | 1C
-| | phy_cores=${1} | framesize=${1518}
+| | framesize=${78} | phy_cores=${1}
 
-| tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 9000B | 1C
-| | phy_cores=${1} | framesize=${9000}
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | IMIX | 1C
-| | phy_cores=${1} | framesize=IMIX_v4_1
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc05-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 78B | 2C
-| | phy_cores=${2} | framesize=${78}
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Tags] | 1518B | 2C
-| | phy_cores=${2} | framesize=${1518}
-
-| tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 9000B | 2C
-| | phy_cores=${2} | framesize=${9000}
+| | framesize=${1518} | phy_cores=${2}
 
-| tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | IMIX | 2C
-| | phy_cores=${2} | framesize=IMIX_v4_1
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc09-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 78B | 4C
-| | phy_cores=${4} | framesize=${78}
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 1518B | 4C
-| | phy_cores=${4} | framesize=${1518}
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Tags] | 9000B | 4C
-| | phy_cores=${4} | framesize=${9000}
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Tags] | IMIX | 4C
-| | phy_cores=${4} | framesize=IMIX_v4_1
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
index af17be5fd3..a2b5d049e7 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,7 +26,7 @@
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *Packet throughput Segment routing over IPv6 dataplane with\
 | ... | two SIDs (SRH inserted) without decapsulation test cases*
@@ -43,9 +43,8 @@
 | ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
 | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
 | ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
 | ... | (flow-group per direction, 253 flows per flow-group) with\
 | ... | all packets containing Ethernet header,IPv6 header with static payload.\
@@ -61,6 +60,7 @@
 | ${dut1_sid2_1}= | 2003:2::
 | ${dut1_sid2_2}= | 2003:3::
 | ${dut1_bsid}= | 2002:1::1
+| ${dut2_sid1}= | 2002:2::
 | ${dut2_sid1_1}= | 2002:2::
 | ${dut2_sid1_2}= | 2002:3::
 | ${dut2_sid2}= | 2003:1::
@@ -81,78 +81,79 @@
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 
 *** Keywords ***
-| Local template
-| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
-| | ... | ${min_rate}=${50000} | ${rxq}=${None}
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT1 and DUT2 are configured with IPv6\
+| | ... | routing and static route, SR policy and steering policy for one\
+| | ... | direction and one SR behaviour (function) - End - for other direction.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... |   Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_2sids}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_2sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'without' decapsulation in 3-node circular topology
-| | Then Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
-| | [Tags] | 78B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${78}  | search_type=NDR
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 78B | 1C
+| | framesize=${78} | phy_cores=${1}
 
-| tc02-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
-| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${78}  | search_type=PDR
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc03-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
-| | [Tags] | 78B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${78}  | search_type=NDR
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc04-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
-| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${78}  | search_type=PDR
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc05-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
-| | [Tags] | 78B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${78}  | search_type=NDR
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
 
-| tc06-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
-| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${78}  | search_type=PDR
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
-| | [Tags] | 1518B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${1518}  | search_type=NDR
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${1518}  | search_type=PDR
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
-| | [Tags] | 1518B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${1518}  | search_type=NDR
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${1518}  | search_type=PDR
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
-| | [Tags] | 1518B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${1518}  | search_type=NDR
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${1518}  | search_type=PDR
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
index d6f3a84999..7bb1e27d23 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
@@ -113,67 +113,62 @@
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${phy_cores} | ${framesize} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_3sids}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} + ${srv6_overhead_3sids} < ${1522}
-| | ... | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Tags] | 78B | 1C
-| | phy_cores=${1} | framesize=${78}
-
-| tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 1518B | 1C
-| | phy_cores=${1} | framesize=${1518}
+| | framesize=${78} | phy_cores=${1}
 
-| tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 9000B | 1C
-| | phy_cores=${1} | framesize=${9000}
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | IMIX | 1C
-| | phy_cores=${1} | framesize=IMIX_v4_1
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc05-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 78B | 2C
-| | phy_cores=${2} | framesize=${78}
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Tags] | 1518B | 2C
-| | phy_cores=${2} | framesize=${1518}
-
-| tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 9000B | 2C
-| | phy_cores=${2} | framesize=${9000}
+| | framesize=${1518} | phy_cores=${2}
 
-| tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | IMIX | 2C
-| | phy_cores=${2} | framesize=IMIX_v4_1
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc09-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 78B | 4C
-| | phy_cores=${4} | framesize=${78}
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 1518B | 4C
-| | phy_cores=${4} | framesize=${1518}
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Tags] | 9000B | 4C
-| | phy_cores=${4} | framesize=${9000}
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Tags] | IMIX | 4C
-| | phy_cores=${4} | framesize=IMIX_v4_1
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
index a50f6a33cc..968d11ecb0 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
 | ... | SRv6_PROXY_DYN | MEMIF | LXC
 | ...
@@ -32,7 +32,7 @@
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *Packet throughput Segment routing over IPv6 dataplane with\
 | ... | Dynamic SRv6 proxy test cases*
@@ -50,9 +50,8 @@
 | ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
 | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
 | ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
 | ... | (flow-group per direction, 253 flows per flow-group) with\
 | ... | all packets containing Ethernet header,IPv6 header with static payload.\
@@ -68,6 +67,7 @@
 | ${dut1_sid2}= | 2003:2::
 | ${dut1_bsid}= | 2002:1::1
 | ${dut2_sid1}= | 2002:2::
+| ${dut2_sid1}= | 2002:2::
 | ${dut2_sid2}= | 2003:1::
 | ${dut2_bsid}= | 2003:1::1
 | ${out_sid1_1}= | 2002:3::
@@ -78,6 +78,7 @@
 # IP settings
 | ${tg_if1_ip6_subnet}= | 2001:1::
 | ${tg_if2_ip6_subnet}= | 2001:2::
+| ${dst_addr_nr}= | ${1}
 | ${dut1_if1_ip6}= | 2001:1::1
 | ${dut1_if2_ip6}= | 2001:3::1
 | ${dut1-memif-1-if1_ip6}= | 3001:1::1
@@ -105,79 +106,79 @@
 | ${container_cpus}= | ${5}
 
 *** Keywords ***
-| Local template
-| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
-| | ... | ${min_rate}=${50000} | ${rxq}=${None}
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT1 and DUT2 are configured with IPv6\
+| | ... | routing and static route, SR policy and steering policy for one\
+| | ... | direction and one SR behaviour (function) - End - for other direction.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... |   Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_3sids}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} + ${srv6_overhead_3sids} < ${1522}
-| | ... | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
-| | Then Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
-| | [Tags] | 78B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${78}  | search_type=NDR
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 78B | 1C
+| | framesize=${78} | phy_cores=${1}
 
-| tc02-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
-| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${78}  | search_type=PDR
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc03-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
-| | [Tags] | 78B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${78}  | search_type=NDR
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc04-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
-| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${78}  | search_type=PDR
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc05-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
-| | [Tags] | 78B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${78}  | search_type=NDR
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
 
-| tc06-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
-| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${78}  | search_type=PDR
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
-| | [Tags] | 1518B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${1518}  | search_type=NDR
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${1518}  | search_type=PDR
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
-| | [Tags] | 1518B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${1518}  | search_type=NDR
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${1518}  | search_type=PDR
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
-| | [Tags] | 1518B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${1518}  | search_type=NDR
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${1518}  | search_type=PDR
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
index f49fc852b4..85ec7b9b6a 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
@@ -113,67 +113,62 @@
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${phy_cores} | ${framesize} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_3sids}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} + ${srv6_overhead_3sids} < ${1522}
-| | ... | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Tags] | 78B | 1C
-| | phy_cores=${1} | framesize=${78}
-
-| tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 1518B | 1C
-| | phy_cores=${1} | framesize=${1518}
+| | framesize=${78} | phy_cores=${1}
 
-| tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 9000B | 1C
-| | phy_cores=${1} | framesize=${9000}
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | IMIX | 1C
-| | phy_cores=${1} | framesize=IMIX_v4_1
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc05-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 78B | 2C
-| | phy_cores=${2} | framesize=${78}
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Tags] | 1518B | 2C
-| | phy_cores=${2} | framesize=${1518}
-
-| tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 9000B | 2C
-| | phy_cores=${2} | framesize=${9000}
+| | framesize=${1518} | phy_cores=${2}
 
-| tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | IMIX | 2C
-| | phy_cores=${2} | framesize=IMIX_v4_1
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc09-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 78B | 4C
-| | phy_cores=${4} | framesize=${78}
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 1518B | 4C
-| | phy_cores=${4} | framesize=${1518}
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Tags] | 9000B | 4C
-| | phy_cores=${4} | framesize=${9000}
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Tags] | IMIX | 4C
-| | phy_cores=${4} | framesize=IMIX_v4_1
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
index 7066f619b7..1bd5cbc29c 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
 | ... | SRv6_PROXY_MASQ | MEMIF | LXC
 | ...
@@ -32,7 +32,7 @@
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *Packet throughput Segment routing over IPv6 dataplane with\
 | ... | Masquerading SRv6 proxy test cases*
@@ -50,9 +50,8 @@
 | ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
 | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
 | ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
 | ... | (flow-group per direction, 253 flows per flow-group) with\
 | ... | all packets containing Ethernet header,IPv6 header with static payload.\
@@ -68,6 +67,7 @@
 | ${dut1_sid2}= | 2003:2::
 | ${dut1_bsid}= | 2002:1::1
 | ${dut2_sid1}= | 2002:2::
+| ${dut2_sid1}= | 2002:2::
 | ${dut2_sid2}= | 2003:1::
 | ${dut2_bsid}= | 2003:1::1
 | ${out_sid1_1}= | 2002:3::
@@ -78,6 +78,7 @@
 # IP settings
 | ${tg_if1_ip6_subnet}= | 2001:1::
 | ${tg_if2_ip6_subnet}= | 2001:2::
+| ${dst_addr_nr}= | ${1}
 | ${dut1_if1_ip6}= | 2001:1::1
 | ${dut1_if2_ip6}= | 2001:3::1
 | ${dut1-memif-1-if1_ip6}= | 3001:1::1
@@ -105,79 +106,79 @@
 | ${container_cpus}= | ${5}
 
 *** Keywords ***
-| Local template
-| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
-| | ... | ${min_rate}=${50000} | ${rxq}=${None}
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT1 and DUT2 are configured with IPv6\
+| | ... | routing and static route, SR policy and steering policy for one\
+| | ... | direction and one SR behaviour (function) - End - for other direction.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... |   Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_3sids}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} + ${srv6_overhead_3sids} < ${1522}
-| | ... | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
-| | Then Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
-| | [Tags] | 78B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${78}  | search_type=NDR
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 78B | 1C
+| | framesize=${78} | phy_cores=${1}
 
-| tc02-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
-| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${78}  | search_type=PDR
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc03-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
-| | [Tags] | 78B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${78}  | search_type=NDR
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc04-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
-| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${78}  | search_type=PDR
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc05-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
-| | [Tags] | 78B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${78}  | search_type=NDR
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
 
-| tc06-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
-| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${78}  | search_type=PDR
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
-| | [Tags] | 1518B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${1518}  | search_type=NDR
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${1518}  | search_type=PDR
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
-| | [Tags] | 1518B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${1518}  | search_type=NDR
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${1518}  | search_type=PDR
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
-| | [Tags] | 1518B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${1518}  | search_type=NDR
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${1518}  | search_type=PDR
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
index 0be9ccda27..cf4d1fd1fc 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
@@ -113,67 +113,62 @@
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${phy_cores} | ${framesize} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_3sids}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} + ${srv6_overhead_3sids} < ${1522}
-| | ... | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Tags] | 78B | 1C
-| | phy_cores=${1} | framesize=${78}
-
-| tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 1518B | 1C
-| | phy_cores=${1} | framesize=${1518}
+| | framesize=${78} | phy_cores=${1}
 
-| tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 9000B | 1C
-| | phy_cores=${1} | framesize=${9000}
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | IMIX | 1C
-| | phy_cores=${1} | framesize=IMIX_v4_1
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc05-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 78B | 2C
-| | phy_cores=${2} | framesize=${78}
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Tags] | 1518B | 2C
-| | phy_cores=${2} | framesize=${1518}
-
-| tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 9000B | 2C
-| | phy_cores=${2} | framesize=${9000}
+| | framesize=${1518} | phy_cores=${2}
 
-| tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | IMIX | 2C
-| | phy_cores=${2} | framesize=IMIX_v4_1
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc09-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 78B | 4C
-| | phy_cores=${4} | framesize=${78}
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 1518B | 4C
-| | phy_cores=${4} | framesize=${1518}
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Tags] | 9000B | 4C
-| | phy_cores=${4} | framesize=${9000}
+| | framesize=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Tags] | IMIX | 4C
-| | phy_cores=${4} | framesize=IMIX_v4_1
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
index b17d023b73..c8576c2e5c 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
 | ... | SRv6_PROXY_STAT | MEMIF | LXC
 | ...
@@ -32,7 +32,7 @@
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *Packet throughput Segment routing over IPv6 dataplane with\
 | ... | Static SRv6 proxy test cases*
@@ -50,9 +50,8 @@
 | ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
 | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
 | ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
 | ... | (flow-group per direction, 253 flows per flow-group) with\
 | ... | all packets containing Ethernet header,IPv6 header with static payload.\
@@ -68,6 +67,7 @@
 | ${dut1_sid2}= | 2003:2::
 | ${dut1_bsid}= | 2002:1::1
 | ${dut2_sid1}= | 2002:2::
+| ${dut2_sid1}= | 2002:2::
 | ${dut2_sid2}= | 2003:1::
 | ${dut2_bsid}= | 2003:1::1
 | ${out_sid1_1}= | 2002:3::
@@ -78,6 +78,7 @@
 # IP settings
 | ${tg_if1_ip6_subnet}= | 2001:1::
 | ${tg_if2_ip6_subnet}= | 2001:2::
+| ${dst_addr_nr}= | ${1}
 | ${dut1_if1_ip6}= | 2001:1::1
 | ${dut1_if2_ip6}= | 2001:3::1
 | ${dut1-memif-1-if1_ip6}= | 3001:1::1
@@ -105,79 +106,79 @@
 | ${container_cpus}= | ${5}
 
 *** Keywords ***
-| Local template
-| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
-| | ... | ${min_rate}=${50000} | ${rxq}=${None}
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT1 and DUT2 are configured with IPv6\
+| | ... | routing and static route, SR policy and steering policy for one\
+| | ... | direction and one SR behaviour (function) - End - for other direction.
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | ... | *Arguments:*
+| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... |   Type: integer, string
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize} + ${srv6_overhead_3sids}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
+| | Set Test Variable | ${min_rate} | ${10000}
+| | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize} + ${srv6_overhead_3sids} < ${1522}
-| | ... | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
-| | Then Run Keyword If | '${search_type}' == 'NDR'
-| | ... | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ELSE IF | '${search_type}' == 'PDR'
-| | ... | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
+| | Then Find NDR and PDR intervals using optimized search
+| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
-| | [Tags] | 78B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${78}  | search_type=NDR
+| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 78B | 1C
+| | framesize=${78} | phy_cores=${1}
 
-| tc02-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
-| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${78}  | search_type=PDR
+| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 78B | 2C
+| | framesize=${78} | phy_cores=${2}
 
-| tc03-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
-| | [Tags] | 78B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${78}  | search_type=NDR
+| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 78B | 4C
+| | framesize=${78} | phy_cores=${4}
 
-| tc04-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
-| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${78}  | search_type=PDR
+| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc05-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
-| | [Tags] | 78B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${78}  | search_type=NDR
+| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
 
-| tc06-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
-| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${78}  | search_type=PDR
+| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
-| | [Tags] | 1518B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${1518}  | search_type=NDR
+| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${1518}  | search_type=PDR
+| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
-| | [Tags] | 1518B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${1518}  | search_type=NDR
+| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${1518}  | search_type=PDR
+| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
-| | [Tags] | 1518B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${1518}  | search_type=NDR
+| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${1518}  | search_type=PDR
+| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/regenerate_testcases.py b/tests/vpp/perf/srv6/regenerate_testcases.py
new file mode 100755
index 0000000000..b63f55bbd9
--- /dev/null
+++ b/tests/vpp/perf/srv6/regenerate_testcases.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2018 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from resources.libraries.python.autogen.Regenerator import Regenerator
+
+Regenerator().regenerate_glob("*.robot", is_ip6=True)