diff options
Diffstat (limited to 'tests/func/vlan')
11 files changed, 565 insertions, 565 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 index c48d2ca45c..249e0dea33 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot @@ -19,8 +19,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -68,30 +68,30 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | 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} @@ -109,31 +109,31 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -150,30 +150,30 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | 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} @@ -192,30 +192,30 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 index bf65f87acb..f3643be8bb 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot @@ -18,8 +18,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -65,23 +65,23 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | 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} @@ -99,24 +99,24 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -132,23 +132,23 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | 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} @@ -167,23 +167,23 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 index 48edbd54f9..6efc508423 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot @@ -19,8 +19,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -68,33 +68,33 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | 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} @@ -111,34 +111,34 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -155,34 +155,34 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -199,34 +199,34 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -241,33 +241,33 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | 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} @@ -285,34 +285,34 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -329,34 +329,34 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -373,33 +373,33 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 index 617447666a..488f9fa822 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot @@ -18,8 +18,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -53,17 +53,17 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When VLAN subinterfaces initialized on 3-node topology +| | 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 L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1_node} | ${subif_index_1} | ${dut2_node} | ${subif_index_2} | | ... | ${tag_rewrite_method} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | 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 index b96f291b97..c646cbcd03 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot @@ -18,8 +18,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -65,26 +65,26 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | 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} @@ -101,27 +101,27 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -138,27 +138,27 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -175,27 +175,27 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -210,26 +210,26 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | 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} @@ -247,27 +247,27 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -284,27 +284,27 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -321,26 +321,26 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 index 6f61c7880b..b5fbb41138 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot @@ -19,8 +19,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -70,31 +70,31 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -112,32 +112,32 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -154,32 +154,32 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -196,32 +196,32 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -236,31 +236,31 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | 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} @@ -278,32 +278,32 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -321,32 +321,32 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -364,31 +364,31 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 index c886247fba..bd1cebfd1e 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot @@ -18,8 +18,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -67,24 +67,24 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -102,25 +102,25 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -137,25 +137,25 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -172,25 +172,25 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -205,24 +205,24 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | 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} @@ -240,25 +240,25 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -276,25 +276,25 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} @@ -312,24 +312,24 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Tagged Subinterface Created +| | ${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 L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | 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 L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 index 5398574848..19247b00ce 100644 --- a/tests/func/vlan/eth2p-dot1q-ip4base-func.robot +++ b/tests/func/vlan/eth2p-dot1q-ip4base-func.robot @@ -20,8 +20,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -48,7 +48,7 @@ *** Test Cases *** | TC01: Process untagged send tagged | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | 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} @@ -58,7 +58,7 @@ # It doesn't work with virtio | | [Tags] | EXPECTED_FAILING | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | 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} @@ -68,13 +68,13 @@ # It doesn't work with virtio | | [Tags] | EXPECTED_FAILING | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | 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 Check Headers +| | 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} @@ -83,13 +83,13 @@ *** Keywords *** | Vlan Test Setup -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Interfaces in 2-node path are up +| | Set interfaces in 2-node circular topology up | | -| | ${vlan1_name} | ${vlan1_index}= | Vlan Subinterface Created +| | ${vlan1_name} | ${vlan1_index}= | Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_1} -| | ${vlan2_name} | ${vlan2_index}= | Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_2} | | | | Set Interface Address | ${dut_node} 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 index e2f0e3d9fd..28ab67b266 100644 --- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -21,11 +21,11 @@ | 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 | Func Test Setup +| 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 | Check VPP PID in Teardown +| ... | 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 @@ -74,29 +74,29 @@ | | ... | that packet is received. | | ... | [Ref] IEEE 802.1q | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1} -| | And VPP Vhost interfaces for L2BD forwarding are setup +| | And Configure vhost interfaces for L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And VM for Vhost L2BD forwarding is setup +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | Then Send and receive ICMP Packet +| | 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 and receive ICMP Packet +| | 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 @@ -114,29 +114,29 @@ | | ... | that packet is received. | | ... | [Ref] IEEE 802.1q | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1} -| | And VPP Vhost interfaces for L2BD forwarding are setup +| | And Configure vhost interfaces for L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And VM for Vhost L2BD forwarding is setup +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | Then Send and receive ICMP Packet +| | 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 and receive ICMP Packet +| | 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 index c122dbdbcb..379d9a4ab6 100644 --- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot @@ -19,8 +19,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -67,28 +67,28 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -105,29 +105,29 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -141,28 +141,28 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | 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} @@ -179,28 +179,28 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 index cccd89edea..bb91940a32 100644 --- a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot @@ -18,8 +18,8 @@ | 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 | Func Test Setup -| Test Teardown | Func Test Teardown +| 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 @@ -61,21 +61,21 @@ | | ... | 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 Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -91,22 +91,22 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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 @@ -120,21 +120,21 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet +| | 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} @@ -151,21 +151,21 @@ | | ... | 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 +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | 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 Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method 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} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | 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 and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | 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} |