X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot;h=2edbb2f93af69ed584f2f1622c8c02618159d20c;hp=ec1544e0feed61a5a73702c3cd8b3c556c0cd655;hb=6a6126b2f26607263e4543a1e0b5012ab2f0601b;hpb=8280ef881d743a935d7804f02615b1f315d44f14

diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot
index ec1544e0fe..2edbb2f93a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot
@@ -18,8 +18,10 @@
 | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL
 | ... | OACL | ACL10 | 100k_FLOWS
 | ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
+| Suite Setup | Run Keywords
+| ... | Set up 3-node performance topology with DUT's NIC model | L3
+| ... | 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
@@ -80,7 +82,7 @@
 | | ${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
+| | 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
@@ -102,47 +104,71 @@
 | tc01-64B-1t1c-ethip4udp-ip4base-oacl10-stateful-flows100k-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with ACL 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 10GE\
-| | ... | linerate, step 100kpps.
+| | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with ACLs
-| | wt=1 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=NDR
+| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
 
 | tc02-64B-1t1c-ethip4udp-ip4base-oacl10-stateful-flows100k-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with ACL with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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%.
+| | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with ACLs
-| | wt=1 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=PDR
+| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
 
 | tc03-64B-2t2c-ethip4udp-ip4base-oacl10-stateful-flows100k-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with ACL 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 10GE\
-| | ... | linerate, step 100kpps.
+| | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with ACLs
-| | wt=2 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=NDR
+| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
 
 | tc04-64B-2t2c-ethip4udp-ip4base-oacl10-stateful-flows100k-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with ACL with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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%.
+| | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with ACLs
-| | wt=2 | rxq=1 | framesize=${64} | min_rate=${100000} | search_type=PDR
+| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
+
+| tc05-64B-4t4c-ethip4udp-ip4base-oacl10-stateful-flows100k-ndrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv4 routing config with ACL with\
+| | ... | 4 phy cores, 2 receive queues per NIC port.
+| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 50kpps.
+| | ...
+| | [Tags] | 64B | 4C | NDRDISC
+| | ...
+| | [Template] | Discover NDR or PDR for IPv4 routing with ACLs
+| | wt=4 | rxq=2 | framesize=${64} | min_rate=${50000} | search_type=NDR
+
+| tc06-64B-4t4c-ethip4udp-ip4base-oacl10-stateful-flows100k-pdrdisc
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv4 routing config with ACL with\
+| | ... | 4 phy cores, 2 receive queues per NIC port.
+| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
+| | ... | linerate, step 50kpps, LT=0.5%.
+| | ...
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
+| | ...
+| | [Template] | Discover NDR or PDR for IPv4 routing with ACLs
+| | wt=4 | rxq=2 | framesize=${64} | min_rate=${50000} | search_type=PDR