X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fsrv6%2F10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot;fp=tests%2Fvpp%2Fperf%2Fsrv6%2F10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot;h=1bd5cbc29c40bbf2c2080214c1b76703c33acbd0;hp=7066f619b7bb02659367ea5e9f1bc1451b8244ed;hb=7dda8f57f750c253d3c96ac1b02a84c58e36a6d8;hpb=cbdbfe44b7e028706b0286f91df7752781c60d92

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
similarity index 57%
rename from tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
rename to 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}