CSIT-662: KWI - KW renaming

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

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

4 files changed, 24 insertions, 24 deletions

diff --git a/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot
index 37e55c0666..3230dabfae 100644
--- a/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot
@@ -22,8 +22,8 @@
 | Resource | resources/libraries/robot/l2_xconnect.robot
 | Variables  | resources/libraries/python/IPv4NodeAddress.py | ${nodes}
 | 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 | *COP Security IPv4 Blacklist Tests*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -66,10 +66,10 @@
 | | ... | src-addr matching packets generated by TG; on DUT2 configure L2
 | | ... | xconnect. [Ver] Make TG send ICMPv4 Echo Req on its interface to
 | | ... | DUT1; verify no ICMPv4 Echo Req pkts are received. [Ref]
-| | Given Path for 3-node testing is set
+| | Given Configure path in 3-node circular topology
 | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node}
-| | And Interfaces in 3-node path are up
-| | And L2 setup xconnect on DUT
+| | And Set interfaces in 3-node circular topology up
+| | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | And Set Interface Address
 | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix}
@@ -86,7 +86,7 @@
 | | When COP Add whitelist Entry
 | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number}
 | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable
-| | Then Send packet from Port to Port should failed | ${tg_node}
+| | Then Packet transmission from port to port should fail | ${tg_node}
 | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac}
 | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac}
 | | ... | ${tg_to_dut2_mac}
diff --git a/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot
index eb8be688d9..c46a8c9c27 100644
--- a/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot
@@ -22,8 +22,8 @@
 | Resource | resources/libraries/robot/l2_xconnect.robot
 | Variables  | resources/libraries/python/IPv4NodeAddress.py | ${nodes}
 | 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 | *COP Security IPv4 Whitelist Tests*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -66,10 +66,10 @@
 | | ... | src-addr matching packets generated by TG; on DUT2 configure L2
 | | ... | xconnect. [Ver] Make TG send ICMPv4 Echo Req on its interface to
 | | ... | DUT1; verify received ICMPv4 Echo Req pkts are correct. [Ref]
-| | Given Path for 3-node testing is set
+| | Given Configure path in 3-node circular topology
 | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node}
-| | And Interfaces in 3-node path are up
-| | And L2 setup xconnect on DUT
+| | And Set interfaces in 3-node circular topology up
+| | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | And Set Interface Address
 | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix}
@@ -86,7 +86,7 @@
 | | When COP Add whitelist Entry
 | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number}
 | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable
-| | Then Send Packet And Check Headers | ${tg_node}
+| | Then Send packet and verify headers | ${tg_node}
 | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac}
 | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac}
 | | ... | ${tg_to_dut2_mac}
diff --git a/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot
index 7511dfe31b..d0a395cf44 100644
--- a/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot
@@ -22,8 +22,8 @@
 | Resource | resources/libraries/robot/l2_xconnect.robot
 | Variables  | resources/libraries/python/IPv6NodesAddr.py | ${nodes}
 | 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 | *COP Security IPv6 Blacklist Tests*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -70,10 +70,10 @@
 | | ... | src-addr matching packets generated by TG; on DUT2 configure L2
 | | ... | xconnect. [Ver] Make TG send ICMPv6 Echo Req on its interface to
 | | ... | DUT1; verify no ICMPv6 Echo Req pkts are received. [Ref]
-| | Given Path for 3-node testing is set
+| | Given Configure path in 3-node circular topology
 | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node}
-| | And Interfaces in 3-node path are up
-| | And L2 setup xconnect on DUT
+| | And Set interfaces in 3-node circular topology up
+| | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | And VPP Set IF IPv6 Addr
 | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix}
@@ -95,7 +95,7 @@
 | | When COP Add whitelist Entry
 | | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${fib_table_number}
 | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable
-| | Then Send packet from Port to Port should failed | ${tg_node}
+| | Then Packet transmission from port to port should fail | ${tg_node}
 | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac}
 | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac}
 | | ... | ${tg_to_dut2_mac}
diff --git a/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot
index f75f4d0dea..3fb80ba308 100644
--- a/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot
+++ b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot
@@ -22,8 +22,8 @@
 | Resource | resources/libraries/robot/l2_xconnect.robot
 | Variables  | resources/libraries/python/IPv6NodesAddr.py | ${nodes}
 | 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 | *COP Security IPv6 Whitelist Tests*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -70,10 +70,10 @@
 | | ... | src-addr matching packets generated by TG; on DUT2 configure L2
 | | ... | xconnect. [Ver] Make TG send ICMPv6 Echo Req on its interface to
 | | ... | DUT1; verify received ICMPv6 Echo Req pkts are correct. [Ref]
-| | Given Path for 3-node testing is set
+| | Given Configure path in 3-node circular topology
 | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node}
-| | And Interfaces in 3-node path are up
-| | And L2 setup xconnect on DUT
+| | And Set interfaces in 3-node circular topology up
+| | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | And VPP Set IF IPv6 Addr
 | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix}
@@ -95,7 +95,7 @@
 | | When COP Add whitelist Entry | ${dut1_node} | ${dut1_to_tg} | ip6 |
 | | ... | ${fib_table_number}
 | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable
-| | Then Send Packet And Check Headers | ${tg_node}
+| | Then Send packet and verify headers | ${tg_node}
 | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac}
 | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac}
 | | ... | ${tg_to_dut2_mac}