CSIT-662: KWI - KW renaming

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

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

3 files changed, 79 insertions, 78 deletions

diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
index 5730e0e6b8..cf7b40bef7 100644
--- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
+++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
@@ -18,8 +18,8 @@
 | Resource | resources/libraries/robot/ipv4.robot
 | Library | resources.libraries.python.Trace
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
-| Test Setup | Func Test Setup
-| Test Teardown | Func Test Teardown
+| Test Setup | Set up functional test
+| Test Teardown | Tear down functional test
 | Documentation | *DHCPv4 Client related test cases*
 
 *** Variables ***
@@ -33,84 +33,85 @@
 *** Test Cases ***
 | TC01: VPP sends a DHCP DISCOVER
 | | [Documentation] | Configure DHCPv4 client on interface to TG without
-| | ...             | hostname and check if DHCPv4 DISCOVER message contains all
-| | ...             | required fields with expected values.
+| | ... | hostname and check if DHCPv4 DISCOVER message contains all
+| | ... | required fields with expected values.
 | | ...
-| | Given Path for 2-node testing is set
-| |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And   Interfaces in 2-node path are up
-| | When  Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then  Check DHCP DISCOVER header | ${tg_node}
-| |       ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac}
+| | Given Configure path in 2-node circular topology
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Set interfaces in 2-node circular topology up
+| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
+| | Then Verify DHCP DISCOVER header | ${tg_node}
+| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac}
 
 | TC02: VPP sends a DHCPv4 DISCOVER with hostname
 | | [Documentation] | Configure DHCPv4 client on interface to TG with hostname
-| | ...             | and check if DHCPv4 DISCOVER message contains all required
-| | ...             | fields with expected values.
+| | ... | and check if DHCPv4 DISCOVER message contains all required
+| | ... | fields with expected values.
 | | ...
-| | Given Path for 2-node testing is set
-| |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And   Interfaces in 2-node path are up
-| | When  Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| |       ... | ${client_hostname}
-| | Then  Check DHCP DISCOVER header | ${tg_node}
-| |       ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname}
+| | Given Configure path in 2-node circular topology
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Set interfaces in 2-node circular topology up
+| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
+| | ... | ${client_hostname}
+| | Then Verify DHCP DISCOVER header | ${tg_node}
+| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname}
 
 | TC03: VPP sends DHCPv4 REQUEST after OFFER
 | | [Documentation] | Configure DHCPv4 client on interface to TG and check if
-| | ...             | DHCPv4 REQUEST message contains all required fields.
+| | ... | DHCPv4 REQUEST message contains all required fields.
 | | ...
-| | Given Path for 2-node testing is set
-| |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And   Interfaces in 2-node path are up
-| | And   VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| |       ... | ${FALSE} | ${NONE}
-| | When  Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then  Check DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| |       ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| |       ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
+| | Given Configure path in 2-node circular topology
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Set interfaces in 2-node circular topology up
+| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
+| | ... | ${FALSE} | ${NONE}
+| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
+| | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
+| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
+| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
 
 | TC04: VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID
 | | [ Tags ] | EXPECTED_FAILING
 | | [Documentation] | Configure DHCPv4 client on interface to TG. If server
-| | ...             | sends DHCPv4 OFFER with different XID as in DHCPv4
-| | ...             | DISCOVER, DHCPv4 REQUEST message shouldn't be sent.
+| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4
+| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent.
 | | ...
-| | Given Path for 2-node testing is set
-| |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And   Interfaces in 2-node path are up
-| | And   VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| |       ... | ${FALSE} | ${NONE}
-| | When  Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then  Run Keyword And Expect Error | DHCP REQUEST Rx timeout
-| |       ... | Check DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| |       ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| |       ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
-| |       ... | offer_xid=${own_xid}
+| | Given Configure path in 2-node circular topology
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Set interfaces in 2-node circular topology up
+| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
+| | ... | ${FALSE} | ${NONE}
+| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
+| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout
+| | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
+| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
+| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
+| | ... | offer_xid=${own_xid}
 
 | TC05: VPP honors DHCPv4 lease time
 | | [Documentation] | Send IP configuration to the VPP client via DHCPv4.
-| | ...             | Address is checked with ICMP echo request and there should
-| | ...             | be no reply for echo request when lease has expired.
+| | ... | Address is checked with ICMP echo request and there should
+| | ... | be no reply for echo request when lease has expired.
 | | ...
-| | Given Path for 2-node testing is set
-| |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And   Interfaces in 2-node path are up
-| | And   VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| |       ... | ${FALSE} | ${NONE}
-| | When  Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | And   Send IP configuration to client via DHCP
-| |       ... | ${tg_node} | ${tg_to_dut_if1}
-| |       ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| |       ... | ${client_ip} | ${client_mask}
-| |       ... | ${lease_time}
-| | And   Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip}
-| |       ... | ${tg_to_dut_if1_mac}
-| | Then  Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1}
-| |       ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip}
-| |       ... | ${server_ip}
-| | And   Sleep | ${lease_time}
-| | And   Run Keyword And Expect Error | ICMP echo Rx timeout
-| |       ... | Node replies to ICMP echo request | ${tg_node}
-| |       ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac}
-| |       ... | ${client_ip} | ${server_ip}
+| | Given Configure path in 2-node circular topology
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Set interfaces in 2-node circular topology up
+| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
+| | ... | ${FALSE} | ${NONE}
+| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
+| | And Configure IP on client via DHCP
+| | ... | ${tg_node} | ${tg_to_dut_if1}
+| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
+| | ... | ${client_ip} | ${client_mask}
+| | ... | ${lease_time}
+| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip}
+| | ... | ${tg_to_dut_if1_mac}
+| | Then Send ICMP echo request and verify answer
+| | ... | ${tg_node} | ${tg_to_dut_if1}
+| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip}
+| | ... | ${server_ip}
+| | And Sleep | ${lease_time}
+| | And Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send ICMP echo request and verify answer | ${tg_node}
+| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac}
+| | ... | ${client_ip} | ${server_ip}
diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
index 531ed88aa5..de7ae2d4b1 100644
--- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
+++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
@@ -18,8 +18,8 @@
 | Resource | resources/libraries/robot/ipv4.robot
 | Library | resources.libraries.python.Trace
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | 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 | *DHCPv4 proxy test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG = DUT
@@ -50,9 +50,9 @@
 | | ... | [Ver] Make TG verify matching DHCPv4 packets between client and DHCPv4
 | | ... | server through DHCP proxy.
 | | ...
-| | 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
+| | And Set interfaces in 2-node circular topology up
 | | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
 | | ... | ${FALSE} | ${NONE}
 | | And Set Interface Address | ${dut_node}
@@ -63,7 +63,7 @@
 | | ... | ${tg_to_dut_if2_mac}
 | | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
 | | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
 | | ... | ${dhcp_server_ip} | ${tg_to_dut_if2_mac} | ${client_ip}
 | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip}
 
@@ -74,9 +74,9 @@
 | | ... | [Cfg] On DUT setup DHCPv4 proxy.
 | | ... | [Ver] Make TG verify matching invalid DHCPv4 packets are dropped.
 | | ...
-| | 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
+| | And Set interfaces in 2-node circular topology up
 | | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
 | | ... | ${FALSE} | ${NONE}
 | | And Set Interface Address | ${dut_node}
@@ -87,7 +87,7 @@
 | | ... | ${tg_to_dut_if2_mac}
 | | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
 | | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP DISCOVER | ${tg_node} | ${tg_to_dut_if1}
+| | Then Send DHCP DISCOVER and check answer | ${tg_node} | ${tg_to_dut_if1}
 | | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${valid_discover_dst_ip}
-| | And Send DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1}
+| | And DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1}
 | | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${invalid_discover_dst_ip}
diff --git a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
index 6fede3e41c..88f0fbdcb5 100644
--- a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
+++ b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
@@ -18,8 +18,8 @@
 | Resource | resources/libraries/robot/ipv6.robot
 | Library | resources.libraries.python.Trace
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | 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 | *DHCPv6 proxy test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG = DUT
@@ -47,9 +47,9 @@
 | | ... | DHCPv6 server through DHCPv6 proxy.
 | | ... | [Ref] RFC 3315
 | | ...
-| | 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
+| | And Set interfaces in 2-node circular topology up
 | | And Vpp Set If Ipv6 Addr | ${dut_node}
 | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
 | | And Vpp Set If Ipv6 Addr | ${dut_node}