From 430afafb4cadf503ccee99c09f6de7402f5404c7 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 1 Jun 2017 07:00:50 +0200 Subject: CSIT-662: KWI - KW renaming - plus: CSIT-656: Script to rename robot keywords. Change-Id: Ia69917e406a1b346b80e5ea742f6200c1c9e9d21 Signed-off-by: Tibor Frank --- tests/func/lisp/api-crud-lisp-func.robot | 54 ++++++++++----------- ...sectptlispgpe-ip4base-eth-2vhost-1vm-func.robot | 42 ++++++++-------- .../eth2p-ethip4ipsectptlispgpe-ip4base-func.robot | 56 +++++++++++----------- ...sectptlispgpe-ip6base-eth-2vhost-1vm-func.robot | 40 ++++++++-------- .../eth2p-ethip4ipsectptlispgpe-ip6base-func.robot | 30 ++++++------ ...h2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot | 24 +++++----- .../func/lisp/eth2p-ethip4lisp-ip4base-func.robot | 24 +++++----- .../eth2p-ethip4lisp-l2bdbasemaclrn-func.robot | 18 +++---- ...ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot | 26 +++++----- .../lisp/eth2p-ethip4lispgpe-ip4base-func.robot | 16 +++---- ...ip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot | 26 +++++----- .../lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot | 16 +++---- ...ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot | 26 +++++----- .../lisp/eth2p-ethip4lispgpe-ip6base-func.robot | 22 ++++----- .../lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot | 16 +++---- ...sectptlispgpe-ip4base-eth-2vhost-1vm-func.robot | 40 ++++++++-------- .../eth2p-ethip6ipsectptlispgpe-ip4base-func.robot | 30 ++++++------ ...sectptlispgpe-ip6base-eth-2vhost-1vm-func.robot | 42 ++++++++-------- .../eth2p-ethip6ipsectptlispgpe-ip6base-func.robot | 32 ++++++------- .../eth2p-ethip6lisp-l2bdbasemaclrn-func.robot | 18 +++---- .../lisp/eth2p-ethip6lispgpe-ip4base-func.robot | 22 ++++----- ...ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot | 24 +++++----- .../lisp/eth2p-ethip6lispgpe-ip6base-func.robot | 14 +++--- ...ip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot | 24 +++++----- .../lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot | 14 +++--- 25 files changed, 348 insertions(+), 348 deletions(-) (limited to 'tests/func/lisp') diff --git a/tests/func/lisp/api-crud-lisp-func.robot b/tests/func/lisp/api-crud-lisp-func.robot index 013eb7258c..b627cad8a9 100644 --- a/tests/func/lisp/api-crud-lisp-func.robot +++ b/tests/func/lisp/api-crud-lisp-func.robot @@ -23,8 +23,8 @@ | Variables | resources/test_data/lisp/api/lisp_api_resources.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_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 | *API test cases* | ... | ... | *[Top] Network Topologies:* DUT1 1-node topology. @@ -46,10 +46,10 @@ | | ... | DUT1 enable LISP. [Ver1] Check DUT1 if LISP is enabled. [Cfg2] | | ... | Then disable LISP. [Ver2] Check DUT1 if LISP is disabled. [Ref] | | ... | RFC6830. -| | When Enable lisp | ${nodes['DUT1']} -| | Then Check if lisp is enabled | ${nodes['DUT1']} | ${lisp_status} -| | When Disable lisp | ${nodes['DUT1']} -| | Then Check if lisp is disabled | ${nodes['DUT1']} | ${lisp_status} +| | When Enable LISP | ${nodes['DUT1']} +| | Then LISP should be enabled | ${nodes['DUT1']} | ${lisp_status} +| | When Disable LISP | ${nodes['DUT1']} +| | Then LISP Should be disabled | ${nodes['DUT1']} | ${lisp_status} | TC02: DUT can add and delete locator_set | | [Documentation] @@ -58,13 +58,13 @@ | | ... | configured locator_set and locator are correct. [Cfg2] Then | | ... | remove locator_set and locator. [Ver2] check DUT1 locator_set | | ... | and locator are removed. [Ref] RFC6830. -| | Given Lisp locator_set data is prepared +| | Given Generate LISP locator_set data | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} -| | When Lisp locator_set data is set | ${nodes['DUT1']} -| | Then Lisp locator_set is set correctly | ${nodes['DUT1']} -| | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} -| | Then Lisp locator_set should be unset | ${nodes['DUT1']} +| | And Enable LISP | ${nodes['DUT1']} +| | When Configure LISP locator_set data | ${nodes['DUT1']} +| | Then LISP locator_set shpuld be configured correctly | ${nodes['DUT1']} +| | When Delete all LISP locator_set from VPP | ${nodes['DUT1']} +| | Then LISP locator_set should be unset | ${nodes['DUT1']} | TC03: DUT can add, reset and delete locator_set | | [Documentation] @@ -77,11 +77,11 @@ | | ... | [Ref] RFC6830. | | Given Lisp locator_set data use for test reset locator_set are prepared | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} -| | When Lisp locator_set data is set | ${nodes['DUT1']} -| | Then Lisp locator_set is set correctly | ${nodes['DUT1']} -| | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} -| | Then Lisp locator_set should be unset | ${nodes['DUT1']} +| | And Enable LISP | ${nodes['DUT1']} +| | When Configure LISP locator_set data | ${nodes['DUT1']} +| | Then LISP locator_set shpuld be configured correctly | ${nodes['DUT1']} +| | When Delete all LISP locator_set from VPP | ${nodes['DUT1']} +| | Then LISP locator_set should be unset | ${nodes['DUT1']} | TC04: DUT can add and delete eid address | | [Documentation] @@ -89,12 +89,12 @@ | | ... | configure LISP eid IP address. [Ver1] Check DUT1 configured data | | ... | is correct. [Cfg2] Remove configured data. [Ver2] Check DUT1 all | | ... | eid IP addresses are removed. [Ref] RFC6830. -| | Given Enable lisp | ${nodes['DUT1']} -| | When Lisp eid address is set | ${nodes['DUT1']} | ${eid_table} -| | Then Lisp eid address is set correctly to eid table +| | Given Enable LISP | ${nodes['DUT1']} +| | When Configure LISP eid address | ${nodes['DUT1']} | ${eid_table} +| | Then LISP eid address should be set correctly to eid table | | ... | ${nodes['DUT1']} | ${eid_table_vat} -| | When Delete all lisp eid address from VPP | ${nodes['DUT1']} | ${eid_table} -| | Then Lisp eid table should be empty | ${nodes['DUT1']} +| | When Delete all LISP eid address from VPP | ${nodes['DUT1']} | ${eid_table} +| | Then LISP eid table should be empty | ${nodes['DUT1']} | TC05: DUT can add and delete LISP map resolver address | | [Documentation] @@ -103,10 +103,10 @@ | | ... | DUT1 configured data is correct. [Cfg2] Remove configured data. | | ... | [Ver2] Check DUT1 all map resolver addresses are removed. [Ref] | | ... | RFC6830. -| | Given Enable lisp | ${nodes['DUT1']} -| | When Lisp map resolver address is set | ${nodes['DUT1']} | ${map_resolver} -| | Then Lisp map resolver address is set correctly +| | Given Enable LISP | ${nodes['DUT1']} +| | When Configure LISP map resolver address | ${nodes['DUT1']} | ${map_resolver} +| | Then LISP map resolver address should be configured correctly | | ... | ${nodes['DUT1']} | ${map_resolver} -| | When Delete all lisp map resolver address from VPP +| | When Delete all LISP map resolver address from VPP | | ... | ${nodes['DUT1']} | ${map_resolver} -| | Then Lip map resolver address should be empty | ${nodes['DUT1']} +| | Then LISP map resolver address should be empty | ${nodes['DUT1']} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 74d25e8d02..32b3b5c75c 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -35,13 +35,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... @@ -86,26 +86,26 @@ | | Given Setup 3-node Topology | | And Add IP Neighbors | | And Setup Qemu DUT1 -| | 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} | ${dst_vhost_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} @@ -128,7 +128,7 @@ | | Given Setup 3-node Topology | | And Add IP Neighbors | | And Setup Qemu DUT1 -| | 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} @@ -138,20 +138,20 @@ | | ... | ${dut1_node} | lisp_gpe0 | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.Get Sw If Index | | ... | ${dut2_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} | ${lisp1_if_idx} | ${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} | ${lisp2_if_idx} | ${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} | ${dst_vhost_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} @@ -165,9 +165,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} @@ -203,11 +203,11 @@ | | ... | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index b78dacbefa..80ee675c3e 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -35,12 +35,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... @@ -80,26 +80,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 +121,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 +129,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 +164,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 +206,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 +242,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} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index cc79d239e6..90b62e1f87 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -38,13 +38,13 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -79,20 +79,20 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp | | And Setup Qemu DUT1 -| | 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_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -118,20 +118,20 @@ | | ... | ${dut1_node} | ${lisp_gpe_int} | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | ${lisp_gpe_int} -| | 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} | ${lisp1_if_idx} | ${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} | ${lisp2_if_idx} | ${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_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -141,9 +141,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | 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 | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -161,7 +161,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | 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_ip6_eid} | ${dut2_ip6_eid} @@ -178,12 +178,12 @@ | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Vpp RA Suppress Link Layer | ${dut1_node} | ${vhost2} -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot index e0b73c7185..86db5f5bac 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot @@ -38,12 +38,12 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -75,20 +75,20 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | 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_ip6} | ${tg2_ip6} | | ... | ${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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -108,22 +108,22 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | ${lisp_gpe_int} -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${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} | ${lisp_if_idx} | ${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_ip6} | ${tg2_ip6} | | ... | ${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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -133,9 +133,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | 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 | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -153,7 +153,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | 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_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index 16a10139f0..81d5f758ad 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -38,12 +38,12 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -75,28 +75,28 @@ | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | 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 | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} -| | 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} | | Setup Topology And Lisp | ${fib_table_1} | ${dut1_dut2_vni} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -106,9 +106,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | 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 | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -126,7 +126,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | 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_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot index 9ab69b2d71..0a7338c26f 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot @@ -24,8 +24,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_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 | *IP AFI independent functional tests.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -56,10 +56,10 @@ | | ... | [Cfg3] Re-enable LISP. | | ... | [Ver3] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -74,26 +74,26 @@ | | ... | ${tg_to_dut2_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} -| | When Set up Lisp topology +| | When Configure LISP 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} -| | 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} | | When Disable Lisp | ${dut1_node} -| | Then Send packet from Port to Port should failed +| | Then Packet transmission from port to port should fail | | ... | ${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 from Port to Port should failed +| | And Packet transmission from port to port should fail | | ... | ${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} @@ -110,11 +110,11 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} | | ... | ${dut2_to_dut1_ip4_static_adjacency['seid']} | | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} -| | Then Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers +| | Then Wait Until Keyword Succeeds | 2x | 5s | 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 Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers +| | And Wait Until Keyword Succeeds | 2x | 5s | 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} \ No newline at end of file diff --git a/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot index c0a411cc4a..04c73db933 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot @@ -29,8 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -58,10 +58,10 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} @@ -78,17 +78,17 @@ | | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id} | | And Create L2 BD | ${dut2_node} | ${vpp_bd_id} | | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id} -| | And Set up L2 Lisp on DUT | ${dut1_node} +| | And Configure L2 LISP on DUT | ${dut1_node} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${lisp_dut_settings} -| | And Set up L2 Lisp on DUT | ${dut2_node} +| | And Configure L2 LISP on DUT | ${dut2_node} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${lisp_dut_settings} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac} | | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac} | | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot index f9860e859e..512f63ee72 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -33,13 +33,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,10 +68,10 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv4 headers on\ | | ... | received packets are correct. | | ... -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} @@ -84,18 +84,18 @@ | | ... | ${dut2_to_dut1_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} -| | When Set up LISP GPE topology +| | When 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 Setup Qemu DUT1 -| | 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} | ${dst_vhost_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} @@ -115,11 +115,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot index d095b79f97..adb01ee289 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot @@ -33,12 +33,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,26 +68,26 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} | | And Add IP Neighbors -| | When Set up LISP GPE topology +| | When 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} -| | 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} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index 7199cda821..d85f009c84 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -33,13 +33,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -69,20 +69,20 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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 Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} -| | When Set up LISP GPE topology +| | When 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} @@ -90,11 +90,11 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} | | And Setup Qemu DUT1 | ${fib_table_1} -| | 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} | ${dst_vhost_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} @@ -114,14 +114,14 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 65c6e932ba..86d7ee8c0e 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -33,12 +33,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,31 +68,31 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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 Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} -| | When Set up LISP GPE topology +| | When 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} -| | 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} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot index e7d89744b5..f74af9607f 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -29,13 +29,13 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -63,10 +63,10 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\ | | ... | received packets are correct. | | ... -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4} @@ -82,18 +82,18 @@ | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} | | ... | ${dut1_to_dut2_mac} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When 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_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut2_ip6o4_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_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_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -108,11 +108,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot index cedb942e24..2d1a9c4253 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot @@ -29,8 +29,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_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 | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -59,10 +59,10 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip6o4} | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -73,30 +73,30 @@ | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${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_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node} +| | When Change LISP Configuration | ${dut1_node} | ${dut2_node} | | ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | | ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip6o4} | | ... | ${dut2_to_dut1_ip6o4_reconf} | ${dut_prefix6o4} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut1_ip6o4_static_adjacency_reconf} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${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_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index 529d0d467b..e5bc484b75 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -29,8 +29,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | Documentation | *LISP static adjacency test cases* @@ -61,15 +61,15 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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 Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4} @@ -77,18 +77,18 @@ | | ... | ${dut_prefix6o4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When 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_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut2_ip6o4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${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_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 9a1800b608..f125dcbe39 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -38,13 +38,13 @@ | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... @@ -78,20 +78,20 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp | | And Setup Qemu DUT1 -| | 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_ip6} | ${dut2_to_dut1_ip6} -| | 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_ip6} | ${dut1_to_dut2_ip6} -| | 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} | ${dst_vhost_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} @@ -117,20 +117,20 @@ | | ... | ${dut1_node} | ${lisp_gpe_int} | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | ${lisp_gpe_int} -| | 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} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | 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} | ${dst_vhost_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} @@ -139,9 +139,9 @@ | Setup Topology And Lisp | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. -| | 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 | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -161,7 +161,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | 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} @@ -176,11 +176,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot index 150a6fee92..d67928c7ab 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot @@ -37,8 +37,8 @@ | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | 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 | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... @@ -69,20 +69,20 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | 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_ip6} | ${dut2_to_dut1_ip6} -| | 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_ip6} | ${dut1_to_dut2_ip6} -| | 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} @@ -102,22 +102,22 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | ${lisp_gpe_int} -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | 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} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | 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} @@ -126,9 +126,9 @@ | Setup Topology And Lisp | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. -| | 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 | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -148,7 +148,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | 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} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index c470b3c38e..66c8a58abc 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -38,14 +38,14 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* @@ -90,26 +90,26 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology | | And Setup Qemu DUT1 -| | 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_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_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_ip6} | ${dut2_to_dut1_ip6} -| | 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_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -131,7 +131,7 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology | | And Setup Qemu DUT1 -| | 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_ip6_eid} | ${dut2_ip6_eid} @@ -141,29 +141,29 @@ | | ... | ${dut1_node} | lisp_gpe0 | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_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} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} *** Keywords *** | Setup Topology -| | 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 | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -194,11 +194,11 @@ | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Vpp RA Suppress Link Layer | ${dut1_node} | ${vhost2} -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot index 8475a68363..e68ecf550d 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot @@ -38,9 +38,9 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} -| Test Teardown | Func Test Teardown +| Test Teardown | Tear down functional test | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* @@ -80,26 +80,26 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology -| | 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_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_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_ip6} | ${dut2_to_dut1_ip6} -| | 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_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -120,7 +120,7 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology -| | 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_ip6_eid} | ${dut2_ip6_eid} @@ -128,29 +128,29 @@ | | ... | ${dut2_to_dut1_ip6_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_ip6} | | ... | ${tg2_ip6} -| | 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_ip6} | | ... | ${tg1_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} *** Keywords *** | Setup Topology -| | 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 | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot index 405aa65f72..af550b319b 100644 --- a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot @@ -29,8 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *l2-lispgpe-ip6 encapsulation test cases* | ... @@ -58,10 +58,10 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} | ${prefix6} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6} @@ -79,17 +79,17 @@ | | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id} | | And Create L2 BD | ${dut2_node} | ${vpp_bd_id} | | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id} -| | And Set up L2 Lisp on DUT | ${dut1_node} +| | And Configure L2 LISP on DUT | ${dut1_node} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${lisp_dut_settings} -| | And Set up L2 Lisp on DUT | ${dut2_node} +| | And Configure L2 LISP on DUT | ${dut2_node} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${lisp_dut_settings} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac} | | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac} | | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot index e47e8d2cc4..d44aabc0f2 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot @@ -24,8 +24,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_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 | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -55,10 +55,10 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | 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 IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4o6} | ${dut_prefix4o6} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -74,30 +74,30 @@ | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4o6} | | ... | ${tg_to_dut1_mac} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6} | | ... | ${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_ip4o6} | ${tg1_ip4o6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node} +| | When Change LISP Configuration | ${dut1_node} | ${dut2_node} | | ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | | ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip4o6} | | ... | ${dut2_to_dut1_ip4o6_reconf} | ${dut_prefix4o6} | | ... | ${dut1_ip4o6_static_adjacency} | | ... | ${dut1_ip4o6_static_adjacency_reconf} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6} | | ... | ${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_ip4o6} | ${tg1_ip4o6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} \ No newline at end of file diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index ad85888aa7..b0c519f799 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -31,14 +31,14 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\ | | ... | received packets are correct. | | ... -| | 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_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr @@ -80,18 +80,18 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When 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_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -112,14 +112,14 @@ | | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot index ba81519e7b..73e66561d5 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot @@ -31,13 +31,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | 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 +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr @@ -80,17 +80,17 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When 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_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index cda0254eba..1f409c98a0 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -31,14 +31,14 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | 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 | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -69,9 +69,9 @@ | | ... | [Ref] RFC6830. | | ... | | ... -| | 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 Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -86,7 +86,7 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When 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_ip6_eid} | ${dut2_ip6_eid} @@ -94,11 +94,11 @@ | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} | | And Setup Qemu DUT1 | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -119,14 +119,14 @@ | | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 1dd9969793..79503d8638 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -31,13 +31,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | 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 +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | 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 Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -84,18 +84,18 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When 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_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${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_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -- cgit 1.2.3-korg