NF density: added new TAGs, renamed test suites and test cases per final agreed scheme.

Change-Id: Ia7bbfe5f7027c18a68408cc71445a2839b6b19a8
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>

38 files changed, 618 insertions, 618 deletions

diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr.robot
index a3a7e6bc1b..36686a047f 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C6N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 6 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr.robot
index 46b40b213d..4fb41a8379 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C6N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 1 chain
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 12 vhost 1 chain
 | ... | 6 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr.robot
index 098bcbcc5c..9816bd0216 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 6C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 6 chains 6 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr.robot
index d34d5ad5e9..eafcd9371d 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 6C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 6 chains
-| ... | 6 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr.robot
index e6030ae17b..574e44d51f 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C8N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 8 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr.robot
index caa2b24495..5b5af3a362 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C8N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 1 chain
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 16 vhost 1 chain
 | ... | 8 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr.robot
index 2a9890f613..811242599a 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C4N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 2 chains 8 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr.robot
index b9ea7c8f0c..fb6c3d549e 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C4N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 2 chains
-| ... | 8 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr.robot
index c544c01e72..4ef699dc1b 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 4C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 4 chains 8 VMs*
+| Documentation | *Raw results 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 DPDK testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr.robot
index 85fdee2e47..56c309f022 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 4C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 4 chains
-| ... | 2 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr.robot
index 66ca860dce..df3e82d2bf 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 8C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 8 chains 8 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr.robot
index 79f210e081..1b355b6ea9 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 8C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 8 chains
-| ... | 8 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr.robot
index 24b09b8bc4..6deac5ed10 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 10C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 10 chains 1 VM*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-10chain-10vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
index 47680916fb..397d3f8f70 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-10chain-10vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 10C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 10 chains
-| ... | 1 VM*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-10chain-1vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-20vhost-10chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr.robot
index 2f58da4e31..ab731e8d6c 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C10N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 10 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr.robot
index 9b7130ba80..6b09a6d9ce 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C10N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 1 chain
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 20 vhost 1 chain
 | ... | 10 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr.robot
index 0d16e128dd..d286784bb9 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C6N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 2 chains 12 VMs*
+| Documentation | *Raw results 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 DPDK testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr.robot
index 135982a616..7e31e7d35f 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C6N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 6 chains
-| ... | 12 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr.robot
index f1037a480a..a487b3c7f8 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 6C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 6 chains 12 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr.robot
index 22f9135741..ac8540cf70 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 6C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 6 chains
-| ... | 12 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr.robot
index 8d36b70079..40d6ff714f 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 1 VM*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr.robot
index 7da1b40de5..d9d03a0bb2 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 1 chain
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 2 vhost 1 chain
 | ... | 1 VM*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr.robot
index 7111fe7685..610dfc8345 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C8N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 2 chains 16 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot
index efb1c3a079..e9c5df2a07 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C8N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 2 chains
-| ... | 16 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr.robot
index 3f9390f549..9eb8482f13 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 4C4N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 4 chains 16 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr.robot
index eee381f15c..88fe68587e 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 4C4N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 4 chains
-| ... | 16 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr.robot
index d5c825d0e8..a81d825819 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 8C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 8 chains 16 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
index 14c4e188ba..0fdcec09d9 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 8C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,15 +30,15 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 8 chains
-| ... | 16 VMs*
+| 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr.robot
index 932234a378..67ae9c86d3 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 2 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr.robot
index b89fb46fa2..41a961d8d6 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 1 chain
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 4 vhost 1 chain
 | ... | 2 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr.robot
index e1100f7a11..0e3aa9863e 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 2 chains 2 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr.robot
index 2d758d98cf..75434a9e3e 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 2 chains
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 4 vhost 2 chains
 | ... | 2 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr.robot
index 4706e55ee3..7184006e27 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C4N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 1R14C
 | ...
 | Suite Setup | Set up 2-node performance topology with DUT's NIC model
 | ... | L3 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 4 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr.robot
index c65e43cfde..dc0d361cb1 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 1C4N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 1 chain
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 1 chain
 | ... | 4 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr.robot
index 2e8eeed4b7..60574032ea 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 2 chains 4 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr.robot
index e720ceae34..5b9cc8b937 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 2C2N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 2 chains
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 2 chains
 | ... | 4 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr.robot
index 2eeab886c0..fe0f5058d2 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 4C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -29,14 +29,14 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 4 chains 4 VMs*
+| Documentation | *Raw results 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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
@@ -88,50 +88,50 @@
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc01-64B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc02-64B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc03-64B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc04-1518B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc05-1518B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc06-1518B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc07-9000B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc08-9000B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc09-9000B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc10-IMIX-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc11-IMIX-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr
+| tc12-IMIX-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr.robot
index be78b2ebcc..f15f5c3ac7 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | 4C1N
-| ... | VHOST_1024 | SERVICE_DENSITY
+| ... | 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 | Intel-X710
@@ -30,7 +30,7 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost 4 chains
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 8 vhost 4 chains
 | ... | 4 VMs*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
@@ -38,7 +38,7 @@
 | ... | *[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 testpmd
+| ... | 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 2p10GE NIC X710 by Intel.
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
@@ -93,50 +93,50 @@
 | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc01-64B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | framesize=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc02-64B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | framesize=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc03-64B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | framesize=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc04-1518B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | framesize=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc05-1518B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc06-1518B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc07-9000B-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | framesize=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc08-9000B-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | framesize=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc09-9000B-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | framesize=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc10-IMIX-1c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc11-IMIX-2c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr
+| tc12-IMIX-4c-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | framesize=IMIX_v4_1 | phy_cores=${4}