X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdrdisc.robot;h=d4befa97c4d2441412108dc22dbc1bba7e81f46b;hp=056f2138059923450899b05bf9aa4970495c9781;hb=f7ad4e08157eecc91d4be2a05c891f06bca9f966;hpb=2bdb1dc59ba736546a6663cbaf55b6edbcac6eab

diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdrdisc.robot
index 056f213805..d4befa97c4 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdrdisc.robot
@@ -20,8 +20,10 @@
 | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_2000
 | ... | SCALE
 | ...
-| 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 NAT
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
@@ -29,19 +31,9 @@
 | Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *NAT44 performance test cases*
-| ...
-| ... | *High level description*
-| ...
-| ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
-| ... | - Cores / threads: 1t1c and 2t2c
-| ... | - Framesize: 64B, 1518B, IMIX
-| ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
-| ... | - scale: src: 1 user, 10 users, 100 users, ..., 4000 up to the memory
-| ... |   limit; 15 ports per user
+| Test Template | Local template
 | ...
-| ... | *Low level description*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
 | ... | with single links between nodes.
@@ -69,56 +61,105 @@
 # Traffic profile:
 | ${traffic_profile} | trex-sl-3n-ethip4udp-2000u15p
 
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
-| | ... | 2000 users and 15 ports (sessions) per user.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+*** Keywords ***
+| Local template
+| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type}
+| | ... | ${rxq}=${None} | ${min_rate}=${50000}
 | | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
+| | 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 '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Add no multi seg to all DUTs
+| | ${get_framesize}= | Get Frame Size | ${framesize}
+| | ...
+| | 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} < ${1522}
+| | ... | Add no multi seg to all DUTs
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize NAT44 in 3-node circular topology
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${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}
+
+*** Test Cases ***
+| tc01-64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | 64B | 1C | NDRDISC
+| | phy_cores=${1} | framesize=${64}  | search_type=NDR
 
 | tc02-64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
-| | ... | 2000 users and 15 ports (sessions) per user.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${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 '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Add no multi seg to all DUTs
-| | And Add NAT to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in 3-node circular topology
-| | Then 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}
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
+| | phy_cores=${1} | framesize=${64}  | search_type=PDR
+
+| tc03-1518B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | 1518B | 1C | NDRDISC
+| | phy_cores=${1} | framesize=${1518}  | search_type=NDR
+
+| tc04-1518B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
+| | phy_cores=${1} | framesize=${1518}  | search_type=PDR
+
+| tc05-IMIX-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | IMIX | 1C | NDRDISC
+| | phy_cores=${1} | framesize=IMIX_v4_1  | search_type=NDR
+
+| tc06-IMIX-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
+| | phy_cores=${1} | framesize=IMIX_v4_1  | search_type=PDR
+
+| tc07-64B-2t2c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | 64B | 2C | NDRDISC
+| | phy_cores=${2} | framesize=${64}  | search_type=NDR
+
+| tc08-64B-2t2c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
+| | phy_cores=${2} | framesize=${64}  | search_type=PDR
+
+| tc09-1518B-2t2c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | 1518B | 2C | NDRDISC
+| | phy_cores=${2} | framesize=${1518}  | search_type=NDR
+
+| tc10-1518B-2t2c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
+| | phy_cores=${2} | framesize=${1518}  | search_type=PDR
+
+| tc11-IMIX-2t2c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | IMIX | 2C | NDRDISC
+| | phy_cores=${2} | framesize=IMIX_v4_1  | search_type=NDR
+
+| tc12-IMIX-2t2c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
+| | phy_cores=${2} | framesize=IMIX_v4_1  | search_type=PDR
+
+| tc13-64B-4t4c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | 64B | 4C | NDRDISC
+| | phy_cores=${4} | framesize=${64}  | search_type=NDR
+
+| tc14-64B-4t4c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
+| | phy_cores=${4} | framesize=${64}  | search_type=PDR
+
+| tc15-1518B-4t4c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | 1518B | 4C | NDRDISC
+| | phy_cores=${4} | framesize=${1518}  | search_type=NDR
+
+| tc16-1518B-4t4c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
+| | phy_cores=${4} | framesize=${1518}  | search_type=PDR
+
+| tc17-IMIX-4t4c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
+| | [Tags] | IMIX | 4C | NDRDISC
+| | phy_cores=${4} | framesize=IMIX_v4_1  | search_type=NDR
+
+| tc18-IMIX-4t4c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
+| | [Tags] | IMIX | 4C | PDRDISC | SKIP_PATCH
+| | phy_cores=${4} | framesize=IMIX_v4_1  | search_type=PDR