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, 32 insertions, 32 deletions

diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot
index d08c291f4f..88c739dd27 100644
--- a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot
+++ b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot
@@ -20,17 +20,17 @@
 | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes}
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH
 | Suite Setup | Run Keywords
-| ... | Setup ipv6 to all dut in topology | ${nodes} | ${nodes_ipv6_addr} | AND
-| ... | Vpp nodes ra suppress link layer | ${nodes} | AND
-| ... | Vpp nodes setup ipv6 routing | ${nodes} | ${nodes_ipv6_addr} | AND
-| ... | Setup all TGs before traffic script
+| ... | Configure IPv6 on all DUTs in topology | ${nodes} | ${nodes_ipv6_addr} | AND
+| ... | Suppress ICMPv6 router advertisement message | ${nodes} | AND
+| ... | Configure IPv6 routing on all DUTs | ${nodes} | ${nodes_ipv6_addr} | AND
+| ... | Configure all TGs for traffic script
 | Test Setup | Run Keywords | Save VPP PIDs | AND
 | ... | Reset VAT History On All DUTs | ${nodes} | AND
 | ... | Clear interface counters on all vpp nodes in topology | ${nodes}
 | Test Teardown | Run Keywords
 | ... | Show packet trace on all DUTs | ${nodes} | AND
 | ... | Show VAT History On All DUTs | ${nodes}  | AND
-| ... | Check VPP PID in Teardown
+| ... | Verify VPP PID in Teardown
 | Documentation | *IPv6 routing test cases*
 | ...
 | ... | RFC2460 IPv6, RFC4443 ICMPv6, RFC4861 Neighbor Discovery.
@@ -49,7 +49,7 @@
 | | [Documentation]
 | | ... | Make TG send ICMPv6 Echo Req to DUT ingress interface. Make TG\
 | | ... | verify ICMPv6 Echo Reply is correct.
-| | Ipv6 icmp echo | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr}
+| | Send IPv6 icmp echo request to DUT1 ingress inteface and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr}
 
 | TC02: DUT replies to ICMPv6 Echo Req pkt with size 64B-to-1500B-incr-1B
 | | [Tags] | VM_ENV
@@ -57,17 +57,17 @@
 | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\
 | | ... | incrementating frame size from 64B to 1500B with increment step
 | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct.
-| | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | ${nodes_ipv6_addr}
+| | Execute IPv6 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | ${nodes_ipv6_addr}
 
 | TC03: DUT replies to ICMPv6 Echo Req pkt with size 1500B-to-9000B-incr-10B
 | | [Documentation]
 | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\
 | | ... | incrementating frame size from 1500B to 9000B with increment
 | | ... | step of 10Bytes. Make TG verify ICMPv6 Echo Replies are correct.
-| | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']}
+| | [Setup] | Configure MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']}
 | | [Teardown] | Run keywords
 | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']}
-| | ... | AND | Check VPP PID in Teardown
+| | ... | AND | Verify VPP PID in Teardown
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']}
 | | Compute Path
 | | ${dut_port} | ${dut_node}= | Last Interface
@@ -76,7 +76,7 @@
 | | # IPv6 header and ICMPv6 header
 | | ${end_size}= | Evaluate | ${mtu} - 14 - 4 - 40 - 8
 | | Run Keyword If | ${mtu} > 1518
-| | ...            | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']}
+| | ...            | Execute IPv6 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']}
 | | ...            | 1452 | ${end_size} | 10 | ${nodes_ipv6_addr}
 
 | TC04: DUT routes to its egress interface
@@ -84,7 +84,7 @@
 | | [Documentation]
 | | ... | Make TG send ICMPv6 Echo Req towards DUT1 egress interface\
 | | ... | connected to DUT2. Make TG verify ICMPv6 Echo Reply is correct.
-| | Ipv6 tg to dut1 egress | ${nodes['TG']} | ${nodes['DUT1']} |
+| | Send IPv6 ICMP echo request to DUT1 egress interface and verify answer | ${nodes['TG']} | ${nodes['DUT1']} |
 | | ...                    | ${nodes['DUT2']} | ${nodes_ipv6_addr}
 
 | TC05: DUT1 routes to DUT2 ingress interface
@@ -92,7 +92,7 @@
 | | [Documentation]
 | | ... | Make TG send ICMPv6 Echo Req towards DUT2 ingress interface\
 | | ... | connected to DUT1. Make TG verify ICMPv6 Echo Reply is correct.
-| | Ipv6 tg to dut2 via dut1 | ${nodes['TG']} | ${nodes['DUT1']}
+| | Send IPv6 ICMP echo request to DUT2 via DUT1 and verify answer | ${nodes['TG']} | ${nodes['DUT1']}
 | | ...                      | ${nodes['DUT2']} | ${nodes_ipv6_addr}
 
 | TC06: DUT1 routes to DUT2 egress interface
@@ -100,7 +100,7 @@
 | | [Documentation]
 | | ... | Make TG send ICMPv6 Echo Req towards DUT2 egress interface\
 | | ... | connected to TG. Make TG verify ICMPv6 Echo Reply is correct.
-| | Ipv6 tg to dut2 egress via dut1 | ${nodes['TG']} | ${nodes['DUT1']}
+| | Send IPv6 ICMP echo request to DUT2 egress interface via DUT1 and verify answer | ${nodes['TG']} | ${nodes['DUT1']}
 | | ...                             | ${nodes['DUT2']} | ${nodes_ipv6_addr}
 
 | TC07: DUT1 and DUT2 route between TG interfaces
@@ -117,4 +117,4 @@
 | | ... | On DUT configure interface IPv6 address in the main routing\
 | | ... | domain. Make TG send Neighbor Solicitation message on the link
 | | ... | to DUT and verify DUT Neighbor Advertisement reply is correct.
-| | Ipv6 neighbor solicitation | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr}
+| | Send IPv6 neighbor solicitation and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr}
diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
index 989ec69434..e65ac9aa76 100644
--- a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
+++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot
@@ -21,8 +21,8 @@
 | Resource | resources/libraries/robot/traffic.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 | *Ipv6 Multipath routing test cases*
 | ...
 | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\
@@ -50,9 +50,9 @@
 | | ... | [Cfg] On DUT configure multipath routing wiht two equal-cost paths.
 | | ... | [Ver] TG sends 100 IPv6 ICMP packets traffic on the first link to\
 | | ... | DUT. On second link to TG verify if traffic is divided into two paths.
-| | 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_if2} | ${ip_1} | ${prefix_length}
 | | And Vpp Set If Ipv6 Addr | ${dut_node}
@@ -61,14 +61,14 @@
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_1_ip} | ${neighbor_1_mac}
 | | And Add Ip Neighbor
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_2_ip} | ${neighbor_2_mac}
-| | And Vpp Nodes RA Suppress Link Layer | ${nodes}
+| | And Suppress ICMPv6 router advertisement message | ${nodes}
 | | When Vpp Route Add
 | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_1_ip}
 | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE}
 | | And Vpp Route Add
 | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_2_ip}
 | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE}
-| | Then Send Packets And Check Multipath Routing | ${tg_node}
+| | Then Send packets and verify multipath routing | ${tg_node}
 | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${test_src_ip} | ${test_dst_ip}
 | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${dut_to_tg_if1_mac}
 | | ... | ${neighbor_1_mac} | ${neighbor_2_mac}
diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot
index e45ce730c9..ea0864e4ff 100644
--- a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot
+++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot
@@ -20,8 +20,8 @@
 | Resource | resources/libraries/robot/traffic.robot
 | Library | resources.libraries.python.Trace
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_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 | *IPv6 Router Advertisement test cases*
 | ...
 | ... | RFC4861 Neighbor Discovery. Encapsulations: Eth-IPv6-RA on links
@@ -44,13 +44,13 @@
 | | ... | [Ver] Make TG wait for IPv6 Router Advertisement packet to be sent\
 | | ... | by DUT1 and verify the received RA packet is correct.
 | | [Tags] | EXPECTED_FAILING
-| | 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 Vpp Set If Ipv6 Addr | ${dut1_node}
 | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
 | | When Vpp RA Send After Interval | ${dut1_node} | ${dut1_to_tg}
-| | Then Receive And Check Router Advertisement Packet
+| | Then Receive and verify router advertisement packet
 | | ... | ${tg_node} | ${tg_to_dut1} | ${dut1_to_tg_mac}
 
 | TC02: DUT retransmits RA on IPv6 enabled interface after a set interval
@@ -60,15 +60,15 @@
 | | ... | [Ver] Make TG wait for two IPv6 Router Advertisement packets\
 | | ... | to be sent by DUT1 and verify the received RA packets are correct.
 | | [Tags] | EXPECTED_FAILING
-| | 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 Vpp Set If Ipv6 Addr | ${dut1_node}
 | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
 | | When Vpp RA Send After Interval | ${dut1_node} | ${dut1_to_tg}
 | | ... | interval=${interval}
 | | :FOR | ${n} | IN RANGE | ${2}
-| | | Then Receive And Check Router Advertisement Packet
+| | | Then Receive and verify router advertisement packet
 | | | ... | ${tg_node} | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${interval}
 
 | TC03: DUT responds to Router Solicitation request
@@ -79,9 +79,9 @@
 | | ... | [Ver] Make TG send IPv6 Router Solicitation request to DUT1, listen\
 | | ... | for response from DUT1 and verify the received RA packet is correct.
 | | [Tags] | EXPECTED_FAILING
-| | 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 Vpp Set If Ipv6 Addr | ${dut1_node}
 | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
 | | When VPP RA Suppress Link Layer | ${dut1_node} | ${dut1_to_tg}
@@ -97,9 +97,9 @@
 | | ... | [Ver] Make TG send IPv6 Router Solicitation request to DUT1, listen\
 | | ... | for response from DUT1 and verify the received RA packet is correct.
 | | [Tags] | EXPECTED_FAILING
-| | 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 Vpp Set If Ipv6 Addr | ${dut1_node}
 | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length}
 | | When VPP RA Suppress Link Layer | ${dut1_node} | ${dut1_to_tg}