| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
| ... | IACL | ACL1 | 10k_FLOWS
| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
+| Suite Setup | Run Keywords
+| ... | Set up 3-node performance topology with DUT's NIC model | L2
+| ... | Intel-X520-DA2
+| ... | AND | Set up performance test suite with ACL
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
| Test Teardown | Tear down performance test with ACL
| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
+| Test Template | Local template
+| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
| ${trex_stream2_subnet}= | 20.20.20.0/24
*** Keywords ***
-| Discover NDR or PDR for L2 Bridge Domain with ACLs
-| | [Arguments] | ${wt} | ${rxq} | ${framesize} | ${min_rate} | ${search_type}
+| Local template
+| | [Arguments] | ${phy_core} | ${framesize} | ${search_type}
+| | ... | ${min_rate}=${50000} | ${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}
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | 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
| | And Apply startup configuration on all VPP DUTs
*** Test Cases ***
| tc01-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with ACL with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
-| | ...
-| | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
-| | wt=1 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=NDR
+| | [Tags] | 64B | 1C | NDRDISC
+| | phy_cores=${1} | framesize=${64} | search_type=NDR
| tc02-64B-1t1c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with ACL with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
-| | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
-| | wt=1 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=PDR
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
+| | phy_cores=${1} | framesize=${64} | search_type=PDR
| tc03-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with ACL with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
-| | ...
-| | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
-| | wt=2 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=NDR
+| | [Tags] | 64B | 2C | NDRDISC
+| | phy_cores=${2} | framesize=${64} | search_type=NDR
| tc04-64B-2t2c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with ACL with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
-| | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
-| | wt=2 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=PDR
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
+| | phy_cores=${2} | framesize=${64} | search_type=PDR
| tc05-64B-4t4c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with ACL with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
-| | ...
-| | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
-| | wt=4 | rxq=2 | framesize=${64} | min_rate=${100000} | search_type=NDR
+| | [Tags] | 64B | 4C | NDRDISC
+| | phy_cores=${4} | framesize=${64} | search_type=NDR
| tc06-64B-4t4c-eth-l2bdbasemaclrn-iacl1-stateless-flows10k-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with ACL with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
-| | [Template] | Discover NDR or PDR for L2 Bridge Domain with ACLs
-| | wt=4 | rxq=2 | framesize=${64} | min_rate=${100000} | search_type=PDR
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
+| | phy_cores=${4} | framesize=${64} | search_type=PDR
Code Review / csit.git / blobdiff