aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjuraj.linkes <juraj.linkes@pantheon.tech>2019-07-10 11:32:47 +0200
committerPeter Mikus <pmikus@cisco.com>2019-07-17 07:47:32 +0000
commit248d1a52e06622dc9eb1dfdd6ca9f6670b4c0bc3 (patch)
tree75693f1fe6a233a542d78ba64e80c4c5621ed3ac /tests
parent5287b5307b3e39c4e13545b0c6ea651ac4014a84 (diff)
Refactor VPP Device VM vhost tests
* replace the current VM image with kernel img * rework keyword usage to make it consistent with performance tests * remove resources/libraries/robot/shared/qemu.robot as it's not used anywhere anymore Change-Id: Ia5bc19e9e6ed9af031e4d9b5c0c89431fb49fd33 Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
Diffstat (limited to 'tests')
-rw-r--r--tests/dpdk/perf/__init__.robot2
-rw-r--r--tests/honeycomb/perf/__init__.robot2
-rw-r--r--tests/kubernetes/perf/__init__.robot2
-rw-r--r--tests/vpp/device/__init__.robot10
-rw-r--r--tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot84
-rw-r--r--tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot111
-rw-r--r--tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot85
-rw-r--r--tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot117
-rw-r--r--tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot116
-rw-r--r--tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot83
-rw-r--r--tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot101
-rw-r--r--tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot82
-rw-r--r--tests/vpp/perf/__init__.robot6
13 files changed, 344 insertions, 457 deletions
diff --git a/tests/dpdk/perf/__init__.robot b/tests/dpdk/perf/__init__.robot
index d48d5f4..8010a74 100644
--- a/tests/dpdk/perf/__init__.robot
+++ b/tests/dpdk/perf/__init__.robot
@@ -20,7 +20,7 @@
| Suite Setup | Run Keywords | Setup performance global Variables
| ... | AND | Setup Framework | ${nodes}
| ... | AND | Install DPDK test on all DUTs | ${nodes}
-| ... | AND | Get CPU Layout from all nodes | ${nodes}
+| ... | AND | Get CPU Info from All Nodes | ${nodes}
| ... | AND | Update All Numa Nodes
| ... | ${nodes} | skip_tg=${True}
| Suite Teardown | Cleanup Framework | ${nodes}
diff --git a/tests/honeycomb/perf/__init__.robot b/tests/honeycomb/perf/__init__.robot
index dba1392..ce2af61 100644
--- a/tests/honeycomb/perf/__init__.robot
+++ b/tests/honeycomb/perf/__init__.robot
@@ -37,7 +37,7 @@
| | ... | for performance testing.
| | ...
| | Set Global Variable | ${node}
-| | Get CPU Layout from all nodes | ${nodes}
+| | Get CPU Info from All Nodes | ${nodes}
| | ${cores}= | Get Length | ${node['cpuinfo']}
| | Set Global Variable | ${cores}
| | Stop VPP Service on DUT | ${node}
diff --git a/tests/kubernetes/perf/__init__.robot b/tests/kubernetes/perf/__init__.robot
index c433cc7..790a85b 100644
--- a/tests/kubernetes/perf/__init__.robot
+++ b/tests/kubernetes/perf/__init__.robot
@@ -28,7 +28,7 @@
| ... | AND | Load Docker image on all duts | ${nodes}
| ... | ${dcr_image}
| ... | AND | Setup Kubernetes on all duts | ${nodes}
-| ... | AND | Get CPU Layout from all nodes | ${nodes}
+| ... | AND | Get CPU Info from All Nodes | ${nodes}
| ... | AND | Update all numa nodes | ${nodes}
| ... | skip_tg=${True}
| ... | AND | Update NIC interface names on all duts | ${nodes}
diff --git a/tests/vpp/device/__init__.robot b/tests/vpp/device/__init__.robot
index 69883ea..c5deb75 100644
--- a/tests/vpp/device/__init__.robot
+++ b/tests/vpp/device/__init__.robot
@@ -21,10 +21,10 @@
| Suite Setup | Run Keywords | Setup Global Variables
| ... | AND | Setup Framework | ${nodes}
| ... | AND | Setup Corekeeper on All Nodes | ${nodes}
-| ... | AND | Install Vpp On All Duts | ${nodes} | ${packages_dir}
-| ... | AND | Verify Vpp On All Duts | ${nodes}
-| ... | AND | Get CPU Layout from all nodes | ${nodes}
-| ... | AND | Update All Interface Data On All Nodes | ${nodes}
+| ... | AND | Install Vpp on All Duts | ${nodes} | ${packages_dir}
+| ... | AND | Verify Vpp on All Duts | ${nodes}
+| ... | AND | Get CPU Info from All Nodes | ${nodes}
+| ... | AND | Update All Interface Data on All Nodes | ${nodes}
| ... | skip_tg_udev=${True} | numa_node=${True}
| ...
| Suite Teardown | Cleanup Framework | ${nodes}
@@ -36,9 +36,7 @@
| | ...
| | ... | _NOTE:_ This KW sets following suite variables:
| | ... | - dut_stats - Switch to enable DUT statistics
-| | ... | - vm_image - Guest VM disk image.
| | ... | - packages_dir - Path to directory where VPP packages are stored.
| | ...
| | Set Global Variable | ${dut_stats} | ${True}
-| | Set Global Variable | ${vm_image} | /var/lib/vm/csit-nested-1.7.img
| | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot
new file mode 100644
index 0000000..59da994
--- /dev/null
+++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot
@@ -0,0 +1,84 @@
+# 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 | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
+| ... | NIC_Virtual | ETH | IP4FWD | BASE | VHOST | 1VM
+| ...
+| Suite Setup | Setup suite single link | scapy
+| Test Setup | Setup test
+| Test Teardown | Tear down test | packet_trace | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *IPv4 routing test cases with vhost user interface*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
+| ... | VM and single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for IPv4 routing on \
+| ... | both links.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and \
+| ... | two static IPv4 /24 route entries. Qemu Guest is connected to VPP via \
+| ... | vhost-user interfaces. Guest is running VPP ip4 interconnecting \
+| ... | vhost-user interfaces.
+| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
+| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
+| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
+| ${nf_dtc} | ${1}
+| ${nf_dtcr} | ${1}
+| ${tg_if1_ip}= | 10.10.10.2
+| ${tg_if2_ip}= | 20.20.20.2
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | Test uses two VRFs to route IPv4 traffic through two vhost-user \
+| | ... | nterfaces. Both interfaces are configured with IP addresses from \
+| | ... | the same network. The VM is running VPP IPv4 forwarding to pass \
+| | ... | packet from one vhost-user interface to the other one.
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
+| | When Initialize IPv4 forwarding with vhost in 2-node circular topology
+| | ... | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
+| | ... | vnf=vpp_chain_ip4_noarp | pinning=${False}
+| | Then Send packet and verify headers
+| | ... | ${tg} | ${tg_if1_ip} | ${tg_if2_ip}
+| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
+| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
+
+*** Test Cases ***
+| tc01-eth2p-ethicmp4-ip4base-eth-2vhost-1vm-dev
+| | [Tags] | 64B
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
deleted file mode 100644
index a1a1947..0000000
--- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.VhostUser
-| Library | resources.libraries.python.VPPUtil
-| ...
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
-| ... | FUNCTEST | IP4FWD | BASE | ETH | VHOST | 1VM
-| ...
-| Suite Setup | Setup suite single link
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | vhost
-| ...
-| Documentation | *IPv4 routing test cases with vhost user interface*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
-| ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for IPv4 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and \
-| ... | two static IPv4 /24 route entries. Qemu Guest is connected to VPP via \
-| ... | vhost-user interfaces. Guest is configured with linux bridge \
-| ... | interconnecting vhost-user interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${net1}= | 10.0.1.0
-| ${net3}= | 10.0.3.0
-| ${net1_ip1}= | 10.0.1.1
-| ${net1_ip2}= | 10.0.1.2
-| ${net2_ip1}= | 10.0.2.1
-| ${net2_ip2}= | 10.0.2.2
-| ${net3_ip1}= | 10.0.3.1
-| ${net3_ip2}= | 10.0.3.2
-| ${prefix_length}= | 24
-| ${fib_table_2}= | 20
-| ${sock1}= | /tmp/sock1
-| ${sock2}= | /tmp/sock2
-
-*** Test Cases ***
-| tc01-eth2p-ethip4-ip4base-eth-2vhost-1vm-device
-| | [Documentation]
-| | ... | Test uses two VRFs to route IPv4 traffic through two vhost-user \
-| | ... | interfaces. Both interfaces are configured with IP addresses from \
-| | ... | the same network. There is created linux bridge on VM to pass packet \
-| | ... | from one vhost-user interface to another one.
-| | ...
-| | Given Add PCI devices to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP Enable Traces On All Duts | ${nodes}
-| | When Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Configure interfaces in path up
-| | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1}
-| | ${vhost2}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock2}
-| | And Set Interface State | ${dut_node} | ${vhost1} | up
-| | And Set Interface State | ${dut_node} | ${vhost2} | up
-| | And Add Fib Table | ${dut_node} | ${fib_table_2}
-| | And Assign Interface To Fib Table | ${dut_node}
-| | ... | ${vhost2} | ${fib_table_2}
-| | And Assign Interface To Fib Table | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${fib_table_2}
-| | And Configure IP addresses on interfaces
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_ip1} | ${prefix_length}
-| | ... | ${dut_node} | ${vhost1} | ${net2_ip1} | ${prefix_length}
-| | ... | ${dut_node} | ${vhost2} | ${net2_ip2} | ${prefix_length}
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} | ${prefix_length}
-| | ${vhost2_mac}= | And Get Vhost User Mac By SW Index
-| | ... | ${dut_node} | ${vhost2}
-| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length}
-| | ... | gateway=${net2_ip2} | interface=${vhost1}
-| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length}
-| | ... | gateway=${net2_ip1} | interface=${vhost2}
-| | ... | vrf=${fib_table_2}
-| | VPP Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac}
-| | And Configure VM for vhost L2BD forwarding
-| | ... | ${dut_node} | ${sock1} | ${sock2}
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
-| | ... | ${tg_to_dut_if2} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot
new file mode 100644
index 0000000..3e1c103
--- /dev/null
+++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot
@@ -0,0 +1,85 @@
+# 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 | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
+| ... | NIC_Virtual | ETH | IP6FWD | BASE | VHOST | 1VM
+| ...
+| Suite Setup | Setup suite single link | scapy
+| Test Setup | Setup test
+| Test Teardown | Tear down test | packet_trace | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *IPv4 routing test cases with vhost user interface*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
+| ... | VM and single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-ICMPv6 for IPv6 routing on \
+| ... | both links.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and \
+| ... | two static IPv6 /64 route entries. Qemu Guest is connected to VPP via \
+| ... | vhost-user interfaces. Guest is running VPP ip6 interconnecting \
+| ... | vhost-user interfaces.
+| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent in \
+| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
+| ... | for correctness and their IPv6 src-addr, dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
+| ${nf_dtc} | ${1}
+| ${nf_dtcr} | ${1}
+| ${tg_if1_ip}= | 2001:1::2
+| ${tg_if2_ip}= | 2001:2::2
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | Test uses two VRFs to route IPv6 traffic through two vhost-user \
+| | ... | interfaces. Both interfaces are configured with IP addresses from \
+| | ... | the same network. The VM is running VPP IPv6 forwarding to pass \
+| | ... | packet from one vhost-user interface to the other one.
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
+| | When Initialize IPv6 forwarding with vhost in 2-node circular topology
+| | ... | nf_nodes=${nf_nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_ip6
+| | ... | pinning=${False}
+| | Then Send packet and verify headers
+| | ... | ${tg} | ${tg_if1_ip} | ${tg_if2_ip}
+| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
+| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
+
+
+*** Test Cases ***
+| tc01-eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev
+| | [Tags] | 64B
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot
deleted file mode 100644
index f125bba..0000000
--- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.VhostUser
-| Library | resources.libraries.python.VPPUtil
-| ...
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
-| ... | FUNCTEST | IP6FWD | BASE | ETH | VHOST | 1VM
-| ...
-| Suite Setup | Setup suite single link
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | vhost
-| ...
-| Documentation | *IPv4 routing test cases with vhost user interface*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
-| ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-ICMPv6 for IPv6 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and \
-| ... | two static IPv6 /64 route entries. Qemu Guest is connected to VPP via \
-| ... | vhost-user interfaces. Guest is configured with linux bridge \
-| ... | interconnecting vhost-user interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv6 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${net1}= | 2001:1::0
-| ${net3}= | 2001:3::0
-| ${net1_ip1}= | 2001:1::1
-| ${net1_ip2}= | 2001:1::2
-| ${net2_ip1}= | 2001:2::1
-| ${net2_ip2}= | 2001:2::2
-| ${net3_ip1}= | 2001:3::1
-| ${net3_ip2}= | 2001:3::2
-| ${prefix_length}= | 64
-| ${fib_table_2}= | 20
-| ${sock1}= | /tmp/sock1
-| ${sock2}= | /tmp/sock2
-
-*** Test Cases ***
-| tc01-eth2p-ethip6-ip6base-eth-2vhost-1vm-device
-| | [Documentation]
-| | ... | Test uses two VRFs to route IPv6 traffic through two vhost-user \
-| | ... | interfaces. Both interfaces are configured with IP addresses from \
-| | ... | the same network. There is created linux bridge on VM to pass packet \
-| | ... | from one vhost-user interface to another one.
-| | ...
-| | Given Add PCI devices to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP Enable Traces On All Duts | ${nodes}
-| | When Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Configure interfaces in path up
-| | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1}
-| | ${vhost2}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock2}
-| | And Set Interface State | ${dut_node} | ${vhost1} | up
-| | And Set Interface State | ${dut_node} | ${vhost2} | up
-| | And Add Fib Table | ${dut_node} | ${fib_table_2} | ipv6=${True}
-| | And Assign Interface To Fib Table
-| | ... | ${dut_node} | ${vhost2} | ${fib_table_2} | ipv6=${True}
-| | And Assign Interface To Fib Table
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${fib_table_2} | ipv6=${True}
-| | And VPP Interface Set IP Address
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_ip1} | ${prefix_length}
-| | And VPP Interface Set IP Address
-| | ... | ${dut_node} | ${vhost1} | ${net2_ip1} | ${prefix_length}
-| | And VPP Interface Set IP Address
-| | ... | ${dut_node} | ${vhost2} | ${net2_ip2} | ${prefix_length}
-| | And VPP Interface Set IP Address
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} | ${prefix_length}
-| | And Suppress ICMPv6 router advertisement message | ${nodes}
-| | ${vhost2_mac}= | And Get Vhost User Mac By SW Index
-| | ... | ${dut_node} | ${vhost2}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${net3} | ${prefix_length}
-| | ... | gateway=${net2_ip2} | interface=${vhost1}
-| | And Vpp Route Add
-| | ... | ${dut_node} | ${net1} | ${prefix_length}
-| | ... | gateway=${net2_ip1} | interface=${vhost2} | vrf=${fib_table_2}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac}
-| | And Configure VM for vhost L2BD forwarding
-| | ... | ${dut_node} | ${sock1} | ${sock2}
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
-| | ... | ${tg_to_dut_if2} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
deleted file mode 100644
index 2a821a7..0000000
--- a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.Trace
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
-| ... | FUNCTEST | L2BDMACLRN | BASE | ETH | VHOST | 1VM
-| ...
-| Suite Setup | Setup suite single link
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | vhost
-| ...
-| Documentation | *L2 bridge-domain test cases with vhost user interface*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
-| ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
-| ... | IPv4; Eth-IPv6-ICMPv6 for L2 switching of IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 \
-| ... | bridge-domains (L2BD) switching combined with MAC learning enabled. \
-| ... | Qemu Guest is connected to VPP via vhost-user interfaces. Guest is \
-| ... | configured with linux bridge interconnecting vhost-user interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets \
-| ... | are sent in both directions by TG on links to DUT1 via VM; on \
-| ... | receive TG verifies packets for correctness and their IPv4 (IPv6) \
-| ... | src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC792
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${bd_id1}= | 1
-| ${bd_id2}= | 2
-| ${sock1}= | /tmp/sock1
-| ${sock2}= | /tmp/sock2
-
-*** Test Cases ***
-| tc01-eth2p-ethip4-l2bdbasemaclrn-eth-2vhost-1vm-device
-| | [Documentation]
-| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT1 configure \
-| | ... | two L2BDs with MAC learning, each with vhost-user i/f to local \
-| | ... | VM and i/f to TG; configure VM to loop pkts back betwen its two \
-| | ... | virtio i/fs. [Ver] Make TG verify ICMPv4 Echo Req pkts are \
-| | ... | switched thru DUT1 and VM in both directions and are correct on \
-| | ... | receive. [Ref]
-| | ...
-| | Given Add PCI devices to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP Enable Traces On All Duts | ${nodes}
-| | When Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Configure interfaces in path up
-| | And Configure vhost interfaces for L2BD forwarding | ${dut_node}
-| | ... | ${sock1}
-| | ... | ${sock2}
-| | And Create bridge domain | ${dut_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut_node} | ${bd_id2}
-| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2}
-| | ... | ${bd_id2}
-| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1}
-| | ... | ${sock2}
-| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-
-| tc02-eth2p-ethip6-l2bdbasemaclrn-eth-2vhost-1vm-device
-| | [Documentation]
-| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv6-ICMPv6. [Cfg] On DUT1 configure \
-| | ... | two L2BDs with MAC learning, each with vhost-user i/f to local \
-| | ... | VM and i/f to TG; configure VM to loop pkts back betwen its two \
-| | ... | virtio i/fs. [Ver] Make TG verify ICMPv6 Echo Req pkts are \
-| | ... | switched thru DUT1 and VM in both directions and are correct on \
-| | ... | receive. [Ref]
-| | ...
-| | Given Add PCI devices to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP Enable Traces On All Duts | ${nodes}
-| | When Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Configure interfaces in path up
-| | And Configure vhost interfaces for L2BD forwarding | ${dut_node}
-| | ... | ${sock1}
-| | ... | ${sock2}
-| | And Create bridge domain | ${dut_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut_node} | ${bd_id2}
-| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2}
-| | ... | ${bd_id2}
-| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1}
-| | ... | ${sock2}
-| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
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
new file mode 100644
index 0000000..8170466
--- /dev/null
+++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
@@ -0,0 +1,83 @@
+# 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 | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
+| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | ICMP | VHOST | 1VM
+| ...
+| Suite Setup | Setup suite single link | scapy
+| Test Setup | Setup test
+| Test Teardown | Tear down test | packet_trace | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *L2 bridge-domain test cases with vhost user interface*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
+| ... | VM and single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
+| ... | IPv4.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 \
+| ... | bridge-domains (L2BD) switching combined with MAC learning enabled. \
+| ... | Qemu Guest is connected to VPP via vhost-user interfaces. Guest is \
+| ... | configured with VPP l2 cross-connect interconnecting vhost-user \
+| ... | interfaces.
+| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
+| ... | both directions by TG on links to DUT1 via VM; on receive TG verifies \
+| ... | packets for correctness and their IPv4 src-addr, dst-addr and MAC \
+| ... | addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC792
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
+| ${nf_dtc} | ${1}
+| ${nf_dtcr} | ${1}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT1 configure \
+| | ... | two L2BDs with MAC learning, each with vhost-user i/f to local \
+| | ... | VM and i/f to TG; configure VPP in VM to loop pkts back betwen its \
+| | ... | two virtio i/fs. [Ver] Make TG verify ICMPv4 Echo Req pkts are \
+| | ... | switched thru DUT1 and VM in both directions and are correct on \
+| | ... | receive. [Ref]
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
+| | When 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}
+| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg}
+| | ... | ${tg_if1} | ${tg_if2}
+
+*** Test Cases ***
+| tc01-eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev
+| | [Tags] | 64B
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
deleted file mode 100644
index a820bd2..0000000
--- a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.NodePath
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/l2/l2_xconnect.robot
-| Resource | resources/libraries/robot/l2/l2_traffic.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
-| ... | FUNCTEST | L2XCFWD | BASE | ETH | VHOST | 1VM
-| ...
-| Suite Setup | Setup suite single link
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace | vhost
-| ...
-| Documentation | *L2 cross-connect test cases with vhost user interface*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
-| ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
-| ... | IPv4; Eth-IPv6-ICMPv6 for L2 switching of IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect \
-| ... | (L2XC) switching. Qemu Guest is connected to VPP via vhost-user \
-| ... | interfaces. Guest is configured with linux bridge interconnecting \
-| ... | vhost-user interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets \
-| ... | are sent in both directions by TG on links to DUT1 via VM; on receive \
-| ... | TG verifies packets for correctness and their IPv4 (IPv6) src-addr, \
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC792
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${sock1}= | /tmp/sock1
-| ${sock2}= | /tmp/sock2
-
-*** Test Cases ***
-| tc01-eth2p-ethip4-l2xcbase-eth-2vhost-1vm-device
-| | [Documentation]
-| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT configure \
-| | ... | two L2 cross-connects (L2XC), each with one untagged interface \
-| | ... | to TG and untagged i/f to local VM over vhost-user. [Ver] Make \
-| | ... | TG send ICMPv4 Echo Reqs in both directions between two of its \
-| | ... | i/fs to be switched by DUT to and from VM; verify all packets \
-| | ... | are received. [Ref]
-| | ...
-| | Given Add PCI devices to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP Enable Traces On All Duts | ${nodes}
-| | When Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Configure interfaces in path up
-| | And Configure vhost interfaces for L2BD forwarding | ${dut_node}
-| | ... | ${sock1} | ${sock2}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2}
-| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1}
-| | ... | ${sock2}
-| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | And Get Vhost dump | ${dut_node}
-
-| tc02-eth2p-ethip6-l2xcbase-eth-2vhost-1vm-device
-| | [Documentation]
-| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv6-ICMPv6. [Cfg] On DUT configure \
-| | ... | two L2 cross-connects (L2XC), each with one untagged i/f to TG \
-| | ... | and untagged i/f to local VM over vhost-user. [Ver] Make TG send \
-| | ... | ICMPv6 Echo Reqs in both directions between two of its i/fs to \
-| | ... | be switched by DUT to and from VM; verify all packets are \
-| | ... | received. [Ref]
-| | ...
-| | Given Add PCI devices to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And VPP Enable Traces On All Duts | ${nodes}
-| | When Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Configure interfaces in path up
-| | And Configure vhost interfaces for L2BD forwarding | ${dut_node}
-| | ... | ${sock1} | ${sock2}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2}
-| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1}
-| | ... | ${sock2}
-| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot
new file mode 100644
index 0000000..c5c6ab7
--- /dev/null
+++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot
@@ -0,0 +1,82 @@
+# 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 | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
+| ... | NIC_Virtual | ETH | L2XCFWD | BASE | ICMP | VHOST | 1VM
+| ...
+| Suite Setup | Setup suite single link | scapy
+| Test Setup | Setup test
+| Test Teardown | Tear down test | packet_trace | vhost
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *L2 cross-connect test cases with vhost user interface*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
+| ... | VM and single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
+| ... | IPv4.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect \
+| ... | (L2XC) switching. Qemu Guest is connected to VPP via vhost-user \
+| ... | interfaces. Guest is configured with VPP l2 cross-connect \
+| ... | interconnecting vhost-user interfaces.
+| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
+| ... | both directions by TG on links to DUT1 via VM; on receive TG verifies \
+| ... | packets for correctness and their IPv4 src-addr, dst-addr and MAC \
+| ... | addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC792
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
+| ${nf_dtc} | ${1}
+| ${nf_dtcr} | ${1}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT configure \
+| | ... | two L2 cross-connects (L2XC), each with one untagged interface \
+| | ... | to TG and untagged i/f to local VM over vhost-user. [Ver] Make \
+| | ... | TG send ICMPv4 Echo Reqs in both directions between two of its \
+| | ... | i/fs to be switched by DUT to and from VM; verify all packets \
+| | ... | are received. [Ref]
+| | ...
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
+| | ... | - phy_cores - Number of physical cores. Type: integer
+| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
+| | ...
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| | ...
+| | Set Test Variable | \${frame_size}
+| | ...
+| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add PCI devices to all DUTs
+| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
+| | When Initialize L2 xconnect 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}
+| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg}
+| | ... | ${tg_if1} | ${tg_if2}
+
+*** Test Cases ***
+| tc01-eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev
+| | [Tags] | 64B
+| | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index d86a76d..a54249b 100644
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -18,21 +18,21 @@
| Library | resources.libraries.python.SetupFramework.CleanupFramework
| Library | resources.libraries.python.CpuUtils
| ...
-| Suite Setup | Run Keywords | Setup performance global Variables
+| Suite Setup | Run Keywords | Setup Global Variables
| ... | AND | Setup Framework | ${nodes}
| ... | AND | Setup Corekeeper on All Nodes | ${nodes}
| ... | AND | Install Vpp on All Duts | ${nodes} | ${packages_dir}
| ... | AND | Verify Vpp on All Duts | ${nodes}
| ... | AND | Verify UIO Driver on all DUTs | ${nodes}
| ... | AND | Show Vpp Version on All Duts | ${nodes}
-| ... | AND | Get CPU Layout from All nodes | ${nodes}
+| ... | AND | Get CPU Info from All Nodes | ${nodes}
| ... | AND | Update All Interface Data on All Nodes | ${nodes}
| ... | skip_tg=${True} | numa_node=${True}
| ...
| Suite Teardown | Cleanup Framework | ${nodes}
*** Keywords ***
-| Setup performance global Variables
+| Setup Global Variables
| | [Documentation]
| | ... | Setup suite Variables. Variables are used across performance testing.
| | ...