NF density: added new TAGs, renamed test suites and test cases per final agreed scheme. 74/16974/3
authorMaciek Konstantynowicz <mkonstan@cisco.com>
Tue, 22 Jan 2019 13:46:51 +0000 (13:46 +0000)
committerTibor Frank <tifrank@cisco.com>
Wed, 23 Jan 2019 09:29:39 +0000 (09:29 +0000)
Change-Id: Ia7bbfe5f7027c18a68408cc71445a2839b6b19a8
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>
38 files changed:
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-6vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-1chain-6vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-6vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-6vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-12vhost-6chain-6vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-6vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-8vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-1chain-8vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-8vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-8vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-2chain-8vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-8vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-8vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-4chain-8vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-8vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-8vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-16vhost-8chain-8vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-8vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-10chain-10vm-l3fwd-mrr.robot with 82% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-10chain-10vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-10chain-10vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-10vm-l3fwd-mrr.robot with 82% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-20vhost-1chain-10vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-10vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-12vm-l3fwd-mrr.robot with 82% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-2chain-12vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-12vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-12vm-l3fwd-mrr.robot with 82% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-24vhost-6chain-12vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-6chain-12vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-1vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-2vhost-1chain-1vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-1vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-16vm-l3fwd-mrr.robot with 82% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-16vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-16vm-l3fwd-mrr.robot with 82% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-4chain-16vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-16vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-16vm-l3fwd-mrr.robot with 82% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-8chain-16vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-8chain-16vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-2vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-1chain-2vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-2vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-2vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-4vhost-2chain-2vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-2vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-4vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-1chain-4vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-1chain-4vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-4vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-2chain-4vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-2chain-4vm-l3fwd-ndrpdr.robot with 84% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-mrr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-4vm-l3fwd-mrr.robot with 83% similarity]
tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-8vhost-4chain-4vm-l3fwdip4-ndrpdr.robot [moved from tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-vhost-4chain-4vm-l3fwd-ndrpdr.robot with 84% similarity]

@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 1 VM*
+| Documentation | *Raw results L2BD test cases with 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
 | | ... | ${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}
@@ -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 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | 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
 | | ... | ${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}
@@ -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
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 2 VMs*
+| Documentation | *Raw results L2BD test cases with 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
 | | ... | ${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}
@@ -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 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
 | | ... | ${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}
@@ -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
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 2 chains 2 VMs*
+| Documentation | *Raw results L2BD test cases with 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
 | | ... | ${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}
@@ -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 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
 | | ... | ${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}
@@ -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
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 1 chain 4 VMs*
+| Documentation | *Raw results L2BD test cases with 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
 | | ... | ${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}
@@ -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 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
 | | ... | ${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}
@@ -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
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 2 chains 4 VMs*
+| Documentation | *Raw results L2BD test cases with 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
 | | ... | ${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}
@@ -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 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
 | | ... | ${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}
@@ -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
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Raw results L2BD test cases with vhost 4 chains 4 VMs*
+| Documentation | *Raw results L2BD test cases with 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
 | | ... | ${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}
@@ -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 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
 | | ... | ${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}