aboutsummaryrefslogtreecommitdiffstats
path: root/tests/func/vlan
diff options
context:
space:
mode:
Diffstat (limited to 'tests/func/vlan')
-rw-r--r--tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot221
-rw-r--r--tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot189
-rw-r--r--tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot405
-rw-r--r--tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot69
-rw-r--r--tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot346
-rw-r--r--tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot394
-rw-r--r--tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot335
-rw-r--r--tests/func/vlan/eth2p-dot1q-ip4base-func.robot107
-rw-r--r--tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot145
-rw-r--r--tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot206
-rw-r--r--tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot171
11 files changed, 0 insertions, 2588 deletions
diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot
deleted file mode 100644
index 249e0dea33..0000000000
--- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot
+++ /dev/null
@@ -1,221 +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/bridge_domain.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2BD with VLAN tag rewrite test cases - transalte-2-1*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1ad-IPv4-ICMPv4 or
-| ... | Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1, Eth-dot1q-IPv4-ICMPv4 or
-| ... | Eth-dot1q-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv4-ICMPv4 or Eth-IPv6-ICMPv6
-| ... | on TG-DUT2 for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with bridge domain (L2BD)
-| ... | switching combined with MAC learning enabled and added VLAN
-| ... | sub-interface with VLAN tag rewrite translate-2-1 method of interface
-| ... | towards TG and interface towards DUT2. DUT2 is configured with L2
-| ... | bridge domain (L2BD) switching between VLAN sub-interface with VLAN tag
-| ... | rewrite pop-1 method of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${bd_id1}= | 1
-
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${inner_vlan_id1}= | 210
-
-| ${src_ip6}= | 3ffe:63::1
-| ${dst_ip6}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VLAN translate-2-1 (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method; on DUT2 configure L2 bridge domain (L2BD) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2BD and VLAN translate-2-1 with wrong tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method to set tag different from tag set on VLAN
-| | ... | sub-interface of DUT2; on DUT2 configure L2 bridge domain (L2BD) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-
-| TC03: DUT1 and DUT2 with L2BD and VLAN translate-2-1 (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method; on DUT2 configure L2 bridge domain (L2BD) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6}
-| | ... | dst_ip=${dst_ip6} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2BD and VLAN translate-2-1 with wrong tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method to set tag different from tag set on VLAN
-| | ... | sub-interface of DUT2; on DUT2 configure L2 bridge domain (L2BD) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot
deleted file mode 100644
index f3643be8bb..0000000000
--- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot
+++ /dev/null
@@ -1,189 +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/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-1*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1ad-IPv4-ICMPv4 or
-| ... | Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1, Eth-dot1q-IPv4-ICMPv4 or
-| ... | Eth-dot1aq-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2
-| ... | for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect
-| ... | (L2XC) switching between VLAN sub-interface with VLAN tag rewrite
-| ... | translate-2-1 method of interface towards TG and interface towards DUT2.
-| ... | DUT2 is configured configured with L2 cross-connect (L2XC) switching
-| ... | between VLAN sub-interface with VLAN tag rewrite pop-1 method
-| ... | of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${inner_vlan_id1}= | 210
-
-| ${src_ip}= | 3ffe:63::1
-| ${dst_ip}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC and VLAN translate-2-1 (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method; on DUT2 configure L2 cross-connect (L2XC) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2XC and VLAN translate-2-1 with wrong tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method to set tag different from tag set on VLAN
-| | ... | sub-interface of DUT2; on DUT2 configure L2 cross-connect (L2XC) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC03: DUT1 and DUT2 with L2XC and VLAN translate-2-1 (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method; on DUT2 configure L2 cross-connect (L2XC) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagegd with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip}
-| | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2XC and VLAN translate-2-1 with wrong tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1q-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one Dot1ad sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-2-1 method to set tag different from tag set on VLAN
-| | ... | sub-interface of DUT2; on DUT2 configure L2 cross-connect (L2XC) with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-1 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagegd with Dot1ad tags from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
diff --git a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot
deleted file mode 100644
index 6efc508423..0000000000
--- a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot
+++ /dev/null
@@ -1,405 +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/bridge_domain.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2BD with VLAN tag rewrite test cases - translate-2-2*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1ad-IPv4-ICMPv4 or
-| ... | Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and DUT1-DUT2, Eth-IPv4-ICMPv4 or
-| ... | Eth-IPv6-ICMPv6 on TG-DUT2 for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with bridge domain (L2BD)
-| ... | switching combined with MAC learning enabled and added VLAN
-| ... | sub-interface with VLAN tag rewrite translate-2-2 method of interface
-| ... | towards TG and interface towards DUT2. DUT2 is configured with L2
-| ... | bridge domain (L2BD) switching between VLAN sub-interface with VLAN tag
-| ... | rewrite pop-2 method of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${bd_id1}= | 1
-
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${inner_vlan_id1}= | 210
-| ${inner_vlan_id2}= | 220
-| ${inner_vlan_wrong}= | 250
-
-| ${src_ip6}= | 3ffe:63::1
-| ${dst_ip6}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VLAN translate-2-2 switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG and
-| | ... | one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-2
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2BD and VLAN translate-2-2 with wrong inner tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set inner tag different from inner tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 bridge domain (L2BD) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-2 tagged with Dot1ad tags from one of its interfaces to another
-| | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2;
-| | ... | verify that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC03: DUT1 and DUT2 with L2BD and VLAN translate-2-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set outer tag different from outer tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 bridge domain (L2BD) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-2 tagged with Dot1ad tags from one of its interfaces to another
-| | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2;
-| | ... | verify that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2BD and VLAN translate-2-2 with wrong outer and inner tags used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set tags different from tags set on Dot1ad sub-interface of DUT2;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG
-| | ... | and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-2
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC05: DUT1 and DUT2 with L2BD and VLAN translate-2-2 switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG and
-| | ... | one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6}
-| | ... | dst_ip=${dst_ip6} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC06: DUT1 and DUT2 with L2BD and VLAN translate-2-2 with wrong inner tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set inner tag different from inner tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 bridge domain (L2BD) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-1 tagged with Dot1ad tags from one of its interfaces to another
-| | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2;
-| | ... | verify that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC07: DUT1 and DUT2 with L2BD and VLAN translate-2-2 with wrong outer tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set outer tag different from outer tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 bridge domain (L2BD) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-1 tagged with Dot1ad tags from one of its interfaces to another
-| | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2;
-| | ... | verify that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC08: DUT1 and DUT2 with L2BD and VLAN translate-2-2 with wrong outer and inner tags used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set tags different from tags set on Dot1ad sub-interface of DUT2;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG
-| | ... | and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
diff --git a/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot
deleted file mode 100644
index 488f9fa822..0000000000
--- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot
+++ /dev/null
@@ -1,69 +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/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2 cross-connect with QinQ test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with
-| ... | single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1ad-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 with 802.1ad QinQ VLAN tag push and pop.
-| ... | *[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:* IEEE 802.1ad.
-
-*** Variables ***
-| ${subid}= | 10
-| ${outer_vlan_id}= | 100
-| ${inner_vlan_id}= | 200
-| ${type_subif}= | two_tags
-| ${tag_rewrite_method}= | pop-2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC and two VLAN push-pop switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on \
-| | ... | 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 Ethernet interface towards the other DUT; each DUT
-| | ... | pushes two VLAN tags on packets received from local TG, and
-| | ... | popping two VLAN tags on packets transmitted to local TG. [Ver]
-| | ... | Make TG send ICMPv4 Echo Req in both directions between two of
-| | ... | its interfaces to be switched by DUT1 and DUT2; verify all
-| | ... | packets are received. [Ref] IEEE 802.1ad.
-| | 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 Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1_node} | ${subif_index_1} | ${dut2_node} | ${subif_index_2}
-| | ... | ${tag_rewrite_method}
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subif_index_1}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${subif_index_2}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot
deleted file mode 100644
index c646cbcd03..0000000000
--- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot
+++ /dev/null
@@ -1,346 +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/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-2*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1ad-IPv4-ICMPv4 or
-| ... | Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and DUT1-DUT2, Eth-IPv4-ICMPv4 or
-| ... | Eth-IPv6-ICMPv6 on TG-DUT2 for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect
-| ... | (L2XC) switching between VLAN sub-interface with VLAN tag rewrite
-| ... | translate-2-2 method of interface towards TG and interface towards DUT2.
-| ... | DUT2 is configured configured with L2 cross-connect (L2XC) switching
-| ... | between VLAN sub-interface with VLAN tag rewrite pop-2 method
-| ... | of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${inner_vlan_id1}= | 210
-| ${inner_vlan_id2}= | 220
-| ${inner_vlan_wrong}= | 250
-
-| ${src_ip}= | 3ffe:63::1
-| ${dst_ip}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC and VLAN translate-2-2 switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method;
-| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG and
-| | ... | one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong inner tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set inner tag different from inner tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 cross-connect (L2XC) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-1 tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC03: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set outer tag different from outer tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 cross-connect (L2XC) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-1 tagged with Dot1ad tags from one of its interfaces to another
-| | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2;
-| | ... | verify that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer and inner tags used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set tags different from tags set on Dot1ad sub-interface of DUT2;
-| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG
-| | ... | and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | tagged with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC05: DUT1 and DUT2 with L2XC and VLAN translate-2-2 switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method;
-| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG and
-| | ... | one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | tagegd with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip}
-| | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
-| | ... | vlan2=${inner_vlan_id1}
-
-| TC06: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong inner tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set inner tag different from inner tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 cross-connect (L2XC) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-1 tagegd with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC07: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set outer tag different from outer tag set on Dot1ad sub-interface of
-| | ... | DUT2; on DUT2 configure L2 cross-connect (L2XC) with one interface to
-| | ... | TG and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite
-| | ... | pop-1 tagegd with Dot1ad tags from one of its interfaces to another
-| | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2;
-| | ... | verify that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
-
-| TC08: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer and inner tags used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one Dot1ad
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-2-2 method to
-| | ... | set tags different from tags set on Dot1ad sub-interface of DUT2;
-| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG
-| | ... | and one Dot1ad sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | tagegd with Dot1ad tags from one of its interfaces to another one
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad
-| | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot
deleted file mode 100644
index b5fbb41138..0000000000
--- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot
+++ /dev/null
@@ -1,394 +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/bridge_domain.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-2*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1q-IPv4-ICMPv4 or
-| ... | Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, Eth-dot1ad-IPv4-ICMPv4 or
-| ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv4-ICMPv4 or Eth-IPv6-ICMPv6
-| ... | on TG-DUT2 for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with bridge domain (L2BD)
-| ... | switching combined with MAC learning enabled and added VLAN
-| ... | sub-interface with VLAN tag rewrite translate-1-2 method of interface
-| ... | towards TG and interface towards DUT2. DUT2 is configured with L2
-| ... | bridge domain (L2BD) switching between VLAN sub-interface with VLAN tag
-| ... | rewrite pop-2 method of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${bd_id1}= | 1
-
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${inner_vlan_id1}= | 210
-| ${inner_vlan_id2}= | 220
-| ${inner_vlan_wrong}= | 250
-
-| ${src_ip6}= | 3ffe:63::1
-| ${dst_ip6}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VLAN translate-1-2 (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method; on DUT2 configure L2 bridge domain (L2BD) with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id1}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong inner tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set inner tag different from inner tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 bridge domain with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC03: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer tag different from outer tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 bridge domain with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id1}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer and inner tags different from tags
-| | ... | set on Dot1ad sub-interface of DUT2; on DUT2 configure L2
-| | ... | bridge domain with one interface to TG and one Dot1ad sub-interface
-| | ... | towards DUT1 with VLAN tag rewrite pop-2 method. [Ver] Make TG send
-| | ... | ICMPv4 Echo Req tagged with one Dot1q tag from one of its interfaces
-| | ... | to another one via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC05: DUT1 and DUT2 with L2BD and VLAN translate-1-2 (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method; on DUT2 configure L2 bridge domain (L2BD) with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6}
-| | ... | dst_ip=${dst_ip6} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC06: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong inner tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set inner tag different from inner tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 bridge domain with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC07: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer tag different from outer tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 bridge domain with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC08: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 bridge domain (L2BD) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer and inner tags different from tags
-| | ... | set on Dot1ad sub-interface of DUT2; on DUT2 configure L2
-| | ... | bridge domain with one interface to TG and one Dot1ad sub-interface
-| | ... | towards DUT1 with VLAN tag rewrite pop-2 method. [Ver] Make TG send
-| | ... | ICMPv6 Echo Req tagged with one Dot1q tag from one of its interfaces
-| | ... | to another one via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot
deleted file mode 100644
index bd1cebfd1e..0000000000
--- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot
+++ /dev/null
@@ -1,335 +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/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-2*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1q-IPv4-ICMPv4 or
-| ... | Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, Eth-dot1ad-IPv4-ICMPv4 or
-| ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv4-ICMPv4 or Eth-IPv6-ICMPv6
-| ... | on TG-DUT2 for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect
-| ... | (L2XC) switching between VLAN sub-interface with VLAN tag rewrite
-| ... | translate-1-2 method of interface towards TG and interface towards DUT2.
-| ... | DUT2 is configured configured with L2 cross-connect (L2XC) switching
-| ... | between VLAN sub-interface with VLAN tag rewrite pop-2 method
-| ... | of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${inner_vlan_id1}= | 210
-| ${inner_vlan_id2}= | 220
-| ${inner_vlan_wrong}= | 250
-
-| ${src_ip}= | 3ffe:63::1
-| ${dst_ip}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC and VLAN translate-1-2 (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method; on DUT2 configure L2 cross-connect (L2XC) with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id1}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong inner tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set inner tag different from inner tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 cross-connect with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC03: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer tag different from outer tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 cross-connect with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv4 Echo Req
-| | ... | tagged with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id1}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv4-ICMPv4 on DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer and inner tags different from tags
-| | ... | set on Dot1ad sub-interface of DUT2; on DUT2 configure L2
-| | ... | cross-connect with one interface to TG and one Dot1ad sub-interface
-| | ... | towards DUT1 with VLAN tag rewrite pop-2 method. [Ver] Make TG send
-| | ... | ICMPv4 Echo Req tagged with one Dot1q tag from one of its interfaces
-| | ... | to another one via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC05: DUT1 and DUT2 with L2XC and VLAN translate-1-2 (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method; on DUT2 configure L2 cross-connect (L2XC) with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagegd with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip}
-| | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC06: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong inner tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set inner tag different from inner tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 cross-connect with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagegd with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC07: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer tag different from outer tag set on
-| | ... | Dot1ad sub-interface of DUT2; on DUT2 configure L2 cross-connect with
-| | ... | one interface to TG and one Dot1ad sub-interface towards DUT1 with
-| | ... | VLAN tag rewrite pop-2 method. [Ver] Make TG send ICMPv6 Echo Req
-| | ... | tagegd with one Dot1q tag from one of its interfaces to another one
-| | ... | via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC08: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1, \
-| | ... | Eth-dot1ad-IPv6-ICMPv6 on DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2.
-| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC) with one interface to
-| | ... | DUT2 and one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | translate-1-2 method to set outer and inner tags different from tags
-| | ... | set on Dot1ad sub-interface of DUT2; on DUT2 configure L2
-| | ... | cross-connect with one interface to TG and one Dot1ad sub-interface
-| | ... | towards DUT1 with VLAN tag rewrite pop-2 method. [Ver] Make TG send
-| | ... | ICMPv6 Echo Req tagegd with one Dot1q tag from one of its interfaces
-| | ... | to another one via DUT1 and DUT2; verify that packet is not received.
-| | ... | [Ref] IEEE 802.1q, IEEE 802.1ad
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
-| | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
-| | ... | type_subif=two_tags dot1ad
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
-| | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-2
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
diff --git a/tests/func/vlan/eth2p-dot1q-ip4base-func.robot b/tests/func/vlan/eth2p-dot1q-ip4base-func.robot
deleted file mode 100644
index 19247b00ce..0000000000
--- a/tests/func/vlan/eth2p-dot1q-ip4base-func.robot
+++ /dev/null
@@ -1,107 +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/ipv4.robot
-| Resource | resources/libraries/robot/tagging.robot
-| Resource | resources/libraries/robot/traffic.robot
-| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.IPv6Util
-| Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *IPv4 with VLAN subinterfaces*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
-| ... | with double links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-IPv4-ICMPv4 on TG-DUT1-IF1,
-| ... | Eth-dot1q-IPv4-ICMPv4 on TG-DUT1-IF2.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with 2 Vlan subinterfaces
-| ... | on DUT1-IF2. The subinterfaces and DUT1-IF1 have IP addresses set and
-| ... | corresponding IP neighbor entries are configured.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q.
-
-*** Variables ***
-
-| ${ip4_net0_1}= | 192.168.0.1
-| ${ip4_net0_2}= | 192.168.0.2
-| ${ip4_net1_1}= | 192.168.100.1
-| ${ip4_net1_2}= | 192.168.100.2
-| ${ip4_net2_1}= | 192.168.200.1
-| ${ip4_net2_2}= | 192.168.200.2
-| ${ip4_prefix}= | 24
-| ${tag_1}= | ${10}
-| ${tag_2}= | ${20}
-
-*** Test Cases ***
-| TC01: Process untagged send tagged
-| | Given Vlan Test Setup
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${ip4_net0_2} | ${ip4_net2_2} | ${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}
-| | ... | encaps_rx=Dot1q | vlan_rx=${tag_2}
-
-| TC02: Process tagged send untagged
-# It doesn't work with virtio
-| | [Tags] | EXPECTED_FAILING
-| | Given Vlan Test Setup
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${ip4_net2_2} | ${ip4_net0_2} | ${tg_to_dut_if2}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac}
-| | ... | encaps_tx=Dot1q | vlan_tx=${tag_2}
-
-| TC03: Process tagged send tagged
-# It doesn't work with virtio
-| | [Tags] | EXPECTED_FAILING
-| | Given Vlan Test Setup
-| | Then Send packet and verify headers
-| | ... | ${tg_node} | ${ip4_net1_2} | ${ip4_net2_2} | ${tg_to_dut_if2}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | encaps_tx=Dot1q | vlan_tx=${tag_1}
-| | ... | encaps_rx=Dot1q | vlan_rx=${tag_2}
-| | And Send packet and verify headers
-| | ... | ${tg_node} | ${ip4_net2_2} | ${ip4_net1_2} | ${tg_to_dut_if2}
-| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
-| | ... | encaps_tx=Dot1q | vlan_tx=${tag_2}
-| | ... | encaps_rx=Dot1q | vlan_rx=${tag_1}
-
-*** Keywords ***
-| Vlan Test Setup
-| | Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | Set interfaces in 2-node circular topology up
-| |
-| | ${vlan1_name} | ${vlan1_index}= | Create vlan sub-interface
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_1}
-| | ${vlan2_name} | ${vlan2_index}= | Create vlan sub-interface
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_2}
-| |
-| | Set Interface Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${ip4_net0_1} | ${ip4_prefix}
-| | Set Interface Address | ${dut_node}
-| | ... | ${vlan1_index} | ${ip4_net1_1} | ${ip4_prefix}
-| | Set Interface Address | ${dut_node}
-| | ... | ${vlan2_index} | ${ip4_net2_1} | ${ip4_prefix}
-| |
-| | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${ip4_net0_2}
-| | ... | ${tg_to_dut_if1_mac}
-| | Add IP Neighbor | ${dut_node} | ${vlan1_index} | ${ip4_net1_2}
-| | ... | ${tg_to_dut_if2_mac}
-| | Add IP Neighbor | ${dut_node} | ${vlan2_index} | ${ip4_net2_2}
-| | ... | ${tg_to_dut_if2_mac}
diff --git a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
deleted file mode 100644
index 28ab67b266..0000000000
--- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
+++ /dev/null
@@ -1,145 +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/bridge_domain.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/tagging.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_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV
-| Test Setup | Set up functional test
-| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ... | AND | Show vpp trace dump on all DUTs
-| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node}
-| ... | AND | Verify VPP PID in Teardown
-| Documentation | *L2 bridge domain with VLAN tag over VM test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG=DUT 2-node circular topology
-| ... | with double links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1q-IPv4-ICMPv4 or
-| ... | Eth-dot1q-IPv6-ICMPv6 on TG=DUT and on DUT=VM.
-| ... | *[Cfg] DUT configuration:* DUT is configured with two bridge domains
-| ... | (L2BD) with MAC learning enabled; each one with added VLAN
-| ... | sub-interface towards TG and vhost-user interface to local VM. Configure
-| ... | linux bridge on VM to pass traffic between both vhost-user interfaces.
-| ... | *[Ver] TG verification:* Make TG send ICMPv4/ICMPv6 Echo Req between two
-| ... | of its interfaces to be switched by DUT via VM; verify packets are
-| ... | switched between these TG interfaces; on receive TG verifies packets for
-| ... | correctness and their IPv4 src-addr, dst-addr, MAC addresses and
-| ... | VLAN tag.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q.
-
-*** Variables ***
-| ${bd_id1}= | 1
-| ${bd_id2}= | 2
-
-| ${vlan_id1}= | 110
-| ${vlan_wrong}= | 150
-
-| ${sock1}= | /tmp/sock1
-| ${sock2}= | /tmp/sock2
-
-| ${ip4_1}= | 192.168.100.1
-| ${ip4_2}= | 192.168.100.2
-
-| ${ip6_1}= | 3ffe:63::1
-| ${ip6_2}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm - ipv4
-| | [Documentation]
-| | ... | [Top] TG=DUT.
-| | ... | [Enc] Eth-dot1q-IPv4-ICMPv4 on TG=DUT and on DUT=VM.
-| | ... | [Cfg] On DUT configure two L2BDs (MAC learning enabled); first L2BD
-| | ... | with Dot1Q tagged interface to TG-if1 and vhost-user interface to
-| | ... | local VM, second one with vhost-user interface to local VM and Dot1Q
-| | ... | tagged interface towards TG-if2. Configure linux bridge on VM to pass
-| | ... | traffic between both vhost-user interfaces.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT and VM; verify
-| | ... | that packet is received.
-| | ... | [Ref] IEEE 802.1q
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1}
-| | And Configure vhost interfaces for L2BD forwarding
-| | ... | ${dut_node} | ${sock1} | ${sock2}
-| | And Configure VM for vhost L2BD forwarding
-| | ... | ${dut_node} | ${sock1} | ${sock2}
-| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2}
-| | ... | ${bd_id2}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | ${ip4_1} | ${ip4_2}
-| | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q
-| | And Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${ip4_2} | ${ip4_1}
-| | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q
-
-| TC01: eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm - ipv6
-| | [Documentation]
-| | ... | [Top] TG=DUT.
-| | ... | [Enc] Eth-dot1q-IPv6-ICMPv6 on TG=DUT and on DUT=VM.
-| | ... | [Cfg] On DUT configure two L2BDs (MAC learning enabled); first L2BD
-| | ... | with Dot1Q tagged interface to TG-if1 and vhost-user interface to
-| | ... | local VM, second one with vhost-user interface to local VM and Dot1Q
-| | ... | tagged interface towards TG-if2. Configure linux bridge on VM to pass
-| | ... | traffic between both vhost-user interfaces.
-| | ... | [Ver] Make TG send ICMPv6 Echo Req tagged with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT and VM; verify
-| | ... | that packet is received.
-| | ... | [Ref] IEEE 802.1q
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1}
-| | And Configure vhost interfaces for L2BD forwarding
-| | ... | ${dut_node} | ${sock1} | ${sock2}
-| | And Configure VM for vhost L2BD forwarding
-| | ... | ${dut_node} | ${sock1} | ${sock2}
-| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index}
-| | ... | ${bd_id2}
-| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2}
-| | ... | ${bd_id2}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | ${ip6_1} | ${ip6_2}
-| | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q
-| | And Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${ip6_2} | ${ip6_1}
-| | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q
-
-
-
-
diff --git a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot
deleted file mode 100644
index 379d9a4ab6..0000000000
--- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot
+++ /dev/null
@@ -1,206 +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/bridge_domain.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-1*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1q-IPv4-ICMPv4 or
-| ... | Eth-dot1q-IPv6-ICMPv6 on TG-DUT1 and DUT1-DUT2, Eth-IPv4-ICMPv4 or
-| ... | Eth-IPv6-ICMPv6 on TG-DUT2 for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with bridge domain (L2BD)
-| ... | switching combined with MAC learning enabled and added VLAN
-| ... | sub-interface with VLAN tag rewrite translate-1-1 method of interface
-| ... | towards TG and interface towards DUT2. DUT2 is configured with L2
-| ... | bridge domain (L2BD) switching between VLAN sub-interface with VLAN tag
-| ... | rewrite pop-1 method of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${bd_id1}= | 1
-
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${inner_vlan_id1}= | 210
-| ${inner_vlan_wrong}= | 250
-
-| ${src_ip6}= | 3ffe:63::1
-| ${dst_ip6}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2BD and VLAN translate-1-1 (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain with one interface to DUT2 and one VLAN
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG
-| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1q
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2BD and VLAN translate-1-1 with wrong tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one VLAN
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method
-| | ... | to set tag different from tag set on VLAN sub-interface of DUT2;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG
-| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1q
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC03: DUT1 and DUT2 with L2BD and VLAN translate-1-1 (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one VLAN
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG
-| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagged with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1q
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6}
-| | ... | dst_ip=${dst_ip6} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2BD and VLAN translate-1-1 with wrong tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | bridge domain (L2BD) with one interface to DUT2 and one VLAN
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method
-| | ... | to set tag different from tag set on VLAN sub-interface of DUT2;
-| | ... | on DUT2 configure L2 bridge domain (L2BD) with one interface to TG
-| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagged with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1q
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Create bridge domain | ${dut1_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index}
-| | ... | ${bd_id1}
-| | And Create bridge domain | ${dut2_node} | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg}
-| | ... | ${bd_id1}
-| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index}
-| | ... | ${bd_id1}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
diff --git a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot
deleted file mode 100644
index bb91940a32..0000000000
--- a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot
+++ /dev/null
@@ -1,171 +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/tagging.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-1*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet encapsulations:* Eth-dot1q-IPv4-ICMPv4 or
-| ... | Eth-dot1q-IPv6-ICMPv6 on TG-DUT1 and DUT1-DUT2, Eth-IPv4-ICMPv4 or
-| ... | Eth-IPv4-ICMPv4 on TG-DUT2 for L2 switching of IPv4/IPv6.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect
-| ... | (L2XC) switching between VLAN sub-interface with VLAN tag rewrite
-| ... | translate-1-1 method of interface towards TG and interface towards DUT2.
-| ... | DUT2 is configured configured with L2 cross-connect (L2XC) switching
-| ... | between VLAN sub-interface with VLAN tag rewrite pop-1 method
-| ... | of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are
-| ... | sent from TG on link to DUT1 and received in TG on link form DUT2;
-| ... | on receive TG verifies packets for correctness and their IPv4 src-addr,
-| ... | dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q, IEEE 802.1ad.
-
-*** Variables ***
-| ${subid}= | 10
-
-| ${outer_vlan_id1}= | 110
-| ${outer_vlan_id2}= | 120
-| ${outer_vlan_wrong}= | 150
-
-| ${src_ip}= | 3ffe:63::1
-| ${dst_ip}= | 3ffe:63::2
-
-*** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC and VLAN translate-1-1 (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one VLAN
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method;
-| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG
-| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1q
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC02: DUT1 and DUT2 with L2XC and VLAN translate-1-1 with wrong tag used (DUT1) switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv4-ICMPv4 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv4-ICMPv4 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one VLAN tagged sub-interface to DUT2 and
-| | ... | one VLAN sub-interface towards TG with VLAN tag rewrite
-| | ... | (translate-1-1) on sub-interface to DUT2; on DUT2 configure L2XC with
-| | ... | one interface to TG and one VLAN sub-interface towards DUT1 with VLAN
-| | ... | tag pop-1. [Ver] Make TG send ICMPv4 Echo Req tagged with one dot1q
-| | ... | tag from one of its interfaces to another one via DUT1 and DUT2;
-| | ... | verify that packet is not received. [Ref] IEEE 802.1q
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC03: DUT1 and DUT2 with L2XC and VLAN translate-1-1 (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one VLAN
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method;
-| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG
-| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagegd with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
-| | ... | that packet is received. [Ref] IEEE 802.1q
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send ICMP packet and verify received packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip}
-| | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC04: DUT1 and DUT2 with L2XC and VLAN translate-1-1 with wrong tag used (DUT1) switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-dot1q-IPv6-ICMPv6 on TG-DUT1 and \
-| | ... | DUT1-DUT2, Eth-IPv6-ICMPv6 on TG-DUT2. [Cfg] On DUT1 configure L2
-| | ... | cross-connect (L2XC) with one interface to DUT2 and one VLAN
-| | ... | sub-interface towards TG with VLAN tag rewrite translate-1-1 method
-| | ... | to set tag different from tag set on VLAN sub-interface of DUT2;
-| | ... | on DUT2 configure L2 cross-connect (L2XC) with one interface to TG
-| | ... | and one VLAN sub-interface towards DUT1 with VLAN tag rewrite pop-1
-| | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagegd with one Dot1q tag
-| | ... | from one of its interfaces to another one via DUT1 and DUT2; verify
-| | ... | that packet is not received. [Ref] IEEE 802.1q
-| | [Tags] | SKIP_PATCH
-| | 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
-| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And Configure L2 tag rewrite method on interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong}
-| | And Configure L2 tag rewrite method on interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Connect interfaces and VLAN sub-interfaces using L2XC
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}