NF density tests with dtc=0.5 and dtcr=2

Change-Id: Icff556142280ad0b6261e0a2bfb71672ee6b3807
Signed-off-by: Peter Mikus <pmikus@cisco.com>

38 files changed, 0 insertions, 5015 deletions

diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 141783d863..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 1R6C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 12 vhost 1 chain
-| ... | 6 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${6}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${6} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr.robot
deleted file mode 100644
index ab7bf1e84d..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 1R6C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 12 vhost 1 chain
-| ... | 6 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${6}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${6} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12vhost-1chain-6vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 8b039b1e6a..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 6R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 12 vhost
-| ... | 6 chains 6 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 9fc7c290d7..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 6R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 12 vhost
-| ... | 6 chains 6 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-12vhost-6chain-6vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 5d6cf6e767..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 1R8C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost 1 chain
-| ... | 8 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${8}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${8} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 043a7bda8d..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 1R8C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost
-| ... | 1 chain 8 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${8}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${8} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-1chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 56ad479f3d..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 2R4C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost
-| ... | 2 chains 8 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${4}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${4} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr.robot
deleted file mode 100644
index bf5461ffa1..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 2R4C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost
-| ... | 2 chains 8 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${4}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${4} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-2chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index b03de7067b..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 4R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost
-| ... | 4 chains 2 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 05619e9be7..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 4R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost
-| ... | 4 chains 8 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-4chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 3d062f4515..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 8R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost
-| ... | 8 chains 8 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 95e0bab017..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 8R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost
-| ... | 8 chains 8 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-16vhost-8chain-8vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 0b7592874b..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 10R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 20 vhost
-| ... | 10 chains 10 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${10} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${10} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr.robot
deleted file mode 100644
index be3d0ebc6f..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 10R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 20 vhost
-| ... | 10 chains 10 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${10} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${10} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-10vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 95450da7c1..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 1R10C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 20 vhost 1 chain
-| ... | 10 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${10}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${10} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr.robot
deleted file mode 100644
index fe4ab4c1b9..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 1R10C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 20 vhost
-| ... | 1 chain 10 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${10}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${10} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-20vhost-1chain-10vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index f6a0b8d67a..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 2R6C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 24 vhost
-| ... | 6 chains 12 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${6}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${6} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr.robot
deleted file mode 100644
index a2fdc7e80e..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 2R6C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 24 vhost
-| ... | 2 chains 12 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${6}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${6} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24vhost-2chain-12vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 61d67ea019..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 6R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 24 vhost
-| ... | 6 chains 12 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 819f5a7a38..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 6R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 24 vhost
-| ... | 6 chains 12 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-24vhost-6chain-12vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 04989d34c4..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 1R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 2 vhost 1 chain
-| ... | 1 VM*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 0d783c21e2..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 1R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 2 vhost 1 chain
-| ... | 1 VM*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-2vhost-1chain-1vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 70dacd184f..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 2R8C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 32 vhost
-| ... | 2 chains 16 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${8}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${8} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 2957a7b6fc..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 2R8C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 32 vhost
-| ... | 2 chains 16 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${8}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${8} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32vhost-2chain-16vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 7ba1b63950..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 4R4C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 32 vhost
-| ... | 4 chains 16 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${4}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${4} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 0058e1717e..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 4R4C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 32 vhost
-| ... | 4 chains 16 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${4}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${4} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32vhost-4chain-16vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 5229f22b84..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 8R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 32 vhost
-| ... | 8 chains 16 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr.robot
deleted file mode 100644
index ff49c86b33..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 8R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 32 vhost
-| ... | 8 chains 16 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc04-1518B-1c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc07-9000B-1c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc10-IMIX-1c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-32vhost-8chain-16vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 36851a3dbf..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 1R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 4 vhost 1 chain
-| ... | 2 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr.robot
deleted file mode 100644
index bc1d408e02..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 1R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 4 vhost 1 chain
-| ... | 2 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4vhost-1chain-2vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 261ccbe712..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 2R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 4 vhost 2 chains
-| ... | 2 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 69d2a61173..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 2R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 4 vhost 2 chains
-| ... | 2 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-4vhost-2chain-2vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 875070281f..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 1R4C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 1 chain
-| ... | 4 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${4}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${4} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 53422b9386..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 1R4C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 1 chains
-| ... | 4 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${4}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${4} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8vhost-1chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index dd6c0bac43..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 2R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 2 chains
-| ... | 4 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 16d88fc5f5..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 2R2C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 2 chains
-| ... | 2 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${2}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${2} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8vhost-2chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr.robot
deleted file mode 100644
index 1871530717..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 4R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 4 chains
-| ... | 4 VMs*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile
-| ... | contains 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:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr.robot
deleted file mode 100644
index 34460235c5..0000000000
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr.robot
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (c) 2019 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/performance/performance_setup.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
-| ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 4R1C
-| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 4 chains
-| ... | 1 VM*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
-| ... | vhost-user interfaces. Guest is running VPP IPv4
-| ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with ${nic_name}.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains 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 NFs nodes
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${nic_name}= | Intel-X710
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | 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}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${1}
-| | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${1} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-8vhost-4chain-4vm-vppip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}