NF_density dot1qip4udpvxlan

+ NF_density compatible + Baseline VM tests compatible + Scalability NxM - 3n variant is missing in VXLAN and DOT1Q due to requests to have it asymmetrical - TODO Change-Id: Ia817d7be00622b594b451bc07756240d1a379e04 Signed-off-by: Peter Mikus <pmikus@cisco.com>
author: Peter Mikus <pmikus@cisco.com> 2019-06-13 15:01:34 +0000
committer: Peter Mikus <pmikus@cisco.com> 2019-07-24 11:22:46 +0000
commit: c58cba70baa74588619018a2e8b461592bff1bf4 (patch)
tree: 64a1c247b5b49163ff0bb753e13980301f4154e7
parent: 7da0581190efdf16026f84899ba33f33e5240f46 (diff)
80 files changed, 2623 insertions, 326 deletions
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index 6de17d10d9..279f9a0e25 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -711,18 +711,18 @@ class InterfaceUtil(object):
         """Create VLAN sub-interface on node.
 
         :param node: Node to add VLAN subinterface on.
-        :param interface: Interface name on which create VLAN subinterface.
+        :param interface: Interface name or index on which create VLAN
+            subinterface.
         :param vlan: VLAN ID of the subinterface to be created.
         :type node: dict
-        :type interface: str
+        :type interface: str on int
         :type vlan: int
         :returns: Name and index of created subinterface.
         :rtype: tuple
         :raises RuntimeError: if it is unable to create VLAN subinterface on the
-            node.
+            node or interface cannot be converted.
         """
-        iface_key = Topology.get_interface_by_name(node, interface)
-        sw_if_index = Topology.get_interface_sw_index(node, iface_key)
+        sw_if_index = InterfaceUtil.get_interface_index(node, interface)
 
         cmd = 'create_vlan_subif'
         args = dict(sw_if_index=sw_if_index,
@@ -782,6 +782,33 @@ class InterfaceUtil(object):
         return sw_if_index
 
     @staticmethod
+    def set_vxlan_bypass(node, interface=None):
+        """Add the 'ip4-vxlan-bypass' graph node for a given interface.
+
+        By adding the IPv4 vxlan-bypass graph node to an interface, the node
+        checks for and validate input vxlan packet and bypass ip4-lookup,
+        ip4-local, ip4-udp-lookup nodes to speedup vxlan packet forwarding.
+        This node will cause extra overhead to for non-vxlan packets which is
+        kept at a minimum.
+
+        :param node: Node where to set VXLAN bypass.
+        :param interface: Numeric index or name string of a specific interface.
+        :type node: dict
+        :type interface: int or str
+        :raises RuntimeError: if it failed to set VXLAN bypass on interface.
+        """
+        sw_if_index = InterfaceUtil.get_interface_index(node, interface)
+
+        cmd = 'sw_interface_set_vxlan_bypass'
+        args = dict(is_ipv6=0,
+                    sw_if_index=sw_if_index,
+                    enable=1)
+        err_msg = 'Failed to set VXLAN bypass on interface on host {host}'.\
+            format(host=node['host'])
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_replies(err_msg)
+
+    @staticmethod
     def vxlan_dump(node, interface=None):
         """Get VxLAN data for the given interface.
 
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index ee387e1c4f..89acff73ae 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -73,7 +73,8 @@ class Regenerator(object):
         protocol_to_min_frame_size = {
             "ip4": 64,
             "ip6": 78,
-            "vxlan+ip4": 114  # What is the real minimum for latency stream?
+            "ethip4vxlan": 114,  # What is the real minimum for latency stream?
+            "dot1qip4vxlan": 118
         }
         min_frame_size_values = protocol_to_min_frame_size.values()
 
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index a000fa2fd7..b04f9d9f34 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -1619,8 +1619,8 @@
 | | ...
 | | ... | *Note:*
 | | ... | Socket paths for VM are defined in following format:
-| | ... | - /tmp/sock-\${VM_ID}-1
-| | ... | - /tmp/sock-\${VM_ID}-2
+| | ... | - /var/run/vpp/sock-\${VM_ID}-1
+| | ... | - /var/run/vpp/sock-\${VM_ID}-2
 | | ...
 | | ... | *Example:*
 | | ...
@@ -1629,24 +1629,27 @@
 | | ...
 | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1}
 | | ...
-| | ${bd_id2}= | Evaluate | ${nf_nodes}+1
-| | Add interface to bridge domain | ${nodes['${dut}']}
-| | ... | ${${dut}_if1} | ${1}
-| | Add interface to bridge domain | ${nodes['${dut}']}
-| | ... | ${${dut}_if2} | ${bd_id2}
-| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1
+| | ${bd_id1}= | Evaluate | ${nf_nodes} * (${nf_chain} - 1) + ${nf_chain}
+| | ${bd_id2}= | Evaluate | ${nf_nodes} * ${nf_chain} + ${nf_chain}
+| | ${dut_str}= | Convert To Lowercase | ${dut}
+| | Add interface to bridge domain
+| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${nf_chain}_1}
+| | ... | ${bd_id1}
+| | Add interface to bridge domain
+| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${nf_chain}_2}
+| | ... | ${bd_id2}
+| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes} + 1
 | | | ${qemu_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node}
-| | | ${sock1}= | Set Variable | /var/run/vpp/sock-${qemu_id}-1
-| | | ${sock2}= | Set Variable | /var/run/vpp/sock-${qemu_id}-2
-| | | Configure vhost interfaces for L2BD forwarding | ${nodes['${dut}']}
-| | | ... | ${sock1} | ${sock2}
-| | | ... | ${dut}-vhost-${qemu_id}-if1
-| | | ... | ${dut}-vhost-${qemu_id}-if2
-| | | ${bd_id2}= | Evaluate | ${nf_node}+1
-| | | Add interface to bridge domain | ${nodes['${dut}']}
-| | | ... | ${${dut}-vhost-${qemu_id}-if1} | ${nf_node}
-| | | Add interface to bridge domain | ${nodes['${dut}']}
-| | | ... | ${${dut}-vhost-${qemu_id}-if2} | ${bd_id2}
+| | | Configure vhost interfaces for L2BD forwarding
+| | | ... | ${nodes['${dut}']}
+| | | ... | /var/run/vpp/sock-${qemu_id}-1 | /var/run/vpp/sock-${qemu_id}-2
+| | | ... | ${dut}-vhost-${qemu_id}-if1 | ${dut}-vhost-${qemu_id}-if2
+| | | ${bd_id1}= | Evaluate | ${qemu_id} + (${nf_chain} - 1)
+| | | ${bd_id2}= | Evaluate | ${bd_id1} + 1
+| | | Add interface to bridge domain
+| | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${qemu_id}-if1} | ${bd_id1}
+| | | Add interface to bridge domain
+| | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${qemu_id}-if2} | ${bd_id2}
 
 | Initialize L2 bridge domains with Vhost-User
 | | [Documentation]
@@ -1665,10 +1668,9 @@
 | | ...
 | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1}
 | | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | Initialize L2 bridge domains with Vhost-User on node | ${dut}
-| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
+| | | Initialize L2 bridge domains with Vhost-User on node
+| | | ... | ${dut} | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
 
 | Initialize L2 bridge domains for multiple chains with Vhost-User
 | | [Documentation]
@@ -1676,6 +1678,7 @@
 | | ... | with defined number of VNF nodes on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
 | | ... | with physical inteface or Vhost-User interface of another VM.
+| | ... | Put all interfaces in path up.
 | | ...
 | | ... | *Arguments:*
 | | ... | - nf_chains - Number of chains of NFs. Type: integer
@@ -1688,9 +1691,10 @@
 | | ...
 | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1}
 | | ...
-| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1
-| | | Initialize L2 bridge domains with Vhost-User | nf_chain=${nf_chain}
-| | | ... | nf_nodes=${nf_nodes}
+| | Set interfaces in path up
+| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains} + 1
+| | | Initialize L2 bridge domains with Vhost-User
+| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
 
 | Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
@@ -2058,6 +2062,17 @@
 | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
 | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 
+| Add VLAN strip offload switch off
+| | [Documentation]
+| | ... | Add VLAN Strip Offload switch off on all PCI devices.
+| | ...
+| | :FOR | ${dut} | IN | @{duts}
+| | | ${dut_str}= | Convert To Lowercase | ${dut}
+| | | Run keyword | ${dut}.Add DPDK Dev Parameter | ${${dut_str}_if1_pci}
+| | | ... | vlan-strip-offload | off
+| | | Run keyword | ${dut}.Add DPDK Dev Parameter | ${${dut_str}_if2_pci}
+| | | ... | vlan-strip-offload | off
+
 | Add VLAN strip offload switch off between DUTs in 3-node single link topology
 | | [Documentation]
 | | ... | Add VLAN Strip Offload switch off on PCI devices between DUTs to VPP
@@ -2897,7 +2912,7 @@
 | | | ${acl} = | Run Keyword If | '${acl}' == '${EMPTY}'
 | | | ... | Set Variable | ipv4 ${acl_action} src ${subnet}
 | | | ... | ELSE
-| | | ... | Catenate | SEPARATOR=, | ${acl}
+| | | ... | Catenate | SEPARATOR=", " | ${acl}
 | | | ... | ipv4 ${acl_action} src ${subnet}
 | | Add Replace Acl Multi Entries | ${dut} | rules=${acl}
 | | @{acl_list} = | Create List | ${0}
diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index 5b6ebc743d..a3b4223c48 100644
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -44,3 +44,219 @@
 | | [Return] | ${vhost_dump}
 | | ...
 | | ${vhost_dump}= | Vhost User Dump | ${dut_node}
+
+| Initialize layer interface on node
+| | [Documentation]
+| | ... | Baseline interfaces variables to be created.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ... | - count - Number of baseline interface variables. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer interface on node \| DUT1 \| 1 \|
+| | ...
+| | [Arguments] | ${dut} | ${count}=${1}
+| | ...
+| | ${dut_str}= | Convert To Lowercase | ${dut}
+| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
+| | | Set Test Variable | ${${dut_str}_if_${id}_1} | ${${dut_str}_if1}
+| | | Set Test Variable | ${${dut_str}_if_${id}_2} | ${${dut_str}_if2}
+
+| Initialize layer interface
+| | [Documentation]
+| | ... | Physical interfaces variables to be created on all DUTs.
+| | ...
+| | ... | *Arguments:*
+| | ... | - count - Number of untagged interfaces variables. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer interface \| 1 \|
+| | ...
+| | [Arguments] | ${count}=${1}
+| | ...
+| | :FOR | ${dut} | IN | @{duts}
+| | | Initialize layer interface on node | ${dut} | count=${count}
+| | Set Test Variable | ${prev_layer} | if
+| | Set interfaces in path up
+
+| Initialize layer bonding on node
+| | [Documentation]
+| | ... | Bonded interface and variables to be created on across east and
+| | ... | west DUT's node interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ... | - bond_mode - Link bonding mode. Type: string
+| | ... | - lb_mode - Load balance mode. Type: string
+| | ... | - count - Number of bond interface variables. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer bonding on node \| DUT1 \| xor \| l34 \| 1 \|
+| | ...
+| | [Arguments] | ${dut} | ${bond_mode}=xor | ${lb_mode}=l34 | ${count}=${1}
+| | ...
+| | ${dut_str}= | Convert To Lowercase | ${dut}
+| | ${if_index}= | VPP Create Bond Interface
+| | ... | ${nodes['${dut}']} | ${bond_mode} | load_balance=${lb_mode}
+| | ... | mac=00:00:00:01:01:01
+| | Set Interface State | ${nodes['${dut}']} | ${if_index} | up
+| | VPP Enslave Physical Interface
+| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_1} | ${if_index}
+| | VPP Enslave Physical Interface
+| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_2} | ${if_index}
+| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
+| | | Set Test Variable | ${${dut_str}_bond_${id}_1} | ${if_index}
+| | | Set Test Variable | ${${dut_str}_bond_${id}_2} | ${if_index}
+
+| Initialize layer bonding
+| | [Documentation]
+| | ... | Bonded interfaces and variables to be created on all DUT's interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - bond_mode - Link bonding mode. Type: string
+| | ... | - lb_mode - Load balance mode. Type: string
+| | ... | - count - Number of bond interface variables. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer bonding \| xor \| l34 \| 1 \|
+| | ...
+| | [Arguments] | ${bond_mode}=xor | ${lb_mode}=l34 | ${count}=${1}
+| | ...
+| | :FOR | ${dut} | IN | @{duts}
+| | | Initialize layer bonding on node
+| | | ... | ${dut} | bond_mode=${bond_mode} | lb_mode=${lb_mode}
+| | | ... | count=${count}
+| | Set Test Variable | ${prev_layer} | bond
+
+| Initialize layer dot1q on node
+| | [Documentation]
+| | ... | Dot1q interfaces and variables to be created on all DUT's node
+| | ... | interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ... | - count - Number of tagged interfaces. Type: integer
+| | ... | - create - Whether to create vlan subinterface for each chain.
+| | ... |     Type: boolean
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer dot1q on node \| DUT1 \| 1 \| True \|
+| | ...
+| | [Arguments] | ${dut} | ${count}=${1} | ${create}=${True}
+| | ...
+| | ${dut_str}= | Convert To Lowercase | ${dut}
+| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
+| | | ${vlan_west}= | Evaluate | 100 + ${id} - 1
+| | | ${vlan_east}= | Evaluate | 200 + ${id} - 1
+| | | ${if1_name} | ${if1_index}= | Run Keyword Unless
+| | | ... | ${create} and ${id} > ${1}
+| | | ... | Create Vlan Subinterface
+| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
+| | | ... | ${vlan_west}
+| | | ${if2_name} | ${if2_index}= | Run Keyword Unless
+| | | ... | ${create} and ${id} > ${1}
+| | | ... | Create Vlan Subinterface
+| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
+| | | ... | ${vlan_east}
+| | | Run Keyword Unless | ${create} and ${id} > ${1}
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${if1_index} | up
+| | | Run Keyword Unless | ${create} and ${id} > ${1}
+| | | ... | Set Interface State | ${nodes['${dut}']} | ${if2_index} | up
+| | | Set Test Variable | ${${dut_str}_dot1q_${id}_1} | ${if1_index}
+| | | Set Test Variable | ${${dut_str}_dot1q_${id}_2} | ${if2_index}
+
+| Initialize layer dot1q
+| | [Documentation]
+| | ... | Dot1q interfaces and variables to be created on all DUT's interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - count - Number of tagged interfaces. Type: integer
+| | ... | - create - Whether to create vlan for each chain. Type: boolean
+| | ...
+| | ... | \| Initialize layer dot1q \| 1 \| True \|
+| | ...
+| | [Arguments] | ${count}=${1} | ${create}=${True}
+| | ...
+| | :FOR | ${dut} | IN | @{duts}
+| | | Initialize layer dot1q on node | ${dut} | count=${count}
+| | | ... | create=${create}
+| | Set Test Variable | ${prev_layer} | dot1q
+
+| Initialize layer ip4vxlan on node
+| | [Documentation]
+| | ... | Setup VXLANoIPv4 between TG and DUTs and DUT to DUT by connecting
+| | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
+| | ... | up. IPv4 addresses with prefix /24 are configured on interfaces
+| | ... | towards TG. VXLAN sub-interfaces has same IPv4 address as interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| | ... | - count - Number of vxlan interfaces. Type: integer
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Initialize layer ip4vxlan on node \| DUT1 \| 1 \|
+| | ...
+| | [Arguments] | ${dut} | ${count}=${1}
+| | ...
+| | ${dut_str}= | Convert To Lowercase | ${dut}
+| | Configure IP addresses on interfaces
+| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_1}
+| | ... | 172.16.0.1 | 24
+| | Configure IP addresses on interfaces
+| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_1_2}
+| | ... | 172.26.0.1 | 24
+| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1
+| | | ${subnet}= | Evaluate | ${id} - 1
+| | | ${vni}= | Evaluate | ${id} - 1
+| | | ${ip4vxlan_1}= | Create VXLAN interface
+| | | ... | ${nodes['${dut}']} | ${vni} | 172.16.0.1 | 172.17.${subnet}.2
+| | | ${ip4vxlan_2}= | Create VXLAN interface
+| | | ... | ${nodes['${dut}']} | ${vni} | 172.26.0.1 | 172.27.${subnet}.2
+| | | ${prev_mac}= | Set Variable If | '${dut}' == 'DUT1'
+| | | ... | ${tg_if1_mac} | ${dut1_if2_mac}
+| | | ${next_mac}= | Set Variable If | '${dut}' == 'DUT1' and ${duts_count} == 2
+| | | ... | ${dut2_if1_mac} | ${tg_if2_mac}
+| | | VPP Add IP Neighbor
+| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
+| | | ... | 172.16.${subnet}.2 | ${prev_mac}
+| | | VPP Add IP Neighbor
+| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
+| | | ... | 172.26.${subnet}.2 | ${next_mac}
+| | | VPP Route Add
+| | | ... | ${nodes['${dut}']} | 172.17.${subnet}.0 | 24
+| | | ... | gateway=172.16.${subnet}.2
+| | | ... | interface=${${dut_str}_${prev_layer}_${id}_1}
+| | | VPP Route Add
+| | | ... | ${nodes['${dut}']} | 172.27.${subnet}.0 | 24
+| | | ... | gateway=172.26.${subnet}.2
+| | | ... | interface=${${dut_str}_${prev_layer}_${id}_2}
+| | | Set VXLAN Bypass
+| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1}
+| | | Set VXLAN Bypass
+| | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2}
+| | | Set Test Variable
+| | | ... | ${${dut_str}_ip4vxlan_${id}_1} | ${ip4vxlan_1}
+| | | Set Test Variable
+| | | ... | ${${dut_str}_ip4vxlan_${id}_2} | ${ip4vxlan_2}
+
+| Initialize layer ip4vxlan
+| | [Documentation]
+| | ... | VXLAN interfaces and variables to be created on all DUT's interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - count - Number of vxlan interfaces. Type: integer
+| | ...
+| | ... | \| Initialize layer ip4vxlan \| 1 \|
+| | ...
+| | [Arguments] | ${count}=${1}
+| | ...
+| | :FOR | ${dut} | IN | @{duts}
+| | | Initialize layer ip4vxlan on node | ${dut} | count=${count}
+| | Set Test Variable | ${prev_layer} | ip4vxlan
diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src10udpsrcrnd.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src10udpsrcrnd.py
new file mode 100755
index 0000000000..854e327966
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src10udpsrcrnd.py
@@ -0,0 +1,156 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / DOT1Q / IP / VXLAN / ETH / IP
+ - Direction 0 --> 1:
+   - VLAN range:                       100
+   - Source IP address:                172.17.[0..9].2
+   - Destination IP address:           172.16.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..9]
+   - Payload source MAC address:       00:aa:aa:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].2
+   - Payload destination MAC address:  00:bb:bb:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].1
+ - Direction 1 --> 0:
+   - VLAN range:                       200
+   - Source IP address:                172.27.[0..9].2
+   - Destination IP address:           172.26.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..9]
+   - Payload source MAC address:       00:bb:bb:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].1
+   - Payload destination MAC address:  00:aa:aa:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].2
+"""
+
+from trex.stl.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
+_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
+
+
+class VXLAN(Packet):
+    name = 'VXLAN'
+    fields_desc = [FlagsField('flags', 0x08000000, 32, _VXLAN_FLAGS),
+                   ThreeBytesField('vni', 0),
+                   XByteField('reserved', 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        self.nf_chains = 10
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | DOT1Q | IP | VXLAN | ETH | IP
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (
+            Ether()/
+            Dot1Q(vlan=100) /
+            IP(src='172.17.0.2', dst='172.16.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:aa:aa:00:00:00', dst='00:bb:bb:00:00:00')/
+            IP(src='10.0.0.2', dst='10.0.0.1', proto=61))
+
+        # Direction 1 --> 0
+        base_pkt_b = (
+            Ether()/
+            Dot1Q(vlan=200) /
+            IP(src='172.27.0.2', dst='172.26.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:bb:bb:00:00:00', dst='00:aa:aa:00:00:00')/
+            IP(src='10.0.0.1', dst='10.0.0.2', proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
+
diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src1udpsrcrnd.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src1udpsrcrnd.py
new file mode 100755
index 0000000000..77247102b7
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src1udpsrcrnd.py
@@ -0,0 +1,156 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / DOT1Q / IP / VXLAN / ETH / IP
+ - Direction 0 --> 1:
+   - VLAN range:                       100
+   - Source IP address:                172.17.0.2
+   - Destination IP address:           172.16.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        0
+   - Payload source MAC address:       00:aa:aa:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].2
+   - Payload destination MAC address:  00:bb:bb:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].1
+ - Direction 1 --> 0:
+   - VLAN range:                       200
+   - Source IP address:                172.27.0.2
+   - Destination IP address:           172.26.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        0
+   - Payload source MAC address:       00:bb:bb:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].1
+   - Payload destination MAC address:  00:aa:aa:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].2
+"""
+
+from trex.stl.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
+_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
+
+
+class VXLAN(Packet):
+    name = 'VXLAN'
+    fields_desc = [FlagsField('flags', 0x08000000, 32, _VXLAN_FLAGS),
+                   ThreeBytesField('vni', 0),
+                   XByteField('reserved', 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        self.nf_chains = 1
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | DOT1Q | IP | VXLAN | ETH | IP
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (
+            Ether()/
+            Dot1Q(vlan=100) /
+            IP(src='172.17.0.2', dst='172.16.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:aa:aa:00:00:00', dst='00:bb:bb:00:00:00')/
+            IP(src='10.0.0.2', dst='10.0.0.1', proto=61))
+
+        # Direction 1 --> 0
+        base_pkt_b = (
+            Ether()/
+            Dot1Q(vlan=200) /
+            IP(src='172.27.0.2', dst='172.26.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:bb:bb:00:00:00', dst='00:aa:aa:00:00:00')/
+            IP(src='10.0.0.1', dst='10.0.0.2', proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
+
diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src2udpsrcrnd.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src2udpsrcrnd.py
new file mode 100755
index 0000000000..c82dd23b58
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src2udpsrcrnd.py
@@ -0,0 +1,156 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / DOT1Q / IP / VXLAN / ETH / IP
+ - Direction 0 --> 1:
+   - VLAN range:                       100
+   - Source IP address:                172.17.[0..1].2
+   - Destination IP address:           172.16.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..1]
+   - Payload source MAC address:       00:aa:aa:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].2
+   - Payload destination MAC address:  00:bb:bb:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].1
+ - Direction 1 --> 0:
+   - VLAN range:                       200
+   - Source IP address:                172.27.[0..1].2
+   - Destination IP address:           172.26.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..1]
+   - Payload source MAC address:       00:bb:bb:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].1
+   - Payload destination MAC address:  00:aa:aa:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].2
+"""
+
+from trex.stl.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
+_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
+
+
+class VXLAN(Packet):
+    name = 'VXLAN'
+    fields_desc = [FlagsField('flags', 0x08000000, 32, _VXLAN_FLAGS),
+                   ThreeBytesField('vni', 0),
+                   XByteField('reserved', 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        self.nf_chains = 2
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | DOT1Q | IP | VXLAN | ETH | IP
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (
+            Ether()/
+            Dot1Q(vlan=100) /
+            IP(src='172.17.0.2', dst='172.16.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:aa:aa:00:00:00', dst='00:bb:bb:00:00:00')/
+            IP(src='10.0.0.2', dst='10.0.0.1', proto=61))
+
+        # Direction 1 --> 0
+        base_pkt_b = (
+            Ether()/
+            Dot1Q(vlan=200) /
+            IP(src='172.27.0.2', dst='172.26.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:bb:bb:00:00:00', dst='00:aa:aa:00:00:00')/
+            IP(src='10.0.0.1', dst='10.0.0.2', proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
+
diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src4udpsrcrnd.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src4udpsrcrnd.py
new file mode 100755
index 0000000000..317d269c8d
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src4udpsrcrnd.py
@@ -0,0 +1,156 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / DOT1Q / IP / VXLAN / ETH / IP
+ - Direction 0 --> 1:
+   - VLAN range:                       100
+   - Source IP address:                172.17.[0..3].2
+   - Destination IP address:           172.16.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..3]
+   - Payload source MAC address:       00:aa:aa:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].2
+   - Payload destination MAC address:  00:bb:bb:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].1
+ - Direction 1 --> 0:
+   - VLAN range:                       200
+   - Source IP address:                172.27.[0..3].2
+   - Destination IP address:           172.26.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..3]
+   - Payload source MAC address:       00:bb:bb:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].1
+   - Payload destination MAC address:  00:aa:aa:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].2
+"""
+
+from trex.stl.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
+_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
+
+
+class VXLAN(Packet):
+    name = 'VXLAN'
+    fields_desc = [FlagsField('flags', 0x08000000, 32, _VXLAN_FLAGS),
+                   ThreeBytesField('vni', 0),
+                   XByteField('reserved', 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        self.nf_chains = 4
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | DOT1Q | IP | VXLAN | ETH | IP
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (
+            Ether()/
+            Dot1Q(vlan=100) /
+            IP(src='172.17.0.2', dst='172.16.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:aa:aa:00:00:00', dst='00:bb:bb:00:00:00')/
+            IP(src='10.0.0.2', dst='10.0.0.1', proto=61))
+
+        # Direction 1 --> 0
+        base_pkt_b = (
+            Ether()/
+            Dot1Q(vlan=200) /
+            IP(src='172.27.0.2', dst='172.26.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:bb:bb:00:00:00', dst='00:aa:aa:00:00:00')/
+            IP(src='10.0.0.1', dst='10.0.0.2', proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
+
diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src6udpsrcrnd.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src6udpsrcrnd.py
new file mode 100755
index 0000000000..d4dd81c5db
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src6udpsrcrnd.py
@@ -0,0 +1,156 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / DOT1Q / IP / VXLAN / ETH / IP
+ - Direction 0 --> 1:
+   - VLAN range:                       100
+   - Source IP address:                172.17.[0..5].2
+   - Destination IP address:           172.16.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..5]
+   - Payload source MAC address:       00:aa:aa:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].2
+   - Payload destination MAC address:  00:bb:bb:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].1
+ - Direction 1 --> 0:
+   - VLAN range:                       200
+   - Source IP address:                172.27.[0..5].2
+   - Destination IP address:           172.26.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..5]
+   - Payload source MAC address:       00:bb:bb:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].1
+   - Payload destination MAC address:  00:aa:aa:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].2
+"""
+
+from trex.stl.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
+_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
+
+
+class VXLAN(Packet):
+    name = 'VXLAN'
+    fields_desc = [FlagsField('flags', 0x08000000, 32, _VXLAN_FLAGS),
+                   ThreeBytesField('vni', 0),
+                   XByteField('reserved', 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        self.nf_chains = 6
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | DOT1Q | IP | VXLAN | ETH | IP
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (
+            Ether()/
+            Dot1Q(vlan=100) /
+            IP(src='172.17.0.2', dst='172.16.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:aa:aa:00:00:00', dst='00:bb:bb:00:00:00')/
+            IP(src='10.0.0.2', dst='10.0.0.1', proto=61))
+
+        # Direction 1 --> 0
+        base_pkt_b = (
+            Ether()/
+            Dot1Q(vlan=200) /
+            IP(src='172.27.0.2', dst='172.26.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:bb:bb:00:00:00', dst='00:aa:aa:00:00:00')/
+            IP(src='10.0.0.1', dst='10.0.0.2', proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
+
diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src8udpsrcrnd.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src8udpsrcrnd.py
new file mode 100755
index 0000000000..29548a3e62
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4vxlan-ip4src8udpsrcrnd.py
@@ -0,0 +1,156 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / DOT1Q / IP / VXLAN / ETH / IP
+ - Direction 0 --> 1:
+   - VLAN range:                       100
+   - Source IP address:                172.17.[0..7].2
+   - Destination IP address:           172.16.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..7]
+   - Payload source MAC address:       00:aa:aa:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].2
+   - Payload destination MAC address:  00:bb:bb:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].1
+ - Direction 1 --> 0:
+   - VLAN range:                       200
+   - Source IP address:                172.27.[0..7].2
+   - Destination IP address:           172.26.0.1
+   - Source UDP port:                  random([1024..65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        [0..7]
+   - Payload source MAC address:       00:bb:bb:00:00:[00..ff]
+   - Payload source IP address:        10.0.[0..255].1
+   - Payload destination MAC address:  00:aa:aa:00:00:[00..ff]
+   - Payload destination IP address:   10.0.[0..255].2
+"""
+
+from trex.stl.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
+_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
+
+
+class VXLAN(Packet):
+    name = 'VXLAN'
+    fields_desc = [FlagsField('flags', 0x08000000, 32, _VXLAN_FLAGS),
+                   ThreeBytesField('vni', 0),
+                   XByteField('reserved', 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        self.nf_chains = 8
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | DOT1Q | IP | VXLAN | ETH | IP
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (
+            Ether()/
+            Dot1Q(vlan=100) /
+            IP(src='172.17.0.2', dst='172.16.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:aa:aa:00:00:00', dst='00:bb:bb:00:00:00')/
+            IP(src='10.0.0.2', dst='10.0.0.1', proto=61))
+
+        # Direction 1 --> 0
+        base_pkt_b = (
+            Ether()/
+            Dot1Q(vlan=200) /
+            IP(src='172.27.0.2', dst='172.26.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:bb:bb:00:00:00', dst='00:aa:aa:00:00:00')/
+            IP(src='10.0.0.1', dst='10.0.0.2', proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=32),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=52),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=58),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=64),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=82),
+            STLVmWrFlowVar(fv_name='in_ip', pkt_offset=86),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
+
diff --git a/resources/traffic_profiles/trex/trex-sl-ethip4-vxlansrc253.py b/resources/traffic_profiles/trex/trex-sl-ethip4-vxlansrc253.py
deleted file mode 100755
index 69de6e9335..0000000000
--- a/resources/traffic_profiles/trex/trex-sl-ethip4-vxlansrc253.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Stream profile for T-rex traffic generator.
-
-Stream profile:
- - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
- - Packet: ETH / IP / VXLAN / ETH / IP
- - Direction 0 --> 1:
-   - Source IP address:                172.17.0.2
-   - Destination IP address:           172.16.0.1
-   - VXLAN VNI:                        24
-   - Payload source MAC address:       00:de:ad:00:00:00
-   - Payload source IP address:        10.0.0.2
-   - Payload destination MAC address:  00:de:ad:00:00:01
-   - Payload destination IP address:   10.0.0.1
- - Direction 1 --> 0:
-   - Source IP address:                172.27.0.2
-   - Destination IP address:           172.26.0.1
-   - VXLAN VNI:                        24
-   - Payload source MAC address:       00:de:ad:00:00:01
-   - Payload source IP address:        10.0.0.1
-   - Payload destination MAC address:  00:de:ad:00:00:00
-   - Payload destination IP address:   10.0.0.2
-
-"""
-
-from trex.stl.api import *
-from profile_trex_stateless_base_class import TrafficStreamsBaseClass
-
-# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
-# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
-# http://tools.ietf.org/html/rfc7348
-_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
-
-
-class VXLAN(Packet):
-    name = "VXLAN"
-    fields_desc = [FlagsField("flags", 0x08000000, 32, _VXLAN_FLAGS),
-                   ThreeBytesField("vni", 0),
-                   XByteField("reserved", 0x00)]
-
-    def mysummary(self):
-        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
-
-
-bind_layers(UDP, VXLAN, dport=4789)
-bind_layers(VXLAN, Ether)
-
-
-class TrafficStreams(TrafficStreamsBaseClass):
-    """Stream profile."""
-
-    def __init__(self):
-        """Initialization and setting of streams' parameters."""
-
-        super(TrafficStreamsBaseClass, self).__init__()
-
-    def define_packets(self):
-        """Defines the packets to be sent from the traffic generator.
-
-        Packet definition: | ETH | IP |
-
-        :returns: Packets to be sent from the traffic generator.
-        :rtype: tuple
-        """
-
-        # Direction 0 --> 1
-        base_pkt_a = (
-            Ether()/
-            IP(src="172.17.0.2",dst="172.16.0.1")/
-            UDP(sport=1337,dport=4789)/
-            VXLAN(vni=24)/
-            Ether(src="00:de:ad:00:00:00",dst="00:de:ad:00:00:01")/
-            IP(src="10.0.0.2",dst="10.0.0.1"))
-
-        # Direction 1 --> 0
-        base_pkt_b = (
-            Ether()/
-            IP(src="172.27.0.2",dst="172.26.0.1")/
-            UDP(sport=1337,dport=4789)/
-            VXLAN(vni=24)/
-            Ether(src="00:de:ad:00:00:01",dst="00:de:ad:00:00:00")/
-            IP(src="10.0.0.1",dst="10.0.0.2"))
-
-
-        # Direction 0 --> 1
-        vm1 = STLScVmRaw([
-            STLVmFlowVar(name="src", min_value="172.17.0.2" ,
-                         max_value="172.17.0.254", size=4, op="inc"),
-            STLVmFlowVar(name="src_mac", min_value=2 , max_value=3100,
-                         size=2, op="inc"),
-            STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
-            STLVmWrFlowVar(fv_name="src_mac", pkt_offset=60),
-            STLVmFixIpv4(offset = "IP")
-        ])
-
-        # Direction 1 --> 0
-        vm2 = STLScVmRaw([
-            STLVmFlowVar(name="src", min_value="172.27.0.2" ,
-                         max_value="172.27.0.254", size=4, op="inc"),
-            STLVmFlowVar(name="src_mac", min_value=2 , max_value=3100,
-                         size=2, op="inc"),
-            STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"),
-            STLVmWrFlowVar(fv_name="src_mac", pkt_offset=60),
-            STLVmFixIpv4(offset = "IP")
-        ])
-
-        # for now there's a single VXLAN tunnel per direction, the above
-        # variations are for reference only
-        vm1, vm2 = [], []
-
-        return base_pkt_a, base_pkt_b, vm1, vm2
-
-def register():
-    """Register this traffic profile to T-rex.
-
-    Do not change this function.
-
-    :return: Traffic streams.
-    :rtype: Object
-    """
-    return TrafficStreams()
-
diff --git a/resources/traffic_profiles/trex/trex-sl-ethip4vxlan-ip4src1udpsrcrnd.py b/resources/traffic_profiles/trex/trex-sl-ethip4vxlan-ip4src1udpsrcrnd.py
new file mode 100755
index 0000000000..caf56651fb
--- /dev/null
+++ b/resources/traffic_profiles/trex/trex-sl-ethip4vxlan-ip4src1udpsrcrnd.py
@@ -0,0 +1,148 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Stream profile for T-rex traffic generator.
+
+Stream profile:
+ - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time.
+ - Packet: ETH / IP / VXLAN / ETH / IP
+ - Direction 0 --> 1:
+   - Source IP address:                172.17.0.2
+   - Destination IP address:           172.16.0.1
+   - Source UDP port:                  random([1024-65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        0
+   - Payload source MAC address:       00:aa:aa:00:00:[00..ff]
+   - Payload source IP address:        10.0.0.2
+   - Payload destination MAC address:  00:bb:bb:00:00:[00..ff]
+   - Payload destination IP address:   10.0.0.1
+ - Direction 1 --> 0:
+   - Source IP address:                172.27.0.2
+   - Destination IP address:           172.26.0.1
+   - Source UDP port:                  random([1024-65535])
+   - Destination UDP port:             4789
+   - VXLAN VNI:                        0
+   - Payload source MAC address:       00:bb:bb:00:00:[00..ff]
+   - Payload source IP address:        10.0.0.1
+   - Payload destination MAC address:  00:aa:aa:00:00:[00..ff]
+   - Payload destination IP address:   10.0.0.2
+"""
+
+from trex.stl.api import *
+from profile_trex_stateless_base_class import TrafficStreamsBaseClass
+
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
+_VXLAN_FLAGS = list('R'*24 + "RRRIRRRRR")
+
+
+class VXLAN(Packet):
+    name = 'VXLAN'
+    fields_desc = [FlagsField('flags', 0x08000000, 32, _VXLAN_FLAGS),
+                   ThreeBytesField('vni', 0),
+                   XByteField('reserved', 0x00)]
+
+    def mysummary(self):
+        return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+
+bind_layers(UDP, VXLAN, dport=4789)
+bind_layers(VXLAN, Ether)
+
+
+class TrafficStreams(TrafficStreamsBaseClass):
+    """Stream profile."""
+
+    def __init__(self):
+        """Initialization and setting of streams' parameters."""
+
+        super(TrafficStreamsBaseClass, self).__init__()
+
+        self.nf_chains = 1
+
+    def define_packets(self):
+        """Defines the packets to be sent from the traffic generator.
+
+        Packet definition: | ETH | IP | VXLAN | ETH | IP
+
+        :returns: Packets to be sent from the traffic generator.
+        :rtype: tuple
+        """
+
+        # Direction 0 --> 1
+        base_pkt_a = (
+            Ether()/
+            IP(src='172.17.0.2', dst='172.16.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:aa:aa:00:00:00', dst='00:bb:bb:00:00:00')/
+            IP(src='10.0.0.2', dst='10.0.0.1', proto=61))
+
+        # Direction 1 --> 0
+        base_pkt_b = (
+            Ether()/
+            IP(src='172.27.0.2', dst='172.26.0.1')/
+            UDP(sport=1024, dport=4789)/
+            VXLAN(vni=0)/
+            Ether(src='00:bb:bb:00:00:00', dst='00:aa:aa:00:00:00')/
+            IP(src='10.0.0.1', dst='10.0.0.2', proto=61))
+
+        # Direction 0 --> 1
+        vm1 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=28),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=48),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=54),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=60),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        # Direction 1 --> 0
+        vm2 = STLScVmRaw([
+            STLVmFlowVar(name='nf_id', size=1, op='inc',
+                         min_value=0, max_value=self.nf_chains - 1),
+            STLVmFlowVar(name='in_mac', size=2, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='in_ip', size=1, op='inc',
+                         min_value=0, max_value=255),
+            STLVmFlowVar(name='src_port', size=2, op='random',
+                         min_value=1024, max_value=65535),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=28),
+            STLVmWrFlowVar(fv_name='src_port', pkt_offset='UDP.sport'),
+            STLVmWrFlowVar(fv_name='nf_id', pkt_offset=48),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=54),
+            STLVmWrFlowVar(fv_name='in_mac', pkt_offset=60),
+            STLVmFixIpv4(offset = 'IP')
+        ])
+
+        return base_pkt_a, base_pkt_b, vm1, vm2
+
+def register():
+    """Register this traffic profile to T-rex.
+
+    Do not change this function.
+
+    :return: Traffic streams.
+    :rtype: Object
+    """
+    return TrafficStreams()
+
diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
index 92977da7e2..2c95459905 100644
--- a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
@@ -70,7 +70,9 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize L2 bridge domains with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_l2xc
 | | ... | pinning=${False}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
index 2592010126..c19a6e76c5 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${10}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${10} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${10} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
index 71999d50fd..2f76c2d6e6 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${10}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${10} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${10} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
index c8455ae21c..f6d4cf7d12 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${10}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-10c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${10} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${10} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
index 6b3ddb60f9..0e34591399 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${6}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${6}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${6} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
index 51d6c325aa..5be02881ff 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${6}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c6n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${6}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${6} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
index e3e2e52b25..383a96f4a4 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${8}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${8}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${8} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 61959af001..6c38b7c42f 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${8}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c8n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${8}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${8} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
index 64fc088423..187ec521ca 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${10}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${10}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${10} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
index 22ce99aa66..adcf2db926 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${10}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c10n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${10}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${10} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
index dcb68a8250..ec5521138b 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
index 5bf19b5e5f..5f62e74479 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
index 9f4d31cd76..9899ae6e7c 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
index cb5df83ff2..82d557b43f 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
index fc1a6b4b38..cf219b3aa1 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${4}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${4} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
index e628b22c85..0b2f5f9923 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-1c4n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${1} | nf_nodes=${4}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${1} | nf_nodes=${4} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 768ec32dcc..542a546ba0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${4}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${4} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
index c174a304bb..70d4a793e3 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c4n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${4}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${4} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
index 06df9ae4bf..4a9ec3aeb5 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${6}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${6}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains}| nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${6} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
index 0856ae19af..5d38bf5508 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${6}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c6n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${6}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${6} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 6995151435..8f0d8204ee 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${8}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${8}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${8} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 854168d503..544256d666 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${8}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${8}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${8} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
index 2d40203fc4..6cfd06f7b6 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${10}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c10n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${10}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${10} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
index 7d876d369a..b8af17ac6e 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
index 97a242c3f0..feb14fc1f2 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
index feda726e1f..95149d1613 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
index 4810dcf153..7749560656 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${2} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${2} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
index c4e4b27458..12b28568c7 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 5a91e4eb14..768df4bbb2 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 36ef75ee3a..5f03ed7cb8 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${4}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${4} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 1e25193308..758e48c783 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c4n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${4}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${4} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
index 107851c206..5e17c517aa 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${6}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c6n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${6}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${6} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
index ea28e6cc5d..5b49e56145 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
index cff6f4557e..fdf043ced1 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-4c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${4} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${4} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
index 9b3bfb4d2e..cd533eb242 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${6}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}=
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}= | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
index aa32298fb6..ea4e95e144 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${6}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
index 1e0cbd0211..5d75de4358 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${6}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
index e7fae83a22..14880b6385 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${6}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And| | When Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
index 7068d0a473..dd14a9c2fc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${6}
+| ${nf_nodes}= | ${4}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c4n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${6} | nf_nodes=${4}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And| | When Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${6} | nf_nodes=${4} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 5ef2ee7b08..cda6c52ceb 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${8}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 363f9874c9..30ff5f723b 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${8}
+| ${nf_nodes}= | ${1}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c1n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${1}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${1} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
index bc6d854cee..37ffb30e09 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${2}
 | ${nf_dtc}= | ${0.5}
+| ${nf_chains}= | ${8}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 9717614b7f..0b4418133e 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -55,6 +55,8 @@
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${8}
+| ${nf_nodes}= | ${2}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-8c2n
 
@@ -79,10 +81,12 @@
 | | And Add PCI devices to all DUTs
 | | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains for multiple chains with Vhost-User
-| | ... | nf_chains=${8} | nf_nodes=${2}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
-| | ... | nf_chains=${8} | nf_nodes=${2} | jumbo=${jumbo}
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
 | | Then Find NDR and PDR intervals using optimized search
 
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..e5d2c3cdea
--- /dev/null
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
@@ -0,0 +1,148 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/shared/default.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | VHOST | VM | VHOST_1024 | VXLAN | DOT1Q | NF_DENSITY | NF_TESTPMD
+| ... | CHAIN | 10R1C | 10VM2T
+| ...
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Packet throughput L2BD test cases with Dot1Q and
+| ... | VXLANoIPv4 and vhost*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 for L2\
+| ... | switching of IPv4. Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 is applied on link\
+| ... | between DUT1 and TG.
+| ... | *[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 testpmd l2xc\
+| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1 is\
+| ... | tested with ${nic_name}.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 256 flows per\
+| ... | flow-group) with all packets containing Ethernet header with .1Q, IPv4\
+| ... | header, UPD header, VXLAN header and static payload. MAC addresses are\
+| ... | matching MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${54}
+| ${nf_dtcr}= | ${1}
+| ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${10}
+| ${nf_nodes}= | ${1}
+# Traffic profile:
+| ${traffic_profile}=
+| ... | trex-sl-dot1qip4vxlan-ip4src${nf_chains}udpsrcrnd
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Dot1Q-IP4-Vxlan L2BD switching config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of worker threads to be used. Type: integer
+| | ... | - rxq - Number of Rx queues to be used. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize layer dot1q
+| | ... | count=${nf_chains} | create=${False}
+| | And Initialize layer ip4vxlan
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
+| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-118B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 1C
+| | frame_size=${118} | phy_cores=${1}
+
+| tc02-118B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 2C
+| | frame_size=${118} | phy_cores=${2}
+
+| tc03-118B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 4C
+| | frame_size=${118} | phy_cores=${4}
+
+| tc04-1518B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..dc9f26bc62
--- /dev/null
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
@@ -0,0 +1,148 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/shared/default.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | VHOST | VM | VHOST_1024 | VXLAN | DOT1Q | NF_DENSITY | NF_TESTPMD
+| ... | CHAIN | 1R1C | 1VM2T
+| ...
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Packet throughput L2BD test cases with Dot1Q and
+| ... | VXLANoIPv4 and vhost*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 for L2\
+| ... | switching of IPv4. Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 is applied on link\
+| ... | between DUT1 and TG.
+| ... | *[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 testpmd l2xc\
+| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1 is\
+| ... | tested with ${nic_name}.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 256 flows per\
+| ... | flow-group) with all packets containing Ethernet header with .1Q, IPv4\
+| ... | header, UPD header, VXLAN header and static payload. MAC addresses are\
+| ... | matching MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${54}
+| ${nf_dtcr}= | ${1}
+| ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
+# Traffic profile:
+| ${traffic_profile}=
+| ... | trex-sl-dot1qip4vxlan-ip4src${nf_chains}udpsrcrnd
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Dot1Q-IP4-Vxlan L2BD switching config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of worker threads to be used. Type: integer
+| | ... | - rxq - Number of Rx queues to be used. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize layer dot1q
+| | ... | count=${nf_chains} | create=${False}
+| | And Initialize layer ip4vxlan
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
+| | ... | use_tuned_cfs=${False} | auto_scale=${false} | vnf=testpmd_io
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-118B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 1C
+| | frame_size=${118} | phy_cores=${1}
+
+| tc02-118B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 2C
+| | frame_size=${118} | phy_cores=${2}
+
+| tc03-118B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 4C
+| | frame_size=${118} | phy_cores=${4}
+
+| tc04-1518B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..b97b34cb5f
--- /dev/null
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
@@ -0,0 +1,148 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/shared/default.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | VHOST | VM | VHOST_1024 | VXLAN | DOT1Q | NF_DENSITY | NF_TESTPMD
+| ... | CHAIN | 2R1C | 2VM2T
+| ...
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Packet throughput L2BD test cases with Dot1Q and
+| ... | VXLANoIPv4 and vhost*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 for L2\
+| ... | switching of IPv4. Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 is applied on link\
+| ... | between DUT1 and TG.
+| ... | *[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 testpmd l2xc\
+| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1 is\
+| ... | tested with ${nic_name}.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 256 flows per\
+| ... | flow-group) with all packets containing Ethernet header with .1Q, IPv4\
+| ... | header, UPD header, VXLAN header and static payload. MAC addresses are\
+| ... | matching MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${54}
+| ${nf_dtcr}= | ${1}
+| ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${2}
+| ${nf_nodes}= | ${1}
+# Traffic profile:
+| ${traffic_profile}=
+| ... | trex-sl-dot1qip4vxlan-ip4src${nf_chains}udpsrcrnd
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Dot1Q-IP4-Vxlan L2BD switching config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of worker threads to be used. Type: integer
+| | ... | - rxq - Number of Rx queues to be used. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize layer dot1q
+| | ... | count=${nf_chains} | create=${False}
+| | And Initialize layer ip4vxlan
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
+| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-118B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 1C
+| | frame_size=${118} | phy_cores=${1}
+
+| tc02-118B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 2C
+| | frame_size=${118} | phy_cores=${2}
+
+| tc03-118B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 4C
+| | frame_size=${118} | phy_cores=${4}
+
+| tc04-1518B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..be067f28ea
--- /dev/null
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
@@ -0,0 +1,148 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/shared/default.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | VHOST | VM | VHOST_1024 | VXLAN | DOT1Q | NF_DENSITY | NF_TESTPMD
+| ... | CHAIN | 4R1C | 4VM2T
+| ...
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Packet throughput L2BD test cases with Dot1Q and
+| ... | VXLANoIPv4 and vhost*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 for L2\
+| ... | switching of IPv4. Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 is applied on link\
+| ... | between DUT1 and TG.
+| ... | *[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 testpmd l2xc\
+| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1 is\
+| ... | tested with ${nic_name}.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 256 flows per\
+| ... | flow-group) with all packets containing Ethernet header with .1Q, IPv4\
+| ... | header, UPD header, VXLAN header and static payload. MAC addresses are\
+| ... | matching MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${54}
+| ${nf_dtcr}= | ${1}
+| ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${4}
+| ${nf_nodes}= | ${1}
+# Traffic profile:
+| ${traffic_profile}=
+| ... | trex-sl-dot1qip4vxlan-ip4src${nf_chains}udpsrcrnd
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Dot1Q-IP4-Vxlan L2BD switching config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of worker threads to be used. Type: integer
+| | ... | - rxq - Number of Rx queues to be used. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize layer dot1q
+| | ... | count=${nf_chains} | create=${False}
+| | And Initialize layer ip4vxlan
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
+| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-118B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 1C
+| | frame_size=${118} | phy_cores=${1}
+
+| tc02-118B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 2C
+| | frame_size=${118} | phy_cores=${2}
+
+| tc03-118B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 4C
+| | frame_size=${118} | phy_cores=${4}
+
+| tc04-1518B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..17a1f3fd9d
--- /dev/null
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
@@ -0,0 +1,148 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/shared/default.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | VHOST | VM | VHOST_1024 | VXLAN | DOT1Q | NF_DENSITY | NF_TESTPMD
+| ... | CHAIN | 6R1C | 6VM2T
+| ...
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Packet throughput L2BD test cases with Dot1Q and
+| ... | VXLANoIPv4 and vhost*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 for L2\
+| ... | switching of IPv4. Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 is applied on link\
+| ... | between DUT1 and TG.
+| ... | *[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 testpmd l2xc\
+| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1 is\
+| ... | tested with ${nic_name}.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 256 flows per\
+| ... | flow-group) with all packets containing Ethernet header with .1Q, IPv4\
+| ... | header, UPD header, VXLAN header and static payload. MAC addresses are\
+| ... | matching MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${54}
+| ${nf_dtcr}= | ${1}
+| ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${6}
+| ${nf_nodes}= | ${1}
+# Traffic profile:
+| ${traffic_profile}=
+| ... | trex-sl-dot1qip4vxlan-ip4src${nf_chains}udpsrcrnd
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Dot1Q-IP4-Vxlan L2BD switching config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of worker threads to be used. Type: integer
+| | ... | - rxq - Number of Rx queues to be used. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize layer dot1q
+| | ... | count=${nf_chains} | create=${False}
+| | And Initialize layer ip4vxlan
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
+| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-118B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 1C
+| | frame_size=${118} | phy_cores=${1}
+
+| tc02-118B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 2C
+| | frame_size=${118} | phy_cores=${2}
+
+| tc03-118B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 4C
+| | frame_size=${118} | phy_cores=${4}
+
+| tc04-1518B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..cebe6b2969
--- /dev/null
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
@@ -0,0 +1,148 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Resource | resources/libraries/robot/shared/default.robot
+| ...
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
+| ... | VHOST | VM | VHOST_1024 | VXLAN | DOT1Q | NF_DENSITY | NF_TESTPMD
+| ... | CHAIN | 8R1C | 8VM2T
+| ...
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Packet throughput L2BD test cases with Dot1Q and
+| ... | VXLANoIPv4 and vhost*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 for L2\
+| ... | switching of IPv4. Dot1q-IPv4-UDP-VXLAN-Eth-IPv4 is applied on link\
+| ... | between DUT1 and TG.
+| ... | *[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 testpmd l2xc\
+| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1 is\
+| ... | tested with ${nic_name}.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 256 flows per\
+| ... | flow-group) with all packets containing Ethernet header with .1Q, IPv4\
+| ... | header, UPD header, VXLAN header and static payload. MAC addresses are\
+| ... | matching MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${54}
+| ${nf_dtcr}= | ${1}
+| ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${8}
+| ${nf_nodes}= | ${1}
+# Traffic profile:
+| ${traffic_profile}=
+| ... | trex-sl-dot1qip4vxlan-ip4src${nf_chains}udpsrcrnd
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs Dot1Q-IP4-Vxlan L2BD switching config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | Type: integer, string
+| | ... | - phy_cores - Number of worker threads to be used. Type: integer
+| | ... | - rxq - Number of Rx queues to be used. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize layer dot1q
+| | ... | count=${nf_chains} | create=${False}
+| | And Initialize layer ip4vxlan
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
+| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-118B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 1C
+| | frame_size=${118} | phy_cores=${1}
+
+| tc02-118B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 2C
+| | frame_size=${118} | phy_cores=${2}
+
+| tc03-118B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 118B | 4C
+| | frame_size=${118} | phy_cores=${4}
+
+| tc04-1518B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py
new file mode 100755
index 0000000000..53c33054ac
--- /dev/null
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from resources.libraries.python.autogen.Regenerator import Regenerator
+
+Regenerator().regenerate_glob("*.robot", protocol="dot1qip4vxlan")
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 046e020e84..fcff696d9a 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -90,7 +90,7 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node single link topology
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 44abc52501..04e3ae714c 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -88,7 +88,7 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node single link topology
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 0112ec2046..5091232d58 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -91,7 +91,7 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index ecf9ca6d27..19bf1412bc 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -89,7 +89,7 @@
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index c281c437ef..24de37e052 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -85,7 +85,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 51f7659734..8f0457f482 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -80,7 +80,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
 | | ... | ${subid} | ${tag_rewrite}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 324265e689..ba4c2d5a34 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -78,9 +78,12 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${True} | vnf=vpp_chain_l2xc
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index ebeba94f1d..62c07553c6 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -77,7 +77,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index cfd28af21f..ff9ed218ec 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -77,7 +77,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | ... | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 2e8f42de0a..f64151c944 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -82,7 +82,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index f4e01df180..c6ced19aad 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -84,7 +84,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains with Vhost-User and VLAN in circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 03e697b468..d157c56af2 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -78,9 +78,12 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User | nf_nodes=${nf_nodes}
+| | When Initialize layer interface
+| | ... | count=${nf_chains}
+| | And Initialize L2 bridge domains for multiple chains with Vhost-User
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
 | | ... | use_tuned_cfs=${False} | auto_scale=${True} | vnf=vpp_chain_l2xc
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 10e5b6f7a3..267ef8b392 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -77,7 +77,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 xconnect with Vhost-User | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index 749ad890a3..5390f85d11 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -77,7 +77,7 @@
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding with vhost in 2-node circular topology
 | | ... | nf_nodes=${nf_nodes}
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
index a2c755e29d..f105faf039 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
@@ -63,7 +63,8 @@
 | ${dut1_bd_id2}= | 2
 | ${dut2_bd_id1}= | 1
 # Traffic profile:
-| ${traffic_profile}= | trex-sl-ethip4-vxlansrc253
+| ${traffic_profile}=
+| ... | trex-sl-ethip4vxlan-ip4src${nf_chains}udpsrcrnd
 | ${acl_type}= | permit
 
 *** Keywords ***
@@ -84,11 +85,11 @@
 | | Set Test Variable | \${frame_size}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | &{vxlan1} = | Create Dictionary | vni=24 | vtep=172.17.0.2
-| | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2
+| | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2
+| | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2
 | | @{dut1_vxlans} = | Create List | ${vxlan1}
 | | @{dut2_vxlans} = | Create List | ${vxlan2}
 | | Set interfaces in path up
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
index bbb237f6c1..5e9e729386 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
@@ -51,7 +51,7 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so
 | ${osi_layer}= | L3
 | ${nic_name}= | Intel-X710
 | ${overhead}= | ${50}
@@ -63,7 +63,8 @@
 | ${dut1_bd_id2}= | 2
 | ${dut2_bd_id1}= | 1
 # Traffic profile:
-| ${traffic_profile}= | trex-sl-ethip4-vxlansrc253
+| ${traffic_profile}=
+| ... | trex-sl-ethip4vxlan-ip4src${nf_chains}udpsrcrnd
 | ${acl_type}= | permit+reflect
 
 *** Keywords ***
@@ -84,11 +85,11 @@
 | | Set Test Variable | \${frame_size}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | &{vxlan1} = | Create Dictionary | vni=24 | vtep=172.17.0.2
-| | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2
+| | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2
+| | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2
 | | @{dut1_vxlans} = | Create List | ${vxlan1}
 | | @{dut2_vxlans} = | Create List | ${vxlan2}
 | | Set interfaces in path up
@@ -96,6 +97,9 @@
 | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2
 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16
 | | @{permit_list} = | Create List | 10.0.0.1/32 | 10.0.0.2/32
+| | Run Keyword If | '${acl_type}' != '${EMPTY}'
+| | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input
+| | ... | ${acl_type} | @{permit_list}
 | | And Configure chains of NFs connected via vhost-user on single node
 | | ... | node=DUT1 | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | ... | jumbo=${jumbo} | use_tuned_cfs=${False} | auto_scale=${True}
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
index a0f5c038a5..4f6e871aeb 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
@@ -63,7 +63,8 @@
 | ${dut1_bd_id2}= | 2
 | ${dut2_bd_id1}= | 1
 # Traffic profile:
-| ${traffic_profile}= | trex-sl-ethip4-vxlansrc253
+| ${traffic_profile}=
+| ... | trex-sl-ethip4vxlan-ip4src${nf_chains}udpsrcrnd
 | ${acl_type}= | ${EMPTY}
 
 *** Keywords ***
@@ -84,11 +85,11 @@
 | | Set Test Variable | \${frame_size}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | Add PCI devices to all DUTs
-| | Set Max Rate And Jumbo And Handle Multi Seg
+| | And Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | &{vxlan1} = | Create Dictionary | vni=24 | vtep=172.17.0.2
-| | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2
+| | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2
+| | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2
 | | @{dut1_vxlans} = | Create List | ${vxlan1}
 | | @{dut2_vxlans} = | Create List | ${vxlan2}
 | | Set interfaces in path up
diff --git a/tests/vpp/perf/vts/regenerate_testcases.py b/tests/vpp/perf/vts/regenerate_testcases.py
index 4fafb31de2..638693c515 100755
--- a/tests/vpp/perf/vts/regenerate_testcases.py
+++ b/tests/vpp/perf/vts/regenerate_testcases.py
@@ -15,4 +15,4 @@
 
 from resources.libraries.python.autogen.Regenerator import Regenerator
 
-Regenerator().regenerate_glob("*.robot", protocol="vxlan+ip4")
+Regenerator().regenerate_glob("*.robot", protocol="ethip4vxlan")
author	Peter Mikus <pmikus@cisco.com>	2019-06-13 15:01:34 +0000
committer	Peter Mikus <pmikus@cisco.com>	2019-07-24 11:22:46 +0000
commit	c58cba70baa74588619018a2e8b461592bff1bf4 (patch)
tree	64a1c247b5b49163ff0bb753e13980301f4154e7
parent	7da0581190efdf16026f84899ba33f33e5240f46 (diff)