aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2024-04-25 15:56:54 +0200
committerVratko Polak <vrpolak@cisco.com>2024-04-25 15:56:54 +0200
commit82315071628b1ee70d699699cafb5afa425e135f (patch)
treea7528152c2b0401f457324881096177d17bfad83 /tests/vpp
parent6bd1272528e0a383acd3c059bdc2230bc7d83446 (diff)
feat(density): Delete ipsec nfv_density tests
They are broken for more than two years and they relied on CLIs that changed in VPP anyway. Ticket: CSIT-1856 Change-Id: I0f278ff61a9da5e6040e08bf3e92049cb33c8a93 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'tests/vpp')
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot171
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot172
-rwxr-xr-xtests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py18
36 files changed, 0 insertions, 6037 deletions
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 31e6a883fd..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${10000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 5c2725bc76..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${10000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index fffc14bd54..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${10000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index abd1672367..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_10000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${10000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 1a1299485a..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${1000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 652f67107b..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${1000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 711dc47333..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${1000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 6d4d7e216f..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_1000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${1000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index bd221d568d..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_20000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${20000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 2f53bedb19..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_20000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${20000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index bc4c1658bd..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_20000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${20000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index bac98c45ec..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_20000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${20000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 1d03e083d6..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${40000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 1af9ae490a..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${40000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 1085be574d..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${40000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index c4182a51de..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${40000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 5b3e761112..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_400
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${400}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index b281c82b33..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_400
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${400}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index ad46d1621b..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_400
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${400}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 99be145c6d..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_400
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${400}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 9d69789004..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${40}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index b43345c927..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${40}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 72c3687835..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${40}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 37b29c6b56..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_40
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${40}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index b24042340e..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${4}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 015de754c0..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${4}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 76c069632a..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_4
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${4}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index bf9176e579..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${5000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index fadd854b99..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${5000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index ae727765bc..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${5000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 0aefd8c3bc..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_5000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${5000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index f2e3a1213c..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_60000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 8DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 8 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${8}
-| ${n_tunnels}= | ${60000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 25f1553179..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_60000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 1DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 1 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${1}
-| ${n_tunnels}= | ${60000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 6b4193992e..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_60000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 2DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 2 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${2}
-| ${n_tunnels}= | ${60000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
deleted file mode 100644
index 65ccedb256..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2023 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | TNL_60000
-| ... | IPSEC | IPSECSW | IPSECINT | NIC_Intel-X710 | SCALE | 4DCR
-| ... | DOCKER | 2R1C | NF_DENSITY | CHAIN | NF_VPPIP4 | 1DCR1T
-| ... | AES_256_GCM | AES | DRV_VFIO_PCI
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm
-|
-| Suite Setup | Setup suite topology interfaces | performance
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | container
-|
-| Test Template | Local Template
-|
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with memif 1 chain \
-| ... | 4 docker container**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
-| ... | topology with single links between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 bridge domain.
-| ... |
-| ... | - **[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 two L3 flow-groups (flow-group per direction, 254 flows per \
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header \
-| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC \
-| ... | addresses of the TG node interfaces.
-| ... |
-| ... | - **[Ref] Applicable standard specifications:** RFC4303 and RFC2544.
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
-| ... | crypto_native_plugin.so | crypto_ipsecmb_plugin.so
-| ... | crypto_openssl_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}= | L2
-| ${overhead}= | ${54}
-| ${tg_if1_ip4}= | 192.168.10.254
-| ${dut1_if1_ip4}= | 192.168.10.11
-| ${dut1_if2_ip4}= | 100.0.0.254
-| ${dut2_if1_ip4}= | 200.0.0.101
-| ${dut2_if2_ip4}= | 192.168.20.11
-| ${tg_if2_ip4}= | 192.168.20.254
-| ${raddr_ip4}= | 20.0.0.0
-| ${laddr_ip4}= | 10.0.0.0
-| ${addr_range}= | ${24}
-| ${n_instances}= | ${4}
-| ${n_tunnels}= | ${60000}
-| ${nf_dtcr}= | ${1}
-| ${nf_dtc}= | ${1}
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4dst${n_tunnels}-${n_instances}cnf
-# Container
-| ${container_engine}= | Docker
-| ${container_chain_topology}= | chain_ipsec
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | - **[Cfg]** DUT1 runs IPSec tunneling AES_256_GCM config to \
-| | ... | ${n_instances} containers. \
-| | ... | 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}
-| |
-| | # These are enums (not strings) so they cannot be in Variables table.
-| | ${encr_alg}= | Crypto Alg AES GCM 256
-| | ${auth_alg}= | Set Variable | ${None}
-| | ${ipsec_proto} = | IPsec Proto ESP
-| |
-| | 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 IPSec in 3-node circular topology
-| | And Stop VPP service on all DUTs | ${nodes}
-| | And VPP IPsec Create Tunnel Interfaces in Containers
-| | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels}
-| | ... | ${encr_alg} | ${auth_alg} | ${laddr_ip4} | ${raddr_ip4}
-| | ... | ${addr_range} | ${n_instances}
-| | And Start containers for test
-| | ... | nf_chains=${1} | nf_nodes=${n_instances} | auto_scale=${False}
-| | ... | pinning=${False}
-| | And Start vswitch in container | phy_cores=${phy_cores} | rx_queues=${rxq}
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| 9000B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| 9000B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| 9000B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py
deleted file mode 100755
index e22f6de5c3..0000000000
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2023 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.
-
-from resources.libraries.python.autogen.Regenerator import Regenerator
-
-Regenerator().regenerate_glob(u"*.robot")