CSIT-662: KWI - KW renaming

 - plus: CSIT-656: Script to rename robot keywords.

Change-Id: Ia69917e406a1b346b80e5ea742f6200c1c9e9d21
Signed-off-by: Tibor Frank <tifrank@cisco.com>

1 files changed, 106 insertions, 106 deletions

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}