X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot;fp=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot;h=0c9b0bd2139dbf822113a0ee8ae0c8f0b26fdfaf;hp=aca51775420bc62fc46f426feb2a3be83c112a5f;hb=74771ecb4e2742efd3ab40bb8dd9cf9ac1bb40c8;hpb=f7ad4e08157eecc91d4be2a05c891f06bca9f966

diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
similarity index 58%
rename from tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot
rename to tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
index aca5177542..0c9b0bd213 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# 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:
@@ -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 | IP4FWD | FEATURE | ACL | ACL_STATELESS
 | ... | IACL | ACL10 | 100_FLOWS
 | ...
@@ -29,7 +29,7 @@
 | Test Teardown | Tear down performance test with ACL
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
 | ...
@@ -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, ${flows_per_dir} flows per flow-group) with\
 | ... | all packets containing Ethernet header, IPv4 header with UDP header and\
@@ -74,57 +73,71 @@
 | ${trex_stream1_subnet}= | 10.10.10.0/24
 | ${trex_stream2_subnet}= | 20.20.20.0/24
 
+| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u10p-conc
+
 *** Keywords ***
-| Local template
-| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
-| | ... | ${rxq}=${None} | ${min_rate}=${50000}
+| Local Template
+| | [Documentation] | FIXME.
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${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
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | 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}
 | | And Apply startup configuration on all VPP DUTs
 | | ${ip_nr}= | Set Variable | 10
 | | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology
-| | ${traffic_profile}= | Set Variable | trex-sl-3n-ethip4udp-10u10p-conc
-| | Set Test Variable | ${traffic_profile}
-| | 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-64B-1t1c-ethip4udp-ip4base-iacl10-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 1C | NDRDISC
-| | phy_cores=${1} | framesize=${64}  | search_type=NDR
+| tc01-64B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 64B | 1C
+| | framesize=${64} | phy_cores=${1}
+
+| tc02-64B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
+
+| tc03-64B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc04-1518B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc02-64B-1t1c-ethip4udp-ip4base-iacl10-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | phy_cores=${1} | framesize=${64}  | search_type=PDR
+| tc08-9000B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc03-64B-2t2c-ethip4udp-ip4base-iacl10-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 2C | NDRDISC
-| | phy_cores=${2} | framesize=${64}  | search_type=NDR
+| tc09-9000B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc04-64B-2t2c-ethip4udp-ip4base-iacl10-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | phy_cores=${2} | framesize=${64}  | search_type=PDR
+| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc05-64B-4t4c-ethip4udp-ip4base-iacl10-stateless-flows100-ndrdisc
-| | [Tags] | 64B | 4C | NDRDISC
-| | phy_cores=${4} | framesize=${64}  | search_type=NDR
+| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc06-64B-4t4c-ethip4udp-ip4base-iacl10-stateless-flows100-pdrdisc
-| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
-| | phy_cores=${4} | framesize=${64}  | search_type=PDR
+| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}