aboutsummaryrefslogtreecommitdiffstats
path: root/tests/func/vxlan
diff options
context:
space:
mode:
Diffstat (limited to 'tests/func/vxlan')
-rw-r--r--tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot76
-rw-r--r--tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot116
-rw-r--r--tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot78
-rw-r--r--tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot66
-rw-r--r--tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot119
-rw-r--r--tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot80
-rw-r--r--tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot200
-rw-r--r--tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot203
8 files changed, 0 insertions, 938 deletions
diff --git a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot
deleted file mode 100644
index 0155b4953d..0000000000
--- a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *RFC7348 VXLAN: Bridge-domain with VXLAN over VLAN test cases*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1q-IPv4-VXLAN-Eth-IPv4-ICMPv4 on
-| ... | DUT1-DUT2, Eth-dot1q-IPv4-ICMPv4 on TG-DUTn for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | bridge-domain (L2BD) switching combined with static MACs, MAC learning
-| ... | enabled and Split Horizon Groups (SHG) depending on test case; VXLAN
-| ... | tunnels are configured between L2BDs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr and
-| ... | MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${VNI}= | 23
-| ${BID}= | 23
-| ${VLAN}= | 10
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VXLANoIPv4oVLAN tunnels switch ICMPv4 between TG links
-| | [Tags] | EXPECTED_FAILING
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-VXLAN-Eth-IPv4-ICMPv4 on\
-| | ... | DUT1-DUT2; Eth-IPv4-ICMPv4 on TG-DUTn. [Cfg] On DUT1 and DUT2
-| | ... | configure L2 bridge-domain (MAC learning enabled), each with one
-| | ... | interface to TG and one VXLAN tunnel interface towards the other DUT
-| | ... | over VLAN sub-interface. [Ver] Make TG send ICMPv4 Echo Req between
-| | ... | two of its interfaces, verify all packets are received. [Ref] RFC7348.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | And Create vlan interfaces for VXLAN | ${VLAN}
-| | ... | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${dut2_node} | ${dut2_to_dut1}
-| | And Configure IP addresses and neighbors on interfaces
-| | ... | ${dut1_node} | ${dut1s_vlan_name} | ${dut1s_vlan_index}
-| | ... | ${dut2_node} | ${dut2s_vlan_name} | ${dut2s_vlan_index}
-| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI}
-| | | ... | ${dut1s_ip_address} | ${dut2s_ip_address}
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan}
-| | ... | up
-| | And Add interfaces to L2BD | ${dut1_node} | ${BID}
-| | ... | ${dut1_to_tg} | ${dut1s_vxlan}
-| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI}
-| | | ... | ${dut2s_ip_address} | ${dut1s_ip_address}
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan}
-| | ... | up
-| | And Add interfaces to L2BD | ${dut2_node} | ${BID}
-| | ... | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send ICMPv4 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
deleted file mode 100644
index b69abb09d5..0000000000
--- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/double_qemu_setup.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Run Keywords | Tear down functional test
-| ... | AND | Run keyword | Tear down QEMU | ${dut1_node}
-| ... | ${${qemu1}} | ${qemu1}
-| ... | AND | Run keyword | Tear down QEMU | ${dut2_node}
-| ... | ${${qemu2}} | ${qemu2}
-| Documentation | *L2BD with VM combined with VXLAN test cases - IPv4*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on
-| ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | bridge-domain (L2BD) switching combined with MAC learning enabled;
-| ... | VXLAN tunnels are configured between L2BDs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent
-| ... | in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${vni_1}= | 23
-
-| ${bd_id1}= | 10
-| ${bd_id2}= | 20
-
-| ${ip4_addr1}= | 172.16.0.1
-| ${ip4_addr2}= | 172.16.0.2
-| ${ip4_prefix}= | 24
-
-| ${sock1}= | /tmp/sock1
-| ${sock2}= | /tmp/sock2
-
-| ${qemu1}= | qemu_instance_1
-| ${qemu2}= | qemu_instance_2
-
-| ${dut1_vhost1}= | dut1_vhost_if1
-| ${dut1_vhost2}= | dut1_vhost_if2
-| ${dut2_vhost1}= | dut2_vhost_if1
-| ${dut2_vhost2}= | dut2_vhost_if2
-
-*** Test Cases ***
-| TC01:DUT1 and DUT2 with two L2BDs and VXLANoIPv4 tunnel switch ICMPv4 between TG links and VM links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-VM-DUT1-DUT2-VM-DUT2-TG.
-| | ... | [Enc] Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on DUT1-DUT2; Eth-IPv4-ICMPv4
-| | ... | on TG-DUTn and DUTn=VM.
-| | ... | [Cfg] On both DUTs configure two L2BDs (MAC learning enabled); first
-| | ... | L2BD with untagged interface to TG and vhost-user interface to local
-| | ... | VM, second one with vhost-user interface to local VM and VXLAN
-| | ... | interface towards the other DUT. Configure linux bridge on both VMs
-| | ... | to pass traffic between both vhost-user interfaces.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between two of its interfaces to
-| | ... | be switched by DUT1 and DUT2; verify packets are switched between
-| | ... | these TG interfaces.
-| | ... | [Ref] RFC7348.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node}
-| | ... | ${sock1}
-| | ... | ${sock2}
-| | ... | ${dut1_vhost1}
-| | ... | ${dut1_vhost2}
-| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node}
-| | ... | ${sock1}
-| | ... | ${sock2}
-| | ... | ${dut2_vhost1}
-| | ... | ${dut2_vhost2}
-| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1}
-| | ... | ${sock2} | ${qemu1}
-| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1}
-| | ... | ${sock2} | ${qemu2}
-| | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1}
-| | ... | ${ip4_prefix}
-| | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2}
-| | ... | ${ip4_prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr2}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr1}
-| | ${dut1s_vxlan}= | And Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${ip4_addr1} | ${ip4_addr2}
-| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${ip4_addr2} | ${ip4_addr1}
-| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
-| | ... | ${dut1_to_tg} | ${${dut1_vhost1}}
-| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2}
-| | ... | ${dut1s_vxlan} | ${${dut1_vhost2}}
-| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
-| | ... | ${dut2_to_tg} | ${${dut2_vhost1}}
-| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2}
-| | ... | ${dut2s_vxlan} | ${${dut2_vhost2}}
-| | Then Send ICMPv4 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
deleted file mode 100644
index 6db2ee27ff..0000000000
--- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/double_qemu_setup.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *Bridge-domain with VXLAN test cases - IPv4*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on
-| ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | bridge-domain (L2BD) switching combined with MAC learning enabled;
-| ... | VXLAN tunnels are configured between L2BDs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent
-| ... | in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${vni_1}= | 23
-| ${vni_2}= | 35
-
-| ${bd_id1}= | 10
-| ${bd_id2}= | 20
-| ${bd_id3}= | 30
-| ${shg1}= | 1
-| ${shg2}= | 2
-
-| ${ip4_addr1}= | 172.16.0.1
-| ${ip4_addr2}= | 172.16.0.2
-| ${ip4_prefix}= | 24
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VXLANoIPv4 tunnels switch ICMPv4 between TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on \
-| | ... | DUT1-DUT2; Eth-IPv4-ICMPv4 on TG-DUTn. [Cfg] On DUT1 and DUT2
-| | ... | configure two i/fs into L2BD with MAC learning. [Ver] Make TG
-| | ... | verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 in
-| | ... | both directions and are correct on receive. [Ref] RFC7348.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2}
-| | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1}
-| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
-| | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE}
-| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${dut1s_ip_address} | ${dut2s_ip_address}
-| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
-| | ... | ${dut1_to_tg} | ${dut1s_vxlan}
-| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${dut2s_ip_address} | ${dut1s_ip_address}
-| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
-| | ... | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send ICMPv4 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot
deleted file mode 100644
index 83985cdb00..0000000000
--- a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Resource | resources/libraries/robot/l2_xconnect.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *RFC7348 VXLAN: L2 cross-connect with VXLAN test cases*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on
-| ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | cross-connect (L2XC) switching; VXLAN tunnels are configured between
-| ... | L2XCs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets
-| ... | are sent in both directions by TG on links to DUT1 and DUT2; on receive
-| ... | TG verifies packets for correctness and their IPv4 src-addr, dst-addr
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${VNI}= | 24
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC and VXLANoIPv4 tunnels switch ICMPv4 between TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on \
-| | ... | [Ref] RFC7348.DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn. [Cfg] On
-| | ... | DUT1 and DUT2 configure L2 cross-connect (L2XC), each with one
-| | ... | interface to TG and one VXLAN tunnel interface towards the other
-| | ... | DUT. [Ver] Make TG send ICMPv4 Echo Req between two of its
-| | ... | interfaces; verify all packets are received. [Ref] RFC7348.
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2}
-| | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1}
-| | And Configure IP addresses and neighbors on interfaces
-| | ... | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
-| | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE}
-| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI}
-| | | ... | ${dut1s_ip_address} | ${dut2s_ip_address}
-| | And Configure L2XC | ${dut1_node} | ${dut1_to_tg} | ${dut1s_vxlan}
-| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI}
-| | | ... | ${dut2s_ip_address} | ${dut1s_ip_address}
-| | And Configure L2XC | ${dut2_node} | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send ICMPv4 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
deleted file mode 100644
index 429d9a3353..0000000000
--- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/double_qemu_setup.robot
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.IPv6Setup
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Run Keywords | Tear down functional test
-| ... | AND | Run keyword | Tear down QEMU | ${dut1_node}
-| ... | ${${qemu1}} | ${qemu1}
-| ... | AND | Run keyword | Tear down QEMU | ${dut2_node}
-| ... | ${${qemu2}} | ${qemu2}
-| Documentation | *L2BD with VM combined with VXLAN test cases - IPv6*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv6-VXLAN-Eth-IPv6-ICMPv6 on
-| ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUTn for L2 switching of IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | bridge-domain (L2BD) switching combined with MAC learning enabled;
-| ... | VXLAN tunnels are configured between L2BDs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent
-| ... | in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv6 src-addr, dst-addr
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${vni_1}= | 23
-
-| ${bd_id1}= | 10
-| ${bd_id2}= | 20
-
-| ${ip6_addr1}= | 3ffe:64::1
-| ${ip6_addr2}= | 3ffe:64::2
-| ${ip6_prefix}= | 64
-
-| ${sock1}= | /tmp/sock1
-| ${sock2}= | /tmp/sock2
-
-| ${qemu1}= | qemu_instance_1
-| ${qemu2}= | qemu_instance_2
-
-| ${dut1_vhost1}= | dut1_vhost_if1
-| ${dut1_vhost2}= | dut1_vhost_if2
-| ${dut2_vhost1}= | dut2_vhost_if1
-| ${dut2_vhost2}= | dut2_vhost_if2
-
-*** Test Cases ***
-| TC01:DUT1 and DUT2 with two L2BDs and VXLANoIPv6 tunnel switch ICMPv6 between TG links and VM links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-VM-DUT1-DUT2-VM-DUT2-TG.
-| | ... | [Enc] Eth-IPv6-VXLAN-Eth-IPv6-ICMPv6 on DUT1-DUT2; Eth-IPv4-ICMPv4
-| | ... | on TG-DUTn and DUTn=VM.
-| | ... | [Cfg] On both DUTs configure two L2BDs (MAC learning enabled); first
-| | ... | L2BD with untagged interface to TG and vhost-user interface to local
-| | ... | VM, second one with vhost-user interface to local VM and VXLAN
-| | ... | interface towards the other DUT. Configure linux bridge on both VMs
-| | ... | to pass traffic between both vhost-user interfaces.
-| | ... | [Ver] Make TG send ICMPv6 Echo Req between two of its interfaces to
-| | ... | be switched by DUT1 and DUT2; verify packets are switched between
-| | ... | these TG interfaces.
-| | ... | [Ref] RFC7348.
-| | [Tags] | VPP_VM_ENV
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node}
-| | ... | ${sock1}
-| | ... | ${sock2}
-| | ... | ${dut1_vhost1}
-| | ... | ${dut1_vhost2}
-| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node}
-| | ... | ${sock1}
-| | ... | ${sock2}
-| | ... | ${dut2_vhost1}
-| | ... | ${dut2_vhost2}
-| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1}
-| | ... | ${sock2} | ${qemu1}
-| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1}
-| | ... | ${sock2} | ${qemu2}
-| | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
-| | ... | ${ip6_prefix}
-| | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2}
-| | ... | ${ip6_prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr2}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr1}
-| | And Vpp All RA Suppress Link Layer | ${nodes}
-| | ${dut1s_vxlan}= | And Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${ip6_addr1} | ${ip6_addr2}
-| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${ip6_addr2} | ${ip6_addr1}
-| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
-| | ... | ${dut1_to_tg} | ${${dut1_vhost1}}
-| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2}
-| | ... | ${dut1s_vxlan} | ${${dut1_vhost2}}
-| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
-| | ... | ${dut2_to_tg} | ${${dut2_vhost1}}
-| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2}
-| | ... | ${dut2s_vxlan} | ${${dut2_vhost2}}
-| | Then Send ICMPv6 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot
deleted file mode 100644
index f817baa3a6..0000000000
--- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/double_qemu_setup.robot
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.IPv6Setup
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *Bridge-domain with VXLAN test cases - IPv6*
-| ...
-| ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv6-VXLAN-Eth-IPv6-ICMPv6 on
-| ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUTn for L2 switching of IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | bridge-domain (L2BD) switching combined with MAC learning enabled;
-| ... | VXLAN tunnels are configured between L2BDs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent
-| ... | in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv6 src-addr, dst-addr
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${vni_1}= | 23
-
-| ${bd_id1}= | 10
-
-| ${ip6_addr1}= | 3ffe:64::1
-| ${ip6_addr2}= | 3ffe:64::2
-| ${ip6_prefix}= | 64
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VXLANoIPv6 tunnels switch ICMPv6 between TG links
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG.[Enc] Eth-IPv6-VXLAN-Eth-IPv6-ICMPv6 on \
-| | ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUTn. [Cfg] On DUT1 and DUT2
-| | ... | configure L2 bridge-domain (MAC learning enabled), each with one
-| | ... | interface to TG and one VXLAN tunnel interface towards the other
-| | ... | DUT. [Ver] Make TG send ICMPv6 Echo Req between two of its
-| | ... | interfaces to be switched by DUT1 and DUT2; verify all packets
-| | ... | are received. [Ref] RFC7348.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path in 3-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
-| | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
-| | ... | ${ip6_prefix}
-| | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2}
-| | ... | ${ip6_prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr2}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr1}
-| | And Vpp All RA Suppress Link Layer | ${nodes}
-| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${ip6_addr1} | ${ip6_addr2}
-| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
-| | ... | ${dut1_to_tg} | ${dut1s_vxlan}
-| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${ip6_addr2} | ${ip6_addr1}
-| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
-| | ... | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send ICMPv6 bidirectionally and verify received packets
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot
deleted file mode 100644
index 8ae7286583..0000000000
--- a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/double_qemu_setup.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2BD with SHG combined with VXLAN test cases - IPv4*
-| ...
-| ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology
-| ... | with double parallel links.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on
-| ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUTn for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | bridge-domain (L2BD) switching combined with MAC learning enabled
-| ... | and Split Horizon Groups (SHG); VXLAN tunnels are configured
-| ... | between L2BDs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent
-| ... | in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${vni_1}= | 23
-| ${vni_2}= | 35
-
-| ${bd_id1}= | 10
-| ${bd_id2}= | 20
-| ${bd_id3}= | 30
-| ${shg1}= | 1
-| ${shg2}= | 2
-
-| ${ip4_addr1}= | 172.16.0.1
-| ${ip4_addr2}= | 172.16.0.2
-| ${ip4_prefix}= | 24
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VXLANoIPv4 tunnels in SHG switch ICMPv4 between TG links
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG. [Enc] Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on \
-| | ... | DUT1-DUT2; Eth-IPv4-ICMPv4 on TG-DUTn. [Cfg] On DUT1 configure L2
-| | ... | bridge-domain (MAC learning enabled) with two untagged interfaces
-| | ... | to TG and two VXLAN interfaces towards the DUT2 and put both VXLAN
-| | ... | interfaces into the same Split-Horizon-Group (SHG). On DUT2 configure
-| | ... | two L2 bridge-domain (MAC learning enabled), each with one untagged
-| | ... | interface to TG and one VXLAN interface towards the DUT1. [Ver] Make
-| | ... | TG send ICMPv4 Echo Reqs between all four of its interfaces to be
-| | ... | switched by DUT1 and DUT2; verify packets are not switched between
-| | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1.
-| | ... | [Ref] RFC7348.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
-| | ... | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']}
-| | And Set interfaces in 3-node BD-SHG test up
-| | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1}
-| | ... | ${ip4_prefix}
-| | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2}
-| | ... | ${ip4_prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr2}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr1}
-| | ${dut1s_vxlan1}= | When Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${ip4_addr1} | ${ip4_addr2}
-| | ${dut1s_vxlan2}= | And Create VXLAN interface | ${dut1_node} | ${vni_2}
-| | | ... | ${ip4_addr1} | ${ip4_addr2}
-| | ${dut2s_vxlan1}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${ip4_addr2} | ${ip4_addr1}
-| | ${dut2s_vxlan2}= | And Create VXLAN interface | ${dut2_node} | ${vni_2}
-| | | ... | ${ip4_addr2} | ${ip4_addr1}
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan1} | up
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan2} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan1} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
-| | And Vpp Node Interfaces Ready Wait | ${dut1_node}
-| | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
-| | ... | ${bd_id1} | ${shg1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
-| | ... | ${bd_id1} | ${shg1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
-| | ... | ${bd_id2}
-| | And Create bridge domain | ${dut2_node} | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
-| | ... | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
-| | ... | ${bd_id3}
-| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if2}
-| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if2}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMPv4 bidirectionally and verify received packets
-| | | ... | ${tg_node} | ${tg_to_dut2_if1}
-| | | ... | ${tg_to_dut2_if2}
-
-| TC01: DUT1 and DUT2 with L2BD and VXLANoIPv4 tunnels in different SHGs switch ICMPv4 between TG links
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG.[Enc] Eth-IPv4-VXLAN-Eth-IPv4-ICMPv4 on \
-| | ... | DUT1-DUT2; Eth-IPv4-ICMPv4 on TG-DUTn. [Cfg] On DUT1 configure L2
-| | ... | bridge-domain (MAC learning enabled) with two untagged interfaces
-| | ... | to TG and two VXLAN interfaces towards the DUT2 and put both VXLAN
-| | ... | interfaces into the different Split-Horizon-Group (SHGs). On DUT2
-| | ... | configure two L2 bridge-domain (MAC learning enabled), each with one
-| | ... | untagged interface to TG and one VXLAN interface towards the DUT1.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between all four of its interfaces
-| | ... | to be switched by DUT1 and DUT2; verify packets are switched between
-| | ... | all TG interfaces. [Ref] RFC7348.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
-| | ... | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']}
-| | And Set interfaces in 3-node BD-SHG test up
-| | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1}
-| | ... | ${ip4_prefix}
-| | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2}
-| | ... | ${ip4_prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr2}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr1}
-| | ${dut1s_vxlan1}= | When Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${ip4_addr1} | ${ip4_addr2}
-| | ${dut1s_vxlan2}= | And Create VXLAN interface | ${dut1_node} | ${vni_2}
-| | | ... | ${ip4_addr1} | ${ip4_addr2}
-| | ${dut2s_vxlan1}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${ip4_addr2} | ${ip4_addr1}
-| | ${dut2s_vxlan2}= | And Create VXLAN interface | ${dut2_node} | ${vni_2}
-| | | ... | ${ip4_addr2} | ${ip4_addr1}
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan1} | up
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan2} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan1} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
-| | And Vpp Node Interfaces Ready Wait | ${dut1_node}
-| | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
-| | ... | ${bd_id1} | ${shg1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
-| | ... | ${bd_id1} | ${shg2}
-| | And Create bridge domain | ${dut2_node} | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
-| | ... | ${bd_id2}
-| | And Create bridge domain | ${dut2_node} | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
-| | ... | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
-| | ... | ${bd_id3}
-| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if2}
-| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if2}
-| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut2_if1}
-| | ... | ${tg_to_dut2_if2}
diff --git a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot
deleted file mode 100644
index e4dec5bd1e..0000000000
--- a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright (c) 2016 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/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/vxlan.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/double_qemu_setup.robot
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.IPv6Setup
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2BD with SHG combined with VXLAN test cases - IPv6*
-| ...
-| ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology
-| ... | with double parallel links.
-| ... | *[Enc] Packet encapsulations:* th-IPv6-VXLAN-Eth-IPv6-ICMPv6 on
-| ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUTn for L2 switching of IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | bridge-domain (L2BD) switching combined with MAC learning enabled
-| ... | and Split Horizon Groups (SHG); VXLAN tunnels are configured
-| ... | between L2BDs on DUT1 and DUT2.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent
-| ... | in both directions by TG on links to DUT1 and DUT2; on receive TG
-| ... | verifies packets for correctness and their IPv6 src-addr, dst-addr
-| ... | and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC7348.
-
-*** Variables ***
-| ${vni_1}= | 23
-| ${vni_2}= | 35
-
-| ${bd_id1}= | 10
-| ${bd_id2}= | 20
-| ${bd_id3}= | 30
-| ${shg1}= | 1
-| ${shg2}= | 2
-
-| ${ip6_addr1}= | 3ffe:64::1
-| ${ip6_addr2}= | 3ffe:64::2
-| ${ip6_prefix}= | 64
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VXLANoIPv6 tunnels in SHG switch ICMPv6 between TG links
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG. [Enc] Eth-IPv6-VXLAN-Eth-IPv6-ICMPv6 on \
-| | ... | DUT1-DUT2; Eth-IPv6-ICMPv6 on TG-DUTn. [Cfg] On DUT1 configure L2
-| | ... | bridge-domain (MAC learning enabled) with two untagged interfaces
-| | ... | to TG and two VXLAN interfaces towards the DUT2 and put both VXLAN
-| | ... | interfaces into the same Split-Horizon-Group (SHG). On DUT2 configure
-| | ... | two L2 bridge-domain (MAC learning enabled), each with one untagged
-| | ... | interface to TG and one VXLAN interface towards the DUT1. [Ver] Make
-| | ... | TG send ICMPv6 Echo Reqs between all four of its interfaces to be
-| | ... | switched by DUT1 and DUT2; verify packets are not switched between
-| | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1.
-| | ... | [Ref] RFC7348.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
-| | ... | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']}
-| | And Set interfaces in 3-node BD-SHG test up
-| | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
-| | ... | ${ip6_prefix}
-| | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2}
-| | ... | ${ip6_prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr2}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr1}
-| | And Vpp All RA Suppress Link Layer | ${nodes}
-| | ${dut1s_vxlan1}= | When Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${ip6_addr1} | ${ip6_addr2}
-| | ${dut1s_vxlan2}= | And Create VXLAN interface | ${dut1_node} | ${vni_2}
-| | | ... | ${ip6_addr1} | ${ip6_addr2}
-| | ${dut2s_vxlan1}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${ip6_addr2} | ${ip6_addr1}
-| | ${dut2s_vxlan2}= | And Create VXLAN interface | ${dut2_node} | ${vni_2}
-| | | ... | ${ip6_addr2} | ${ip6_addr1}
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan1} | up
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan2} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan1} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
-| | And Vpp Node Interfaces Ready Wait | ${dut1_node}
-| | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
-| | ... | ${bd_id1} | ${shg1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
-| | ... | ${bd_id1} | ${shg1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
-| | ... | ${bd_id2}
-| | And Create bridge domain | ${dut2_node} | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
-| | ... | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
-| | ... | ${bd_id3}
-| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if2}
-| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if2}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMPv6 bidirectionally and verify received packets
-| | | ... | ${tg_node} | ${tg_to_dut2_if1}
-| | | ... | ${tg_to_dut2_if2}
-
-| TC02: DUT1 and DUT2 with L2BD and VXLANoIPv6 tunnels in different SHGs switch ICMPv6 between TG links
-| | [Documentation]
-| | ... | [Top] TG=DUT1=DUT2=TG.[Enc] Eth-IPv6-VXLAN-Eth-IPv6-ICMPv6 on \
-| | ... | DUT1-DUT2; Eth-IPv6-ICMPv6 on TG-DUTn. [Cfg] On DUT1 configure L2
-| | ... | bridge-domain (MAC learning enabled) with two untagged interfaces
-| | ... | to TG and two VXLAN interfaces towards the DUT2 and put both VXLAN
-| | ... | interfaces into the different Split-Horizon-Group (SHGs). On DUT2
-| | ... | configure two L2 bridge-domain (MAC learning enabled), each with one
-| | ... | untagged interface to TG and one VXLAN interface towards the DUT1.
-| | ... | [Ver] Make TG send ICMPv6 Echo Req between all four of its interfaces
-| | ... | to be switched by DUT1 and DUT2; verify packets are switched between
-| | ... | all TG interfaces. [Ref] RFC7348.
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
-| | ... | ${nodes['DUT1']}
-| | ... | ${nodes['DUT2']}
-| | And Set interfaces in 3-node BD-SHG test up
-| | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
-| | ... | ${ip6_prefix}
-| | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2}
-| | ... | ${ip6_prefix}
-| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr2}
-| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr1}
-| | And Vpp All RA Suppress Link Layer | ${nodes}
-| | ${dut1s_vxlan1}= | When Create VXLAN interface | ${dut1_node} | ${vni_1}
-| | | ... | ${ip6_addr1} | ${ip6_addr2}
-| | ${dut1s_vxlan2}= | And Create VXLAN interface | ${dut1_node} | ${vni_2}
-| | | ... | ${ip6_addr1} | ${ip6_addr2}
-| | ${dut2s_vxlan1}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
-| | | ... | ${ip6_addr2} | ${ip6_addr1}
-| | ${dut2s_vxlan2}= | And Create VXLAN interface | ${dut2_node} | ${vni_2}
-| | | ... | ${ip6_addr2} | ${ip6_addr1}
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan1} | up
-| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan2} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan1} | up
-| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
-| | And Vpp Node Interfaces Ready Wait | ${dut1_node}
-| | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
-| | ... | ${bd_id1} | ${shg1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
-| | ... | ${bd_id1} | ${shg2}
-| | And Create bridge domain | ${dut2_node} | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
-| | ... | ${bd_id2}
-| | And Create bridge domain | ${dut2_node} | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
-| | ... | ${bd_id3}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
-| | ... | ${bd_id3}
-| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if1}
-| | ... | ${tg_to_dut2_if2}
-| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if1}
-| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut1_if2}
-| | ... | ${tg_to_dut2_if2}
-| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut2_if1}
-| | ... | ${tg_to_dut2_if2}