X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr.robot;h=e006a1b2bc3b6f56884ae9cac90eae27476a6414;hp=6c7b82fb19292821db92b1afb42c6c32a8072693;hb=1daa6fdc0bae284dee1b61f34534e59b60b7526a;hpb=8c609a6fc0eaf3c8d5b424ed314158251f06479f

diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr.robot
index 6c7b82fb19..e006a1b2bc 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -27,24 +27,30 @@
 | Test Template | Local Template
 |
 | # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | *TPUT on lightweight TCP transactions with NAT44ED*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| Documentation | **TPUT on lightweight TCP transactions with NAT44ED**
+| ... |
+| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-TCP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4\
-| ... | routing and two static IPv4 /24 route entries. DUT1 tested with\
-| ... | ${nic_name}.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains client and server ASTF programs, generating packets containing\
-| ... | Ethernet header, IPv4 header, TCP header and static payload.\
+| ... |
+| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-TCP for IPv4 routing.
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv4. \
+| ... | routing and two static IPv4 /24 route entries. DUT1 is tested with \
+| ... | with ${nic_name}.
+| ... |
+| ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
+| ... | Drop Rate) with zero packet loss tolerance and throughput PDR \
+| ... | (Partial Drop Rate) with non-zero packet loss tolerance (LT) \
+| ... | expressed in percentage of packets transmitted. NDR and PDR are \
+| ... | discovered for different Ethernet L2 frame sizes using MLRsearch \
+| ... | library.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile \
+| ... | contains client and server ASTF programs, generating packets \
+| ... | containing Ethernet header, IPv4 header, TCP header and static \
+| ... | payload. \
 | ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
+| ... |
+| ... | - **[Ref] Applicable standard specifications:** RFC2544.
 
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
@@ -79,10 +85,11 @@
 | ${n_hosts}= | ${4096}
 | ${n_ports}= | ${63}
 | ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${packets_per_transaction_and_direction}= | ${11}
+| ${packets_per_transaction_and_direction}= | ${4 + ${ASTF_N_DATA_FRAMES}}
+| ${packets_per_transaction_aggregated}= | ${6 + 2 * ${ASTF_N_DATA_FRAMES}}
 | ${transaction_scale}= | ${n_sessions}
 # Ramp-up settings
-| ${ramp_up_rate}= | ${70000}
+| ${ramp_up_rate}= | ${30000}
 # Traffic profile
 | ${traffic_profile}= | trex-astf-ethip4tcp-${n_hosts}h-pps
 | ${transaction_type}= | tcp_pps
@@ -91,9 +98,9 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT runs NAT44 ${nat_mode} configuration.\
+| | ... | - **[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.\
+| | ... | - **[Ver]** Measure NDR and PDR values using MLRsearch algorithm.
 | |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
@@ -127,14 +134,38 @@
 | | And Verify NAT44 TCP sessions number on DUT1 node
 
 *** Test Cases ***
-| 64B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
+| 100B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 100B | 1C
+| | frame_size=${100} | phy_cores=${1}
+
+| 100B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 100B | 2C
+| | frame_size=${100} | phy_cores=${2}
+
+| 100B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 100B | 4C
+| | frame_size=${100} | phy_cores=${4}
+
+| 1518B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| 1518B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| 1518B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| 9000B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
 
-| 64B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
+| 9000B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
 
-| 64B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
+| 9000B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}