CSIT-662: KWI - KW renaming

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

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

8 files changed, 138 insertions, 138 deletions

diff --git a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot
index 592154845d..0155b4953d 100644
--- a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot
+++ b/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-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 | VM_ENV | HW_ENV
-| Test Setup | Func Test Setup
-| Test Teardown | Func Test Teardown
+| Test Setup | Set up functional test
+| Test Teardown | Tear down functional test
 | Documentation | *RFC7348 VXLAN: Bridge-domain with VXLAN over VLAN test cases*
 | ...
 | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology with
@@ -51,26 +51,26 @@
 | | ... | interface to TG and one VXLAN tunnel interface towards the other DUT
 | | ... | over VLAN sub-interface. [Ver] Make TG send ICMPv4 Echo Req between
 | | ... | two of its interfaces, verify all packets are received. [Ref] RFC7348.
-| | 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
-| | And   Vlan interfaces for VXLAN are created | ${VLAN}
+| | And   Set interfaces in 3-node circular topology up
+| | And   Create vlan interfaces for VXLAN | ${VLAN}
 | |       ...                                   | ${dut1_node} | ${dut1_to_dut2}
 | |       ...                                   | ${dut2_node} | ${dut2_to_dut1}
-| | And   IP addresses are set on interfaces
+| | And   Configure IP addresses and neighbors on interfaces
 | |       ...         | ${dut1_node} | ${dut1s_vlan_name} | ${dut1s_vlan_index}
 | |       ...         | ${dut2_node} | ${dut2s_vlan_name} | ${dut2s_vlan_index}
 | | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1_node} | ${VNI}
 | |                 | ...  | ${dut1s_ip_address} | ${dut2s_ip_address}
 | |                   And  Set Interface State | ${dut1_node} | ${dut1s_vxlan}
 | |                   ...  | up
-| |                   And  Interfaces are added to BD | ${dut1_node} | ${BID}
+| |                   And  Add interfaces to L2BD | ${dut1_node} | ${BID}
 | |                   ...  | ${dut1_to_tg} | ${dut1s_vxlan}
 | | ${dut2s_vxlan}= | And  Create VXLAN interface     | ${dut2_node} | ${VNI}
 | |                 | ...  | ${dut2s_ip_address} | ${dut1s_ip_address}
 | |                   And  Set Interface State | ${dut2_node} | ${dut2s_vxlan}
 | |                   ...  | up
-| |                   And  Interfaces are added to BD | ${dut2_node} | ${BID}
+| |                   And  Add interfaces to L2BD | ${dut2_node} | ${BID}
 | |                   ...  | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send and receive ICMPv4 bidirectionally
+| | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
index 5e277a3200..b69abb09d5 100644
--- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
+++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
@@ -20,11 +20,11 @@
 | Resource | resources/libraries/robot/double_qemu_setup.robot
 | Library  | resources.libraries.python.Trace
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV
-| Test Setup | Func Test Setup
-| Test Teardown | Run Keywords | Func Test Teardown
-| ... | AND | Run keyword | Qemu Teardown | ${dut1_node}
+| Test Setup | Set up functional test
+| Test Teardown | Run Keywords | Tear down functional test
+| ... | AND | Run keyword | Tear down QEMU | ${dut1_node}
 | ...                                     | ${${qemu1}} | ${qemu1}
-| ... | AND | Run keyword | Qemu Teardown | ${dut2_node}
+| ... | AND | Run keyword | Tear down QEMU | ${dut2_node}
 | ...                                     | ${${qemu2}} | ${qemu2}
 | Documentation | *L2BD with VM combined with VXLAN test cases - IPv4*
 | ...
@@ -77,22 +77,22 @@
 | | ... | be switched by DUT1 and DUT2; verify packets are switched between
 | | ... | these TG interfaces.
 | | ... | [Ref] RFC7348.
-| | 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 VPP Vhost interfaces for L2BD forwarding are setup | ${dut1_node}
+| | And Set interfaces in 3-node circular topology up
+| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node}
 | | ...                                                     | ${sock1}
 | | ...                                                     | ${sock2}
 | | ...                                                     | ${dut1_vhost1}
 | | ...                                                     | ${dut1_vhost2}
-| | And VPP Vhost interfaces for L2BD forwarding are setup | ${dut2_node}
+| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node}
 | | ...                                                    | ${sock1}
 | | ...                                                    | ${sock2}
 | | ...                                                    | ${dut2_vhost1}
 | | ...                                                    | ${dut2_vhost2}
-| | And VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1}
+| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1}
 | | ...                                       | ${sock2} | ${qemu1}
-| | And VM for Vhost L2BD forwarding is setup | ${dut2_node} | ${sock1}
+| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1}
 | | ...                                       | ${sock2} | ${qemu2}
 | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1}
 | | ...                       | ${ip4_prefix}
@@ -104,13 +104,13 @@
 | |                 | ...                        | ${ip4_addr1} | ${ip4_addr2}
 | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
 | |                 | ...                        | ${ip4_addr2} | ${ip4_addr1}
-| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
 | | ...                            | ${dut1_to_tg} | ${${dut1_vhost1}}
-| | And Interfaces are added to BD | ${dut1_node} | ${bd_id2}
+| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2}
 | | ...                            | ${dut1s_vxlan} | ${${dut1_vhost2}}
-| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
 | | ...                            | ${dut2_to_tg} | ${${dut2_vhost1}}
-| | And Interfaces are added to BD | ${dut2_node} | ${bd_id2}
+| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2}
 | | ...                            | ${dut2s_vxlan} | ${${dut2_vhost2}}
-| | Then Send and receive ICMPv4 bidirectionally
+| | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
index 543fec22b8..6db2ee27ff 100644
--- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
+++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot
@@ -20,8 +20,8 @@
 | Resource | resources/libraries/robot/double_qemu_setup.robot
 | Library  | resources.libraries.python.Trace
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Func Test Setup
-| Test Teardown | Func Test Teardown
+| Test Setup | Set up functional test
+| Test Teardown | Tear down functional test
 | Documentation | *Bridge-domain with VXLAN test cases - IPv4*
 | ...
 | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -59,20 +59,20 @@
 | | ... | configure two i/fs into L2BD with MAC learning. [Ver] Make TG
 | | ... | verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 in
 | | ... | both directions and are correct on receive. [Ref] RFC7348.
-| | 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
+| | And Set interfaces in 3-node circular topology up
 | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2}
 | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1}
-| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
+| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
 | | ...                                    | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE}
 | | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1_node} | ${vni_1}
 | |                 | ... | ${dut1s_ip_address} | ${dut2s_ip_address}
-| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
 | | ...                            | ${dut1_to_tg} | ${dut1s_vxlan}
 | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
 | |                 | ... | ${dut2s_ip_address} | ${dut1s_ip_address}
-| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
 | | ...                            | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send and receive ICMPv4 bidirectionally
+| | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot
index de38c56b2d..70f17bc368 100644
--- a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot
+++ b/tests/func/vxlan/eth2p-ethip4vxlan-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 | VM_ENV | HW_ENV
-| Test Setup | Func Test Setup
-| Test Teardown | Func Test Teardown
+| Test Setup | Set up functional test
+| Test Teardown | Tear down functional test
 | Documentation | *RFC7348 VXLAN: L2 cross-connect with VXLAN test cases*
 | ...
 | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -47,20 +47,20 @@
 | | ... | interface to TG and one VXLAN tunnel interface towards the other
 | | ... | DUT. [Ver] Make TG send ICMPv4 Echo Req between two of its
 | | ... | interfaces; verify all packets are received. [Ref] RFC7348.
-| | 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
+| | And   Set interfaces in 3-node circular topology up
 | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2}
 | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1}
-| | And   IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
+| | And   Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
 | |       ...                                | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE}
 | | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1_node} | ${VNI}
 | |                 | ...  | ${dut1s_ip_address} | ${dut2s_ip_address}
-| |                   And  Interfaces are added to xconnect | ${dut1_node}
+| |                   And  Add interfaces to L2XC | ${dut1_node}
 | |                   ...  | ${dut1_to_tg} | ${dut1s_vxlan}
 | | ${dut2s_vxlan}= | And  Create VXLAN interface     | ${dut2_node} | ${VNI}
 | |                 | ...  | ${dut2s_ip_address} | ${dut1s_ip_address}
-| |                   And  Interfaces are added to xconnect | ${dut2_node}
+| |                   And  Add interfaces to L2XC | ${dut2_node}
 | |                   ...  | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send and receive ICMPv4 bidirectionally
+| | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
index 6e1e6e8dcb..429d9a3353 100644
--- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
+++ b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot
@@ -21,11 +21,11 @@
 | Library  | resources.libraries.python.Trace
 | Library | resources.libraries.python.IPv6Setup
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Func Test Setup
-| Test Teardown | Run Keywords | Func Test Teardown
-| ... | AND | Run keyword | Qemu Teardown | ${dut1_node}
+| Test Setup | Set up functional test
+| Test Teardown | Run Keywords | Tear down functional test
+| ... | AND | Run keyword | Tear down QEMU | ${dut1_node}
 | ...                                     | ${${qemu1}} | ${qemu1}
-| ... | AND | Run keyword | Qemu Teardown | ${dut2_node}
+| ... | AND | Run keyword | Tear down QEMU | ${dut2_node}
 | ...                                     | ${${qemu2}} | ${qemu2}
 | Documentation | *L2BD with VM combined with VXLAN test cases - IPv6*
 | ...
@@ -79,22 +79,22 @@
 | | ... | these TG interfaces.
 | | ... | [Ref] RFC7348.
 | | [Tags] | VPP_VM_ENV
-| | 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 VPP Vhost interfaces for L2BD forwarding are setup | ${dut1_node}
+| | And Set interfaces in 3-node circular topology up
+| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node}
 | | ...                                                     | ${sock1}
 | | ...                                                     | ${sock2}
 | | ...                                                     | ${dut1_vhost1}
 | | ...                                                     | ${dut1_vhost2}
-| | And VPP Vhost interfaces for L2BD forwarding are setup | ${dut2_node}
+| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node}
 | | ...                                                    | ${sock1}
 | | ...                                                    | ${sock2}
 | | ...                                                    | ${dut2_vhost1}
 | | ...                                                    | ${dut2_vhost2}
-| | And VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1}
+| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1}
 | | ...                                       | ${sock2} | ${qemu1}
-| | And VM for Vhost L2BD forwarding is setup | ${dut2_node} | ${sock1}
+| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1}
 | | ...                                       | ${sock2} | ${qemu2}
 | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
 | | ...                       | ${ip6_prefix}
@@ -107,13 +107,13 @@
 | |                 | ...                        | ${ip6_addr1} | ${ip6_addr2}
 | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
 | |                 | ...                        | ${ip6_addr2} | ${ip6_addr1}
-| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
 | | ...                            | ${dut1_to_tg} | ${${dut1_vhost1}}
-| | And Interfaces are added to BD | ${dut1_node} | ${bd_id2}
+| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2}
 | | ...                            | ${dut1s_vxlan} | ${${dut1_vhost2}}
-| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
 | | ...                            | ${dut2_to_tg} | ${${dut2_vhost1}}
-| | And Interfaces are added to BD | ${dut2_node} | ${bd_id2}
+| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2}
 | | ...                            | ${dut2s_vxlan} | ${${dut2_vhost2}}
-| | Then Send and receive ICMPv6 bidirectionally
+| | Then Send ICMPv6 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot
index 4e03dd517d..f817baa3a6 100644
--- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot
+++ b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot
@@ -21,8 +21,8 @@
 | Library  | resources.libraries.python.Trace
 | Library | resources.libraries.python.IPv6Setup
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Test Setup | Func Test Setup
-| Test Teardown | Func Test Teardown
+| Test Setup | Set up functional test
+| Test Teardown | Tear down functional test
 | Documentation | *Bridge-domain with VXLAN test cases - IPv6*
 | ...
 | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -58,9 +58,9 @@
 | | ... | interfaces to be switched by DUT1 and DUT2; verify all packets
 | | ... | are received. [Ref] RFC7348.
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | 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
+| | And Set interfaces in 3-node circular topology up
 | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
 | | ...                       | ${ip6_prefix}
 | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2}
@@ -70,11 +70,11 @@
 | | And Vpp All RA Suppress Link Layer | ${nodes}
 | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1}
 | | | ...                                         | ${ip6_addr1} | ${ip6_addr2}
-| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1}
 | | ...                            | ${dut1_to_tg} | ${dut1s_vxlan}
 | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1}
 | | | ...                                        | ${ip6_addr2} | ${ip6_addr1}
-| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1}
+| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1}
 | | ...                            | ${dut2_to_tg} | ${dut2s_vxlan}
-| | Then Send and receive ICMPv6 bidirectionally
+| | Then Send ICMPv6 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
diff --git a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot
index 8afb22a717..8ae7286583 100644
--- a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot
+++ b/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot
@@ -20,8 +20,8 @@
 | Resource | resources/libraries/robot/double_qemu_setup.robot
 | Library  | resources.libraries.python.Trace
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| 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 SHG combined with VXLAN test cases - IPv4*
 | ...
 | ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology
@@ -67,10 +67,10 @@
 | | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1.
 | | ... | [Ref] RFC7348.
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']}
+| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
 | | ...                                         | ${nodes['DUT1']}
 | | ...                                         | ${nodes['DUT2']}
-| | And Interfaces in 3-node BD-SHG testing are up
+| | And Set interfaces in 3-node BD-SHG test up
 | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1}
 | | ...                       | ${ip4_prefix}
 | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2}
@@ -91,39 +91,39 @@
 | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
 | | And Vpp Node Interfaces Ready Wait | ${dut1_node}
 | | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
+| | And Create bridge domain | ${dut1_node} | ${bd_id1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
 | | ...                                     | ${bd_id1} | ${shg1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
 | | ...                                     | ${bd_id1} | ${shg1}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
+| | And Create bridge domain | ${dut2_node} | ${bd_id2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
 | | ...                                     | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
 | | ...                                     | ${bd_id2}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
+| | And Create bridge domain | ${dut2_node} | ${bd_id3}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
 | | ...                                     | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
 | | ...                                     | ${bd_id3}
-| | Then Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                          | ${tg_to_dut1_if1}
 | | ...                                          | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if1}
 | | ...                                         | ${tg_to_dut2_if2}
-| | And Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if2}
 | | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ...                              | Send and receive ICMPv4 bidirectionally
+| | ...                              | Send ICMPv4 bidirectionally and verify received packets
 | | | ...                            | ${tg_node} | ${tg_to_dut2_if1}
 | | | ...                            | ${tg_to_dut2_if2}
 
@@ -140,10 +140,10 @@
 | | ... | to be switched by DUT1 and DUT2; verify packets are switched between
 | | ... | all TG interfaces. [Ref] RFC7348.
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']}
+| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
 | | ...                                         | ${nodes['DUT1']}
 | | ...                                         | ${nodes['DUT2']}
-| | And Interfaces in 3-node BD-SHG testing are up
+| | And Set interfaces in 3-node BD-SHG test up
 | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1}
 | | ...                       | ${ip4_prefix}
 | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2}
@@ -164,37 +164,37 @@
 | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
 | | And Vpp Node Interfaces Ready Wait | ${dut1_node}
 | | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
+| | And Create bridge domain | ${dut1_node} | ${bd_id1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
 | | ...                                     | ${bd_id1} | ${shg1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
 | | ...                                     | ${bd_id1} | ${shg2}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
+| | And Create bridge domain | ${dut2_node} | ${bd_id2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
 | | ...                                     | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
 | | ...                                     | ${bd_id2}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
+| | And Create bridge domain | ${dut2_node} | ${bd_id3}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
 | | ...                                     | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
 | | ...                                     | ${bd_id3}
-| | Then Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                          | ${tg_to_dut1_if1}
 | | ...                                          | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if1}
 | | ...                                         | ${tg_to_dut2_if2}
-| | And Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if2}
-| | And Send and receive ICMPv4 bidirectionally | ${tg_node}
+| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut2_if1}
 | | ...                                         | ${tg_to_dut2_if2}
diff --git a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot
index 512d94361f..e4dec5bd1e 100644
--- a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot
+++ b/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot
@@ -21,8 +21,8 @@
 | Library  | resources.libraries.python.Trace
 | Library | resources.libraries.python.IPv6Setup
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| 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 SHG combined with VXLAN test cases - IPv6*
 | ...
 | ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology
@@ -68,10 +68,10 @@
 | | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1.
 | | ... | [Ref] RFC7348.
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']}
+| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
 | | ...                                         | ${nodes['DUT1']}
 | | ...                                         | ${nodes['DUT2']}
-| | And Interfaces in 3-node BD-SHG testing are up
+| | And Set interfaces in 3-node BD-SHG test up
 | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
 | | ...                       | ${ip6_prefix}
 | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2}
@@ -93,39 +93,39 @@
 | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
 | | And Vpp Node Interfaces Ready Wait | ${dut1_node}
 | | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
+| | And Create bridge domain | ${dut1_node} | ${bd_id1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
 | | ...                                     | ${bd_id1} | ${shg1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
 | | ...                                     | ${bd_id1} | ${shg1}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
+| | And Create bridge domain | ${dut2_node} | ${bd_id2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
 | | ...                                     | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
 | | ...                                     | ${bd_id2}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
+| | And Create bridge domain | ${dut2_node} | ${bd_id3}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
 | | ...                                     | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
 | | ...                                     | ${bd_id3}
-| | Then Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                          | ${tg_to_dut1_if1}
 | | ...                                          | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if1}
 | | ...                                         | ${tg_to_dut2_if2}
-| | And Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if2}
 | | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ...                              | Send and receive ICMPv6 bidirectionally
+| | ...                              | Send ICMPv6 bidirectionally and verify received packets
 | | | ...                            | ${tg_node} | ${tg_to_dut2_if1}
 | | | ...                            | ${tg_to_dut2_if2}
 
@@ -142,10 +142,10 @@
 | | ... | to be switched by DUT1 and DUT2; verify packets are switched between
 | | ... | all TG interfaces. [Ref] RFC7348.
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
-| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']}
+| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']}
 | | ...                                         | ${nodes['DUT1']}
 | | ...                                         | ${nodes['DUT2']}
-| | And Interfaces in 3-node BD-SHG testing are up
+| | And Set interfaces in 3-node BD-SHG test up
 | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1}
 | | ...                       | ${ip6_prefix}
 | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2}
@@ -167,37 +167,37 @@
 | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up
 | | And Vpp Node Interfaces Ready Wait | ${dut1_node}
 | | And Vpp Node Interfaces Ready Wait | ${dut2_node}
-| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
+| | And Create bridge domain | ${dut1_node} | ${bd_id1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2}
 | | ...                                     | ${bd_id1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1}
 | | ...                                     | ${bd_id1} | ${shg1}
-| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
+| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2}
 | | ...                                     | ${bd_id1} | ${shg2}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
+| | And Create bridge domain | ${dut2_node} | ${bd_id2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1}
 | | ...                                     | ${bd_id2}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1}
 | | ...                                     | ${bd_id2}
-| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
+| | And Create bridge domain | ${dut2_node} | ${bd_id3}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2}
 | | ...                                     | ${bd_id3}
-| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
+| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2}
 | | ...                                     | ${bd_id3}
-| | Then Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                          | ${tg_to_dut1_if1}
 | | ...                                          | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if1}
 | | ...                                         | ${tg_to_dut2_if2}
-| | And Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if1}
-| | And Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut1_if2}
 | | ...                                         | ${tg_to_dut2_if2}
-| | And Send and receive ICMPv6 bidirectionally | ${tg_node}
+| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
 | | ...                                         | ${tg_to_dut2_if1}
 | | ...                                         | ${tg_to_dut2_if2}