feat(tests): Remove PPS tests.

+ Delete nat44 pps suites.
+ Rename ip4base suites, testcases, suite tags (also tg) to -tput.
 + Also robot tags like UDP_PPS and TCP_PPS.
- Keep traffic types and traffic profile names with pps.
 + They can be renamed in a different change if needed.
+ Update job specs.
- Do not update methodology yet (avoid conflict with another Change).

Ticket: CSIT-1829

Change-Id: Ic0dac441f6e8253edce88e057ab7fad1d3814c24
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

20 files changed, 120 insertions, 1779 deletions

diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr.robot
index ed44269117..530da192cc 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_1024 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-ip4base-h1024-p63-s64512-pps
+| ... | ethip4tcp-ip4base-h1024-p63-s64512-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -27,7 +27,7 @@
 | Test Template | Local Template
 |
 | # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight TCP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight TCP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -110,38 +110,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 100B-1c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 100B-2c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 100B-4c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 1518B-1c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 1518B-2c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 1518B-4c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 9000B-1c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 9000B-2c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 9000B-4c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr.robot
index 87cfbcb9d3..39364cee13 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_16384 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-ip4base-h16384-p63-s1032192-pps
+| ... | ethip4tcp-ip4base-h16384-p63-s1032192-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -27,7 +27,7 @@
 | Test Template | Local Template
 |
 | # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight TCP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight TCP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -110,38 +110,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 100B-1c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 100B-2c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 100B-4c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 1518B-1c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 1518B-2c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 1518B-4c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 9000B-1c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 9000B-2c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 9000B-4c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr.robot
index d21184b5e0..451e4bcc33 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_262144 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-ip4base-h262144-p63-s16515072-pps
+| ... | ethip4tcp-ip4base-h262144-p63-s16515072-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -27,7 +27,7 @@
 | Test Template | Local Template
 |
 | # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight TCP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight TCP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -110,38 +110,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 100B-1c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 100B-2c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 100B-4c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 1518B-1c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 1518B-2c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 1518B-4c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 9000B-1c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 9000B-2c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 9000B-4c-ethip4tcp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr.robot
index d3cf02573f..f9c20a82ea 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_4096 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-ip4base-h4096-p63-s258048-pps
+| ... | ethip4tcp-ip4base-h4096-p63-s258048-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -27,7 +27,7 @@
 | Test Template | Local Template
 |
 | # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight TCP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight TCP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -110,38 +110,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 100B-1c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 100B-2c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 100B-4c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 1518B-1c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 1518B-2c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 1518B-4c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 9000B-1c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 9000B-2c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 9000B-4c-ethip4tcp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr.robot
index 35100bf88e..282c6c617e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | TCP | TCP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_65536 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-ip4base-h65536-p63-s4128768-pps
+| ... | ethip4tcp-ip4base-h65536-p63-s4128768-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -27,7 +27,7 @@
 | Test Template | Local Template
 |
 | # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight TCP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight TCP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -110,38 +110,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 100B-1c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 100B-2c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 100B-4c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 1518B-1c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 1518B-2c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 1518B-4c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 9000B-1c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 9000B-2c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 9000B-4c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.robot
deleted file mode 100644
index 89bc7d9ace..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.robot
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | TCP | TCP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_1024 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-nat44ed-h1024-p63-s64512-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS 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 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.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${22}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${22}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.0
-| ${out_mask}= | ${32}
-# Scale settings
-| ${n_hosts}= | ${1024}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${packets_per_transaction_and_direction}= | ${4 + ${ASTF_N_DATA_FRAMES}}
-| ${packets_per_transaction_aggregated}= | ${6 + 2 * ${ASTF_N_DATA_FRAMES}}
-| ${transaction_scale}= | ${n_sessions}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4tcp-${n_hosts}h-pps
-| ${transaction_type}= | tcp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.robot
deleted file mode 100644
index 9c9ae4de3f..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.robot
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | TCP | TCP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_16384 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-nat44ed-h16384-p63-s1032192-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS 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 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.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${18}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${18}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.15
-| ${out_mask}= | ${28}
-# Scale settings
-| ${n_hosts}= | ${16384}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${packets_per_transaction_and_direction}= | ${4 + ${ASTF_N_DATA_FRAMES}}
-| ${packets_per_transaction_aggregated}= | ${6 + 2 * ${ASTF_N_DATA_FRAMES}}
-| ${transaction_scale}= | ${n_sessions}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4tcp-${n_hosts}h-pps
-| ${transaction_type}= | tcp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.robot
deleted file mode 100644
index f4d27549bb..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.robot
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | TCP | TCP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_262144 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-nat44ed-h262144-p63-s16515072-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS 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 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.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.16.0.0
-| ${dest_mask}= | ${14}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 172.16.0.0
-| ${in_mask}= | ${14}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.255
-| ${out_mask}= | ${24}
-# Scale settings
-| ${n_hosts}= | ${262144}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${packets_per_transaction_and_direction}= | ${4 + ${ASTF_N_DATA_FRAMES}}
-| ${packets_per_transaction_aggregated}= | ${6 + 2 * ${ASTF_N_DATA_FRAMES}}
-| ${transaction_scale}= | ${n_sessions}
-# Main heap size multiplicator
-| ${heap_size_mult}= | ${7}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4tcp-${n_hosts}h-pps
-| ${transaction_type}= | tcp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.robot
deleted file mode 100644
index 34b90c95d3..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.robot
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | TCP | TCP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_4096 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-nat44ed-h4096-p63-s258048-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS 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 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.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${20}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${20}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.3
-| ${out_mask}= | ${30}
-# Scale settings
-| ${n_hosts}= | ${4096}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${packets_per_transaction_and_direction}= | ${4 + ${ASTF_N_DATA_FRAMES}}
-| ${packets_per_transaction_aggregated}= | ${6 + 2 * ${ASTF_N_DATA_FRAMES}}
-| ${transaction_scale}= | ${n_sessions}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4tcp-${n_hosts}h-pps
-| ${transaction_type}= | tcp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.robot
deleted file mode 100644
index 82279bb270..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.robot
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | TCP | TCP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_65536 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-nat44ed-h65536-p63-s4128768-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS 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 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.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${16}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${16}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.63
-| ${out_mask}= | ${26}
-# Scale settings
-| ${n_hosts}= | ${65536}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${packets_per_transaction_and_direction}= | ${4 + ${ASTF_N_DATA_FRAMES}}
-| ${packets_per_transaction_aggregated}= | ${6 + 2 * ${ASTF_N_DATA_FRAMES}}
-| ${transaction_scale}= | ${n_sessions}
-# Main heap size multiplicator
-| ${heap_size_mult}= | ${2}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4tcp-${n_hosts}h-pps
-| ${transaction_type}= | tcp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr.robot
index ba11e1fb43..8fe47539de 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_1024 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-ip4base-h1024-p63-s64512-pps
+| ... | ethip4udp-ip4base-h1024-p63-s64512-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -27,7 +27,7 @@
 | Test Template | Local Template
 |
 | # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight UDP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight UDP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -108,38 +108,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 100B-1c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 100B-2c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 100B-4c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr.robot
index 74049bf8ea..05bff4db24 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_16384 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-ip4base-h16384-p63-s1032192-pps
+| ... | ethip4udp-ip4base-h16384-p63-s1032192-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -26,7 +26,7 @@
 |
 | Test Template | Local Template
 |
-| Documentation | **PPS on lightweight UDP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight UDP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -108,38 +108,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 100B-1c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 100B-2c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 100B-4c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr.robot
index 516708ee2f..3fd9552d28 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_262144 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-ip4base-h262144-p63-s16515072-pps
+| ... | ethip4udp-ip4base-h262144-p63-s16515072-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -26,7 +26,7 @@
 |
 | Test Template | Local Template
 |
-| Documentation | **PPS on lightweight UDP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight UDP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -108,38 +108,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 100B-1c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 100B-2c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 100B-4c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-h262144-p63-s16515072-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr.robot
index e15527eaa2..ee4b6a4a8d 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_4096 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-ip4base-h4096-p63-s258048-pps
+| ... | ethip4udp-ip4base-h4096-p63-s258048-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -26,7 +26,7 @@
 |
 | Test Template | Local Template
 |
-| Documentation | **PPS on lightweight UDP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight UDP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -108,38 +108,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 100B-1c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 100B-2c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 100B-4c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-h4096-p63-s258048-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr.robot
index ab38c6c6df..592efc5ed4 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_PPS | DRV_VFIO_PCI
+| ... | NIC_Intel-X710 | ETH | IP4FWD | IP4BASE | UDP | UDP_TPUT | DRV_VFIO_PCI
 | ... | SCALE | HOSTS_65536 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-ip4base-h65536-p63-s4128768-pps
+| ... | ethip4udp-ip4base-h65536-p63-s4128768-tput
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -26,7 +26,7 @@
 |
 | Test Template | Local Template
 |
-| Documentation | **PPS on lightweight UDP transactions with IPv4 routing**
+| Documentation | **TPUT on lightweight UDP transactions with IPv4 routing**
 | ... |
 | ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
@@ -108,38 +108,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 100B-1c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 100B-1c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 100B | 1C
 | | frame_size=${100} | phy_cores=${1}
 
-| 100B-2c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 100B-2c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 100B | 2C
 | | frame_size=${100} | phy_cores=${2}
 
-| 100B-4c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 100B-4c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 100B | 4C
 | | frame_size=${100} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.robot
deleted file mode 100644
index 67ed916ec1..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.robot
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | UDP | UDP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_1024 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-nat44ed-h1024-p63-s64512-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight UDP transactions with NAT44ED**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-UDP 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, UDP header and static \
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${22}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${22}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.0
-| ${out_mask}= | ${32}
-# Scale settings
-| ${n_hosts}= | ${1024}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${transaction_scale}= | ${n_sessions}
-| ${packets_per_transaction_and_direction}= | ${ASTF_N_DATA_FRAMES}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4udp-${n_hosts}h-pps
-| ${transaction_type}= | udp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.robot
deleted file mode 100644
index 711db0cb24..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.robot
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | UDP | UDP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_16384 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-nat44ed-h16384-p63-s1032192-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight UDP transactions with NAT44ED**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-UDP 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, UDP header and static \
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${18}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${18}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.15
-| ${out_mask}= | ${28}
-# Scale settings
-| ${n_hosts}= | ${16384}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${transaction_scale}= | ${n_sessions}
-| ${packets_per_transaction_and_direction}= | ${ASTF_N_DATA_FRAMES}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4udp-${n_hosts}h-pps
-| ${transaction_type}= | udp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.robot
deleted file mode 100644
index d94a5b527d..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.robot
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | UD | UDP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_262144 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-nat44ed-h262144-p63-s16515072-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight UDP transactions with NAT44ED**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-UDP 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, UDP header and static \
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.16.0.0
-| ${dest_mask}= | ${14}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 172.16.0.0
-| ${in_mask}= | ${14}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.255
-| ${out_mask}= | ${24}
-# Scale settings
-| ${n_hosts}= | ${262144}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${transaction_scale}= | ${n_sessions}
-| ${packets_per_transaction_and_direction}= | ${ASTF_N_DATA_FRAMES}
-# Main heap size multiplicator
-| ${heap_size_mult}= | ${7}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4udp-${n_hosts}h-pps
-| ${transaction_type}= | udp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.robot
deleted file mode 100644
index d3aee213e9..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.robot
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | UDP | UDP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_4096 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-nat44ed-h4096-p63-s258048-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight UDP transactions with NAT44ED**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-UDP 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, UDP header and static \
-| ... | payload. \
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${20}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${20}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.3
-| ${out_mask}= | ${20}
-# Scale settings
-| ${n_hosts}= | ${4096}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${transaction_scale}= | ${n_sessions}
-| ${packets_per_transaction_and_direction}= | ${ASTF_N_DATA_FRAMES}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4udp-${n_hosts}h-pps
-| ${transaction_type}= | udp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.robot
deleted file mode 100644
index 63da9ecee3..0000000000
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.robot
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP4FWD | NAT44 | UDP | UDP_PPS | DRV_VFIO_PCI
-| ... | SCALE | HOSTS_65536 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-nat44ed-h65536-p63-s4128768-pps
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | nat-ed
-|
-| Test Template | Local Template
-|
-| # TODO CSIT-1765: Unify suite Documentation.
-| Documentation | **PPS on lightweight UDP transactions with NAT44ED**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-UDP 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, UDP header and static \
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | nat_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${osi_layer}= | L7
-| ${overhead}= | ${0}
-# IP settings
-| ${tg_if1_ip4}= | 10.0.0.2
-| ${tg_if1_mask}= | ${20}
-| ${tg_if2_ip4}= | 12.0.0.2
-| ${tg_if2_mask}= | ${20}
-| ${dut1_if1_ip4}= | 10.0.0.1
-| ${dut1_if1_mask}= | ${24}
-| ${dut1_if2_ip4}= | 12.0.0.1
-| ${dut1_if2_mask}= | ${24}
-| ${dest_net}= | 20.0.0.0
-| ${dest_mask}= | ${16}
-# NAT settings
-| ${nat_mode}= | endpoint-dependent
-| ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${16}
-| ${out_net}= | 68.142.68.0
-| ${out_net_end}= | 68.142.68.63
-| ${out_mask}= | ${26}
-# Scale settings
-| ${n_hosts}= | ${65536}
-| ${n_ports}= | ${63}
-| ${n_sessions}= | ${${n_hosts} * ${n_ports}}
-| ${transaction_scale}= | ${n_sessions}
-| ${packets_per_transaction_and_direction}= | ${ASTF_N_DATA_FRAMES}
-# Main heap size multiplicator
-| ${heap_size_mult}= | ${2}
-# Traffic profile
-| ${traffic_profile}= | trex-astf-ethip4udp-${n_hosts}h-pps
-| ${transaction_type}= | udp_pps
-| ${disable_latency}= | ${True}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[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.
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| |
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | ${pre_stats}= | Create List
-| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
-| | ... | vpp-clear-runtime
-| | Set Test Variable | ${pre_stats}
-| | ${post_stats}= | Create List
-| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
-| | ... | vpp-show-runtime
-| | Set Test Variable | ${post_stats}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize IPv4 forwarding for NAT44 in circular topology
-| | And Initialize NAT44 endpoint-dependent mode in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 100B-1c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 100B | 1C
-| | frame_size=${100} | phy_cores=${1}
-
-| 100B-2c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 100B | 2C
-| | frame_size=${100} | phy_cores=${2}
-
-| 100B-4c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 100B | 4C
-| | frame_size=${100} | phy_cores=${4}
-
-| 1518B-1c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}