aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp/func/l2xc
diff options
context:
space:
mode:
Diffstat (limited to 'tests/vpp/func/l2xc')
-rw-r--r--tests/vpp/func/l2xc/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot335
-rw-r--r--tests/vpp/func/l2xc/eth2p-dot1q-l2xcbase-vlantrans11-func.robot171
2 files changed, 0 insertions, 506 deletions
diff --git a/tests/vpp/func/l2xc/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot b/tests/vpp/func/l2xc/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot
deleted file mode 100644
index 6952d368b8..0000000000
--- a/tests/vpp/func/l2xc/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/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/l2/tagging.robot
-| Resource | resources/libraries/robot/l2/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/vpp/func/l2xc/eth2p-dot1q-l2xcbase-vlantrans11-func.robot b/tests/vpp/func/l2xc/eth2p-dot1q-l2xcbase-vlantrans11-func.robot
deleted file mode 100644
index 49039e9db9..0000000000
--- a/tests/vpp/func/l2xc/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/shared/default.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/l2/tagging.robot
-| Resource | resources/libraries/robot/l2/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}