diff options
| author |   Tibor Frank <tifrank@cisco.com> | 2017-06-08 14:45:26 +0200 |
|---|---|---|
| committer | Tibor Frank <tifrank@cisco.com> | 2017-06-13 09:00:09 +0200 |
| commit | 53d69321e41aa6fd94abc16c7050314dc2e53f08 (patch) | |
| tree | 21977de9cc93e53eb2625224262e583a3476bc91 /tests/func/lisp | |
| parent | 5f6802ba1d16005e7562f0eace81512dddab6762 (diff) | |
CSIT-664: Refactor setups and teardowns
- Add suite setup for performance IPSec tests
- Add test teardown for performance SNAT tests
- Add setups and teardowns for functional tests
- Clean up the code
Change-Id: Ia456e9f3ff0f0f2bb9a03f692f27c7f9a2817621
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'tests/func/lisp')
25 files changed, 162 insertions, 191 deletions
diff --git a/tests/func/lisp/api-crud-lisp-func.robot b/tests/func/lisp/api-crud-lisp-func.robot index b627cad8a9..da97272913 100644 --- a/tests/func/lisp/api-crud-lisp-func.robot +++ b/tests/func/lisp/api-crud-lisp-func.robot @@ -21,10 +21,14 @@ | Resource | resources/libraries/robot/lisp/lisp_api.robot # import additional Lisp settings from resource file | 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 | Set up functional test +| ... | Test Teardown | Tear down functional test +| ... | Documentation | *API test cases* | ... | ... | *[Top] Network Topologies:* DUT1 1-node topology. 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 32b3b5c75c..235e581f02 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 @@ -36,12 +36,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index 80ee675c3e..5f9a37eeca 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -36,11 +36,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... 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 90b62e1f87..f09fa31793 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 @@ -36,15 +36,12 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | 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 | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -186,4 +183,3 @@ | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} | | 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 86db5f5bac..ac3620f8a7 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot @@ -36,14 +36,12 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | 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 | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index 81d5f758ad..0c87b3a906 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -36,14 +36,12 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | 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 | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* diff --git a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot index 0a7338c26f..b506c9517f 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot @@ -22,10 +22,14 @@ | Library | resources.libraries.python.Trace # import additional Lisp settings from resource file | 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 | 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\ @@ -58,63 +62,63 @@ | | ... | [Ref] RFC6830. | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | 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 VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} -| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} -| | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} -| | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} +| | 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 VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} +| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} +| | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} +| | ... | ${tg_to_dut2_mac} +| | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} +| | ... | ${tg_to_dut1_mac} | | 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} +| | ... | ${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 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} +| | ... | ${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 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} +| | ... | ${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 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} +| | ... | ${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 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} +| | ... | ${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 Enable Lisp | ${dut1_node} | | And Vpp Add Lisp Adjacency | ${dut1_node} -| | ... | ${dut1_to_dut2_ip4_static_adjacency['vni']} -| | ... | ${dut1_to_dut2_ip4_static_adjacency['deid']} -| | ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']} -| | ... | ${dut1_to_dut2_ip4_static_adjacency['seid']} -| | ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']} +| | ... | ${dut1_to_dut2_ip4_static_adjacency['vni']} +| | ... | ${dut1_to_dut2_ip4_static_adjacency['deid']} +| | ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']} +| | ... | ${dut1_to_dut2_ip4_static_adjacency['seid']} +| | ... | ${dut1_to_dut2_ip4_static_adjacency['prefix']} | | And Vpp Add Lisp Adjacency | ${dut2_node} -| | ... | ${dut2_to_dut1_ip4_static_adjacency['vni']} -| | ... | ${dut2_to_dut1_ip4_static_adjacency['deid']} -| | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} -| | ... | ${dut2_to_dut1_ip4_static_adjacency['seid']} -| | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} +| | ... | ${dut2_to_dut1_ip4_static_adjacency['vni']} +| | ... | ${dut2_to_dut1_ip4_static_adjacency['deid']} +| | ... | ${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 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} +| | ... | ${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 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 +| | ... | ${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-ethip4lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot index 04c73db933..b4c4459e3d 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot @@ -30,6 +30,7 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | Test Setup | Set up functional test +| ... | Test Teardown | Tear down functional test | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* @@ -92,5 +93,3 @@ | | ... | ${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 512f63ee72..4b1f281fb8 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 @@ -34,12 +34,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot index adb01ee289..9c3b7afa31 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot @@ -34,11 +34,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -104,4 +101,4 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} -| | ... | ${dut1_to_dut2_mac}
\ No newline at end of file +| | ... | ${dut1_to_dut2_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 d85f009c84..d547624225 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 @@ -34,12 +34,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -134,4 +130,4 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} -| | ... | ${dut1_to_dut2_mac}
\ No newline at end of file +| | ... | ${dut1_to_dut2_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 86d7ee8c0e..b4d5c08bb6 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -34,11 +34,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... 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 f74af9607f..ee4e408de7 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 @@ -27,15 +27,14 @@ | Library | resources.libraries.python.VPPUtil # import additional Lisp settings from resource file | 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 | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| ... | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot index 2d1a9c4253..7966d1c57c 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot @@ -27,10 +27,14 @@ | Library | resources.libraries.python.VPPUtil # import additional Lisp settings from resource file | 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 | 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\ diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index e5bc484b75..d1db5a8a19 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -27,12 +27,14 @@ | Library | resources.libraries.python.VPPUtil # import additional Lisp settings from resource file | 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 | Set up functional test -| Test Teardown | Run Keywords | Tear down functional test -| ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... +| Test Teardown | Tear down LISP functional test +| ... | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ 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 f125dcbe39..3db32da344 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 @@ -36,15 +36,12 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | 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 | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot index d67928c7ab..b1f923d36b 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot @@ -35,9 +35,11 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | 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 | Set up functional test +| ... | Test Teardown | Tear down functional test | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* 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 66c8a58abc..e03d8fff38 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 @@ -36,16 +36,13 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | 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 | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot index e68ecf550d..177550f468 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot @@ -36,10 +36,12 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | 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 | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} +| ... | Test Teardown | Tear down functional test | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, diff --git a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot index af550b319b..7db90b677a 100644 --- a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot @@ -30,6 +30,7 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | Test Setup | Set up functional test +| ... | Test Teardown | Tear down functional test | ... | Documentation | *l2-lispgpe-ip6 encapsulation test cases* @@ -93,5 +94,3 @@ | | ... | ${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 d44aabc0f2..5ddf50eb96 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot @@ -22,10 +22,14 @@ | Library | resources.libraries.python.Trace # import additional Lisp settings from resource file | 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 | 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,49 +59,50 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. +| | ... | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | 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} -| | ... | ${dut1_to_tg_ip4o6} | ${tg_prefix4o6} -| | ... | ${dut2_node} | ${dut2_to_dut1} -| | ... | ${dut2_to_dut1_ip4o6} | ${dut_prefix4o6} -| | ... | ${dut2_node} | ${dut2_to_tg} -| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} -| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4o6} -| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4o6} -| | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4o6} -| | ... | ${tg_to_dut2_mac} -| | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4o6} -| | ... | ${tg_to_dut1_mac} +| | 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} +| | ... | ${dut1_to_tg_ip4o6} | ${tg_prefix4o6} +| | ... | ${dut2_node} | ${dut2_to_dut1} +| | ... | ${dut2_to_dut1_ip4o6} | ${dut_prefix4o6} +| | ... | ${dut2_node} | ${dut2_to_tg} +| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} +| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4o6} +| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4o6} +| | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4o6} +| | ... | ${tg_to_dut2_mac} +| | 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 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} +| | ... | ${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 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} +| | ... | ${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 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} +| | ... | ${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} -| | ... | ${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} +| | ... | ${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 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} +| | ... | ${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 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 +| | ... | ${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} 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 b0c519f799..afcbab6918 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 @@ -33,12 +33,8 @@ | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -132,4 +128,4 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} -| | ... | ${dut1_to_dut2_mac}
\ No newline at end of file +| | ... | ${dut1_to_dut2_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot index 73e66561d5..93399bbe35 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot @@ -32,12 +32,9 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | 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 | Verify VPP PID in Teardown +| ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} +| ... +| Test Teardown | Tear down LISP functional test | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -107,4 +104,4 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} -| | ... | ${dut1_to_dut2_mac}
\ No newline at end of file +| | ... | ${dut1_to_dut2_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 1f409c98a0..b41cb37d94 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 @@ -33,12 +33,8 @@ | ... | 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 | Verify VPP PID in Teardown +| ... +| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -139,4 +135,4 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} -| | ... | ${dut1_to_dut2_mac}
\ No newline at end of file +| | ... | ${dut1_to_dut2_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 79503d8638..281bbd0dda 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -32,12 +32,9 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... | 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 | Verify VPP PID in Teardown +| ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} +| ... +| Test Teardown | Tear down LISP functional test | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -112,4 +109,4 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} -| | ... | ${dut1_to_dut2_mac}
\ No newline at end of file +| | ... | ${dut1_to_dut2_mac} |