-| | [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