X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Fvlan%2Feth2p-dot1ad-l2xcbase-vlantrans22-func.robot;fp=tests%2Ffunc%2Fvlan%2Fvlan_tag_translate_l2_xconnect_ipv6.robot;h=49368ea003aa838c16f94afef1e1e5b113626ec6;hp=7f6144334982ec71a08b3faf50738b01afb7dd53;hb=982e81efab69bc007455481b6425fcebc7213906;hpb=c232d04e7a5bffb72063240ee7e15967f46c4873

diff --git a/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot
similarity index 55%
rename from tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot
rename to tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot
index 7f61443349..49368ea003 100644
--- a/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot
+++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot
@@ -20,22 +20,22 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV
 | Test Setup | Func Test Setup
 | Test Teardown | Func Test Teardown
-| Documentation | *L2 cross-connect with VLAN tag rewrite test cases - IPv6*
+| 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-dot1q-IPv6-ICMPv6 or
-| ... | Eth-dot1ad-IPv6-ICMPv6 on TG-DUT1 and DUT1-DUT2, Eth-IPv6-ICMPv6
-| ... | on TG-DUT2 for L2 switching of IPv6.
+| ... | *[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-1-1 method of interface towards TG and interface towards DUT2.
+| ... | 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-1 method
+| ... | between VLAN sub-interface with VLAN tag rewrite pop-2 method
 | ... | of interface towards DUT1 and interface towards TG.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are
+| ... | *[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 IPv6 src-addr,
+| ... | 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.
 
@@ -54,90 +54,30 @@
 | ${dst_ip}= | 3ffe:63::2
 
 *** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC and VLAN translate-1-1 (DUT1) switch ICMPv6 between two TG links
+| 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-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 Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send and receive ICMP Packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip}
-| | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1}
-
-| TC02: 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 Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
-| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
-| | ... | ${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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
-
-| TC03: 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
+| | ... | [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 Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${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 Tagged Subinterface Created
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
 | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
 | | ... | type_subif=two_tags dot1ad
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
 | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2}
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
 | | ... | ${vlan2_index} | pop-2
@@ -145,34 +85,35 @@
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
 | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
 | | Then Send and receive ICMP Packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip}
-| | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1}
+| | ... | ${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-1-2 with wrong inner tag used (DUT1) switch ICMPv6 between two TG links
+| 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-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
+| | ... | [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 Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${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 Tagged Subinterface Created
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
 | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
 | | ... | type_subif=two_tags dot1ad
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
 | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong}
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
 | | ... | ${vlan2_index} | pop-2
@@ -181,34 +122,35 @@
 | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
 | | Then Run Keyword And Expect Error | ICMP echo Rx timeout
 | | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
+| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
+| | ... | vlan2=${inner_vlan_id1}
 
-| TC05: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv6 between two TG links
+| 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-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
+| | ... | [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 Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${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 Tagged Subinterface Created
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
 | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
 | | ... | type_subif=two_tags dot1ad
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
 | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2}
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
 | | ... | ${vlan2_index} | pop-2
@@ -217,34 +159,35 @@
 | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
 | | Then Run Keyword And Expect Error | ICMP echo Rx timeout
 | | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1}
-| | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q
-| | ... | vlan1=${outer_vlan_id1}
+| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
+| | ... | vlan2=${inner_vlan_id1}
 
-| TC06: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv6 between two TG links
+| 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-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
+| | ... | [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 Path for 3-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1}
+| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
+| | ... | ${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 Tagged Subinterface Created
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid}
 | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2}
 | | ... | type_subif=two_tags dot1ad
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False}
+| | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False}
 | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong}
 | | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
 | | ... | ${vlan2_index} | pop-2
@@ -253,78 +196,10 @@
 | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
 | | Then Run Keyword And Expect Error | ICMP echo Rx timeout
 | | ... | Send and receive ICMP 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-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 Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
-| | ... | ${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 Vlan Subinterface Created
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
-| | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index}
-| | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index}
-| | Then Send and receive ICMP Packet
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip}
-| | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
+| | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
 | | ... | vlan2=${inner_vlan_id1}
 
-| TC08: 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 Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Interfaces in 3-node path are up
-| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created
-| | ... | ${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 Vlan Subinterface Created
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node}
-| | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong}
-| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node}
-| | ... | ${vlan2_index} | pop-1
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
-| | ... | ${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 and receive ICMP 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}
-
-| TC09: DUT1 and DUT2 with L2XC and VLAN translate-2-2 switch ICMPv6 between two TG links
+| 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
@@ -359,7 +234,7 @@
 | | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1}
 | | ... | vlan2=${inner_vlan_id1}
 
-| TC10: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong inner tag used (DUT1) switch ICMPv6 between two TG links
+| 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
@@ -396,7 +271,7 @@
 | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad
 | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
 
-| TC11: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer tag used (DUT1) switch ICMPv6 between two TG links
+| 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
@@ -433,7 +308,7 @@
 | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad
 | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1}
 
-| TC12: DUT1 and DUT2 with L2XC and VLAN translate-2-2 with wrong outer and inner tags used (DUT1) switch ICMPv6 between two TG links
+| 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