X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr.robot;fp=tests%2Fvpp%2Fperf%2Fip4%2F2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr.robot;h=5e250f6b5ad32a3aa11d6c99e6429fbd041d53c7;hp=e097c5d8856679cae18a6abcb7d9ddb49db965f9;hb=ff1f49d9ba97ddfee3229907e3a344503e072578;hpb=42d1016e92cf2b8ba4e493d878c475de325a447a

diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr.robot
similarity index 76%
rename from tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr.robot
rename to tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr.robot
index e097c5d885..5e250f6b5a 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr.robot
@@ -15,10 +15,10 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_1
-| ... | BASE | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
+| ... | SRC_USER_1 | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-ip4base-udpsrcscale63-nat44
+| ... | ethip4udp-ip4base-udpsrcscale63-nat44-ei
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -58,29 +58,31 @@
 | ${nic_vfs}= | 0
 | ${osi_layer}= | L3
 | ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-ethip4udp-1u63p
 # IP addresing
 | ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | 20
+| ${tg_if1_mask}= | ${20}
 | ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | 20
+| ${tg_if2_mask}= | ${20}
 | ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | 20
+| ${dut1_if1_mask}= | ${20}
 | ${dut1_if2_ip4}= | 11.0.0.1
-| ${dut1_if2_mask}= | 20
-| ${inside_net}= | 192.168.0.0
-| ${inside_mask}= | 22
-| ${nat_net}= | 68.142.68.0
-| ${nat_mask}= | 32
+| ${dut1_if2_mask}= | ${20}
 | ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | 24
+| ${dest_mask}= | ${24}
+# NAT settings
+| ${nat_mode}= | deterministic
+| ${in_net}= | 192.168.0.0
+| ${in_mask}= | ${22}
+| ${out_net}= | 68.142.68.0
+| ${out_mask}= | ${32}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-ethip4udp-1u63p
 
 *** Keywords ***
 | Local Template
 | |
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
+| | ... | [Cfg] DUT runs NAT44 ${nat_mode} configuration.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | |
@@ -97,58 +99,59 @@
 | | Given Set Max Rate And Jumbo
 | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
 | | And Pre-initialize layer driver | ${nic_driver}
-| | And Add NAT to all DUTs
+| | And Add NAT to all DUTs | nat_mode=${nat_mode}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize NAT44 in circular topology
+| | And Initialize IPv4 forwarding for NAT44 in circular topology
+| | And Initialize NAT44 deterministic mode in circular topology
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-udpsrcscale63-nat44-ei-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}