X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fl2%2F40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot;h=3d16103d193b8effc5fa94322abc609f9cafe943;hb=ac6cc22910ea0d3bda42c227d799f2d4e89bc9d0;hp=77928977611ba9836cf21d6573ee85a48d6b29ec;hpb=036e5a85bab081bfa94b8c025c06aee0addb94cb;p=csit.git

diff --git a/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 7792897761..3d16103d19 100644
--- a/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -26,6 +26,8 @@
 | Test Teardown | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
 | ...
+| Test Template | Local template
+| ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -58,16 +60,16 @@
 
 *** Keywords ***
 | L2 Bridge Domain Binary Search BW limit
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${s_limit}
-| | ... | ${search_type}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${s_limit}
+| | ... | ${search_type} | ${min_rate}=${50000}
 | | 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}
-| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | Add PCI devices to DUTs in 3-node single link topology
+| | Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${None}
+| | Add PCI devices to all DUTs
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
 | | Add DPDK dev default RXD to all DUTs | 2048
@@ -85,16 +87,16 @@
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | L2 Bridge Domain Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${s_limit}
-| | ... | ${search_type}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${s_limit}
+| | ... | ${search_type} | ${min_rate}=${50000}
 | | Set Test Variable | ${framesize}
 | | Set Test Variable | ${min_rate}
 | | ${max_rate}= | Set Variable | ${s_limit}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | Add PCI devices to DUTs in 3-node single link topology
+| | Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${None}
+| | Add PCI devices to all DUTs
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
 | | Add DPDK dev default RXD to all DUTs | 2048
@@ -115,99 +117,99 @@
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at\
-| | ... | 18.75Mpps rate, step 100kpps.
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | ... | 18.75Mpps rate, step 50kpps.
+| | [Tags] | 64B | 1C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
+| | framesize=${64}  | phy_cores=${1}
 | | ... | s_limit=${s_18.75Mpps} | search_type=NDR
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at\
-| | ... | 24.5G rate, step 10kpps.
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | ... | 24.5G rate, step 50kpps.
+| | [Tags] | 1518B | 1C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
+| | framesize=${1518}  | phy_cores=${1}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at\
-| | ... | 18.75Mpps rate, step 100kpps.
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | ... | 18.75Mpps rate, step 50kpps.
+| | [Tags] | 64B | 2C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
+| | framesize=${64}  | phy_cores=${2}
 | | ... | s_limit=${s_18.75Mpps} | search_type=NDR
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at\
-| | ... | 24.5G rate, step 10kpps.
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | 24.5G rate, step 50kpps.
+| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
+| | framesize=${1518}  | phy_cores=${2}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at\
-| | ... | 18.75Mpps rate, step 100kpps.
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
+| | ... | 18.75Mpps rate, step 50kpps.
+| | [Tags] | 64B | 4C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
+| | framesize=${64}  | phy_cores=${4}
 | | ... | s_limit=${s_18.75Mpps} | search_type=NDR
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at\
-| | ... | 24.5G rate, step 10kpps.
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | 24.5G rate, step 50kpps.
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
+| | framesize=${1518}  | phy_cores=${4}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc19-IMIX-1t1c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at\
-| | ... | 24.5G rate, step 100kpps.
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | ... | 24.5G rate, step 50kpps.
+| | [Tags] | IMIX | 1C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=IMIX_v4_1 | min_rate=${100000} | wt=1 | rxq=1
+| | framesize=IMIX_v4_1  | phy_cores=${1}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc20-IMIX-2t2c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at\
-| | ... | 24.5G rate, step 100kpps.
-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | 24.5G rate, step 50kpps.
+| | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=IMIX_v4_1 | min_rate=${100000} | wt=2 | rxq=1
+| | framesize=IMIX_v4_1  | phy_cores=${2}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc21-IMIX-4t4c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at\
-| | ... | 24.5G rate, step 100kpps.
-| | [Tags] | IMIX | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | 24.5G rate, step 50kpps.
+| | [Tags] | IMIX | 4C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=IMIX_v4_1 | min_rate=${100000} | wt=4 | rxq=2
+| | framesize=IMIX_v4_1  | phy_cores=${4}
 | | ... | s_limit=${s_24.5G} | search_type=NDR