X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Flisp%2Feth2p-ethip4ipsectptlispgpe-ip4base-func.robot;h=5f9a37eecac93c5e3e43a63c738e0956856f2319;hp=b78dacbefa752193fc059074c43495d64563e18b;hb=53d69321e41aa6fd94abc16c7050314dc2e53f08;hpb=2c4babd95c188b8b0038f6f39448cb469b9bc23a

diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot
index b78dacbefa..5f9a37eeca 100644
--- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot
+++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot
@@ -35,12 +35,9 @@
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH
 | ...
-| Test Setup | Func Test Setup
-| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ... | AND | Show VAT History On All DUTs | ${nodes}
-| ... | AND | Show Vpp Settings | ${nodes['DUT1']}
-| ... | AND | Show Vpp Settings | ${nodes['DUT2']}
-| ... | AND | Check VPP PID in Teardown
+| Test Setup | Set up functional test
+| ...
+| Test Teardown | Tear down LISP functional test
 | ...
 | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)*
 | ...
@@ -80,26 +77,26 @@
 | | ${auth_alg}= | Integ Alg SHA1 96
 | | Given Setup 3-node Topology
 | | And Add IP Neighbors
-| | And Set up LISP GPE topology
+| | And Configure LISP GPE topology in 3-node circular topology
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_to_dut2_ip4_static_adjacency}
 | | ... | ${dut2_to_dut1_ip4_static_adjacency}
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | When VPP Setup IPsec Manual Keyed Connection
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | When Configure manual keyed connection for IPSec
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi}
 | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4}
-| | And VPP Setup IPsec Manual Keyed Connection
+| | And Configure manual keyed connection for IPSec
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi}
 | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4}
-| | Then Send Packet And Check Headers
+| | Then Send packet and verify headers
 | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
 | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
 | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
+| | And Send packet and verify headers
 | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
 | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
 | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
@@ -121,7 +118,7 @@
 | | ${auth_alg}= | Integ Alg SHA1 96
 | | Given Setup 3-node Topology
 | | And Add IP Neighbors
-| | And Set up LISP GPE topology
+| | And Configure LISP GPE topology in 3-node circular topology
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
@@ -129,20 +126,20 @@
 | | ... | ${dut2_to_dut1_ip4_static_adjacency}
 | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.Get sw if index
 | | ... | ${dut1_node} | lisp_gpe0
-| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | When VPP Setup IPsec Manual Keyed Connection
+| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | When Configure manual keyed connection for IPSec
 | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip4}
 | | ... | ${tg2_ip4}
-| | And VPP Setup IPsec Manual Keyed Connection
+| | And Configure manual keyed connection for IPSec
 | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip4}
 | | ... | ${tg1_ip4}
-| | Then Send Packet And Check Headers
+| | Then Send packet and verify headers
 | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
 | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
 | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
+| | And Send packet and verify headers
 | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
 | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
 | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
@@ -164,27 +161,27 @@
 | | ${auth_alg}= | Integ Alg SHA1 96
 | | Given Setup 3-node Topology | ${fib_table_1}
 | | And Add IP Neighbors
-| | When IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | And Set up LISP GPE topology
+| | When Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | And Configure LISP GPE topology in 3-node circular topology
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_to_dut2_ip4_static_adjacency}
 | | ... | ${dut2_to_dut1_ip4_static_adjacency}
 | | ... | ${dut1_dut2_vni} | ${fib_table_1}
-| | And VPP Setup IPsec Manual Keyed Connection
+| | And Configure manual keyed connection for IPSec
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi}
 | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4}
-| | And VPP Setup IPsec Manual Keyed Connection
+| | And Configure manual keyed connection for IPSec
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi}
 | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4}
-| | Then Send Packet And Check Headers
+| | Then Send packet and verify headers
 | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
 | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
 | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
+| | And Send packet and verify headers
 | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
 | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
 | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
@@ -206,29 +203,29 @@
 | | ${auth_alg}= | Integ Alg SHA1 96
 | | Given Setup 3-node Topology | ${fib_table_1}
 | | And Add IP Neighbors
-| | And Set up LISP GPE topology
+| | And Configure LISP GPE topology in 3-node circular topology
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_to_dut2_ip4_static_adjacency}
 | | ... | ${dut2_to_dut1_ip4_static_adjacency}
 | | ... | ${dut1_dut2_vni} | ${fib_table_1}
-| | When IPsec Generate Keys | ${encr_alg} | ${auth_alg}
+| | When Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.Get sw if index
 | | ... | ${dut1_node} | lisp_gpe0
-| | And VPP Setup IPsec Manual Keyed Connection
+| | And Configure manual keyed connection for IPSec
 | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip4}
 | | ... | ${tg2_ip4}
-| | And VPP Setup IPsec Manual Keyed Connection
+| | And Configure manual keyed connection for IPSec
 | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip4}
 | | ... | ${tg1_ip4}
-| | Then Send Packet And Check Headers
+| | Then Send packet and verify headers
 | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4}
 | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
 | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
-| | And Send Packet And Check Headers
+| | And Send packet and verify headers
 | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4}
 | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac}
 | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
@@ -242,9 +239,9 @@
 | | ... | Default is 0.
 | | ...
 | | [Arguments] | ${fib_table}=0
-| | Path for 3-node testing is set
+| | Configure path in 3-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | Interfaces in 3-node path are up
+| | Set interfaces in 3-node circular topology up
 | | Assign Interface To Fib Table | ${dut1_node}
 | | ... | ${dut1_to_tg} | ${fib_table}
 | | Assign Interface To Fib Table | ${dut2_node}