diff options
59 files changed, 330 insertions, 359 deletions
diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 78caeb79a4..6b2f5edb83 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -97,3 +97,48 @@ class DUTSetup(object): format(node['host'], stdout + stderr)) raise Exception('DUT test setup script failed at node {}'. format(node['host'])) + + @staticmethod + def get_vpp_pid(node): + """Get PID of running VPP process. + + :param node: DUT node. + :type node: dict + :return: PID + :rtype: int + :raises RuntimeError if it is not possible to get the PID. + """ + + ssh = SSH() + ssh.connect(node) + ret_code, stdout, stderr = ssh.exec_command('pidof vpp') + + logger.trace(stdout) + logger.trace(stderr) + + if int(ret_code) != 0: + logger.debug('Not possible to get PID of VPP process on node: ' + '"{1}"'.format(node['host'], stdout + stderr)) + raise RuntimeError('Not possible to get PID of VPP process on node:' + ' {}'.format(node['host'])) + + if len(stdout.splitlines()) != 1: + raise RuntimeError("More then one VPP PID found on node {0}". + format(node['host'])) + return int(stdout) + + @staticmethod + def get_vpp_pids(nodes): + """Get PID of running VPP process on all DUTs. + + :param nodes: DUT nodes. + :type nodes: dict + :return: PIDs + :rtype: dict + """ + + pids = dict() + for node in nodes.values(): + if node['type'] == NodeType.DUT: + pids[node['host']] = DUTSetup.get_vpp_pid(node) + return pids diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py index af3ea47560..e755c75673 100644 --- a/resources/libraries/python/VppCounters.py +++ b/resources/libraries/python/VppCounters.py @@ -58,6 +58,23 @@ class VppCounters(object): vat.execute_script("show_errors_verbose.vat", node, json_out=False) @staticmethod + def vpp_show_errors_on_all_duts(nodes, verbose=False): + """Show errors on all DUTs. + + :param nodes: VPP nodes + :param verbose: If True show verbose output. + :type nodes: dict + :type verbose: bool + """ + + for node in nodes.values(): + if node['type'] == NodeType.DUT: + if verbose: + VppCounters.vpp_show_errors_verbose(node) + else: + VppCounters.vpp_show_errors(node) + + @staticmethod def vpp_show_runtime(node): """Run "show runtime" CLI command. diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot index 8602f705ef..dca7d53373 100644 --- a/resources/libraries/robot/default.robot +++ b/resources/libraries/robot/default.robot @@ -173,3 +173,41 @@ | | :FOR | ${dut} | IN | @{duts} | | | Apply Config | ${nodes['${dut}']} | | Update All Interface Data On All Nodes | ${nodes} | skip_tg=${TRUE} + +| Save VPP PIDs +| | [Documentation] | Get PIDs of VPP processes from all DUTs in topology and +| | ... | set it as a test variable. The PIDs are stored as dictionary items +| | ... | where the key is the host and the value is the PID. +| | ... +| | ${setup_vpp_pids}= | Get VPP PIDs | ${nodes} +| | Set Test Variable | ${setup_vpp_pids} + +| Check VPP PID in Teardown +| | [Documentation] | Check if the VPP PIDs on all DUTs are the same at the end +| | ... | of test as they were at the begining. If they are not, only a message +| | ... | is printed on console and to log. The test will not fail. +| | ... +| | ${teardown_vpp_pids}= | Get VPP PIDs | ${nodes} +| | ${err_msg}= | Catenate | \nThe VPP PIDs are not equal!\nTest Setup VPP PIDs: +| | ... | ${setup_vpp_pids}\nTest Teardown VPP PIDs: ${teardown_vpp_pids} +| | ${rc} | ${msg}= | Run keyword and ignore error +| | ... | Dictionaries Should Be Equal +| | ... | ${setup_vpp_pids} | ${teardown_vpp_pids} +| | Run Keyword And Return If | '${rc}'=='FAIL' | Log | ${err_msg} +| | ... | console=yes | level=WARN + +| Func Test Setup +| | [Documentation] | Common test setup for functional tests. +| | ... +| | Setup all DUTs before test +| | Save VPP PIDs +| | Setup all TGs before traffic script +| | Update All Interface Data On All Nodes | ${nodes} + +| Func Test Teardown +| | [Documentation] | Common test teardown for functional tests. +| | ... +| | Show Packet Trace on All DUTs | ${nodes} +| | Show vpp trace dump on all DUTs +| | Vpp Show Errors On All DUTs | ${nodes} +| | Check VPP PID in Teardown diff --git a/tests/func/bridge_domain/bridge_domain_untagged.robot b/tests/func/bridge_domain/bridge_domain_untagged.robot index 1876d901bb..346ce86c92 100644 --- a/tests/func/bridge_domain/bridge_domain_untagged.robot +++ b/tests/func/bridge_domain/bridge_domain_untagged.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -222,8 +220,9 @@ | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | TC07: DUT with two L2BDs (MAC learn) switches ICMPv6 between TG and VM links | | [Documentation] @@ -255,8 +254,9 @@ | | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | TC08: DUT with two L2BDs (static MACs) switches ICMPv4 between TG and VM links | | [Documentation] @@ -310,8 +310,9 @@ | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | TC09: DUT with two L2BDs (static MACs) switches ICMPv6 between TG and VM links | | [Documentation] @@ -321,7 +322,14 @@ | | ... | virtio i/fs. [Ver] Make TG verify ICMPv6 Echo Req pkts are | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] +| | ... | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV +| | ... +| | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown +| | ... | | Given Path for 2-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Interfaces in 2-node path are up @@ -364,6 +372,3 @@ | | ... | ${sock2} | | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} -| | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} diff --git a/tests/func/cop/cop_whitelist_blacklist.robot b/tests/func/cop/cop_whitelist_blacklist.robot index c84387d349..be6b476062 100644 --- a/tests/func/cop/cop_whitelist_blacklist.robot +++ b/tests/func/cop/cop_whitelist_blacklist.robot @@ -22,11 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv4NodeAddress.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *COP Security IPv4 Blacklist and Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/func/cop/cop_whitelist_blacklist_IPv6.robot b/tests/func/cop/cop_whitelist_blacklist_IPv6.robot index 3fb9428680..140c6b0673 100644 --- a/tests/func/cop/cop_whitelist_blacklist_IPv6.robot +++ b/tests/func/cop/cop_whitelist_blacklist_IPv6.robot @@ -22,11 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *COP Security IPv6 Blacklist and Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/func/dhcp/dhcp_client.robot b/tests/func/dhcp/dhcp_client.robot index eb34544d0b..6169b97fb7 100644 --- a/tests/func/dhcp/dhcp_client.robot +++ b/tests/func/dhcp/dhcp_client.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/ipv4.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *DHCP Client related test cases* *** Variables *** diff --git a/tests/func/dhcp/dhcp_v4_proxy.robot b/tests/func/dhcp/dhcp_v4_proxy.robot index 48afa2643d..a9c4d23ea9 100644 --- a/tests/func/dhcp/dhcp_v4_proxy.robot +++ b/tests/func/dhcp/dhcp_v4_proxy.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/ipv4.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *DHCP proxy test cases* | ... | ... | *[Top] Network Topologies:* TG = DUT diff --git a/tests/func/dhcp/dhcp_v6_proxy.robot b/tests/func/dhcp/dhcp_v6_proxy.robot index 8f38bb29c5..850b685e88 100644 --- a/tests/func/dhcp/dhcp_v6_proxy.robot +++ b/tests/func/dhcp/dhcp_v6_proxy.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/ipv6.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *DHCPv6 proxy test cases* | ... | ... | *[Top] Network Topologies:* TG = DUT diff --git a/tests/func/fds/provider_network.robot b/tests/func/fds/provider_network.robot index e1534b7134..612825d9a4 100644 --- a/tests/func/fds/provider_network.robot +++ b/tests/func/fds/provider_network.robot @@ -21,6 +21,7 @@ | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | Test Setup | Run Keywords | Setup all DUTs before test +| ... | AND | Save VPP PIDs | ... | AND | Setup all TGs before traffic script | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show vpp trace dump on all DUTs @@ -28,6 +29,7 @@ | ... | qemu_node1 | ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} | ... | qemu_node2 +| ... | AND | Check VPP PID in Teardown | Documentation | *Provider network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG diff --git a/tests/func/fds/tenant_network.robot b/tests/func/fds/tenant_network.robot index e57b374583..ba26c8bb55 100644 --- a/tests/func/fds/tenant_network.robot +++ b/tests/func/fds/tenant_network.robot @@ -21,6 +21,7 @@ | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | Test Setup | Run Keywords | Setup all DUTs before test +| ... | AND | Save VPP PIDs | ... | AND | Setup all TGs before traffic script | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show vpp trace dump on all DUTs @@ -28,6 +29,7 @@ | ... | qemu_node1 | ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} | ... | qemu_node2 +| ... | AND | Check VPP PID in Teardown | Documentation | *Tenant network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG diff --git a/tests/func/gre/gre_encapsulation.robot b/tests/func/gre/gre_encapsulation.robot index 0296ec3af2..7087e31326 100644 --- a/tests/func/gre/gre_encapsulation.robot +++ b/tests/func/gre/gre_encapsulation.robot @@ -20,12 +20,8 @@ | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace | Force Tags | VM_ENV | HW_ENV -| Test Setup | Run Keywords -| ... | Setup all DUTs before test | AND -| ... | Setup all TGs before traffic script -| Test Teardown | Run Keywords -| ... | Show Packet Trace on All DUTs | ${nodes} | AND -| ... | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *GREoIPv4 test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links diff --git a/tests/func/iacl/ipv4_iacl_untagged.robot b/tests/func/iacl/ipv4_iacl_untagged.robot index d840f38538..ff55d94374 100644 --- a/tests/func/iacl/ipv4_iacl_untagged.robot +++ b/tests/func/iacl/ipv4_iacl_untagged.robot @@ -22,14 +22,9 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *IPv4 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv4 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv4 diff --git a/tests/func/iacl/ipv6_iacl_untagged.robot b/tests/func/iacl/ipv6_iacl_untagged.robot index db814b221b..47daac02a5 100644 --- a/tests/func/iacl/ipv6_iacl_untagged.robot +++ b/tests/func/iacl/ipv6_iacl_untagged.robot @@ -21,15 +21,9 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *IPv6 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv6 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv6 diff --git a/tests/func/iacl/l2_iacl_untagged.robot b/tests/func/iacl/l2_iacl_untagged.robot index 071ce1b34c..06ecc99176 100644 --- a/tests/func/iacl/l2_iacl_untagged.robot +++ b/tests/func/iacl/l2_iacl_untagged.robot @@ -20,15 +20,10 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | ... | 3_NODE_DOUBLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Ingress ACL test cases* | ... | ... | *[Top] Network Topologies:* TG - DUT1 - DUT2 - TG diff --git a/tests/func/ipsec/ipsec_transport_mode_ipv4.robot b/tests/func/ipsec/ipsec_transport_mode_ipv4.robot index 14ea198bbd..ca7f1b38fb 100644 --- a/tests/func/ipsec/ipsec_transport_mode_ipv4.robot +++ b/tests/func/ipsec/ipsec_transport_mode_ipv4.robot @@ -16,13 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show Vpp Errors on All DUTs -| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Func Test Teardown | Documentation | *IPv4 IPsec transport mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ diff --git a/tests/func/ipsec/ipsec_transport_mode_ipv6.robot b/tests/func/ipsec/ipsec_transport_mode_ipv6.robot index 1128e4e6c7..517c01b665 100644 --- a/tests/func/ipsec/ipsec_transport_mode_ipv6.robot +++ b/tests/func/ipsec/ipsec_transport_mode_ipv6.robot @@ -16,13 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show Vpp Errors on All DUTs -| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Func Test Teardown | Documentation | *IPv6 IPsec transport mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ diff --git a/tests/func/ipsec/ipsec_tunnel_mode_ipv4.robot b/tests/func/ipsec/ipsec_tunnel_mode_ipv4.robot index d59aae6e54..e7c2967cf9 100644 --- a/tests/func/ipsec/ipsec_tunnel_mode_ipv4.robot +++ b/tests/func/ipsec/ipsec_tunnel_mode_ipv4.robot @@ -16,13 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show Vpp Errors on All DUTs -| ... | AND | Show Vpp Trace Dump on All DUTs +| ... | AND | Func Test Teardown | Documentation | *IPv4 IPsec tunnel mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ diff --git a/tests/func/ipsec/ipsec_tunnel_mode_ipv6.robot b/tests/func/ipsec/ipsec_tunnel_mode_ipv6.robot index c1c279198a..60b71fe9d5 100644 --- a/tests/func/ipsec/ipsec_tunnel_mode_ipv6.robot +++ b/tests/func/ipsec/ipsec_tunnel_mode_ipv6.robot @@ -16,13 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show Vpp Errors on All DUTs -| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Func Test Teardown | Documentation | *IPv6 IPsec tunnel mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ diff --git a/tests/func/ipv4/ipv4_arp_untagged.robot b/tests/func/ipv4/ipv4_arp_untagged.robot index a387eed85f..0950610559 100644 --- a/tests/func/ipv4/ipv4_arp_untagged.robot +++ b/tests/func/ipv4/ipv4_arp_untagged.robot @@ -20,14 +20,9 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword If Test Failed | Run Keywords -| ... | Show packet trace on all DUTs | ${nodes} | AND -| ... | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *IPv4 ARP test cases* | ... | ... | RFC826 ARP: Eth-IPv4 and Eth-ARP on links TG-DUT1, TG-DUT2, DUT1-DUT2: diff --git a/tests/func/ipv4/ipv4_multipath_routing.robot b/tests/func/ipv4/ipv4_multipath_routing.robot index 9d31bf0d61..f55ee64df9 100644 --- a/tests/func/ipv4/ipv4_multipath_routing.robot +++ b/tests/func/ipv4/ipv4_multipath_routing.robot @@ -20,14 +20,9 @@ | Resource | resources/libraries/robot/ipv4.robot | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Ipv4 Multipath routing test cases* | ... | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\ diff --git a/tests/func/ipv4/ipv4_proxy_arp_untagged.robot b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot index ec164d2d32..765a54b6d5 100644 --- a/tests/func/ipv4/ipv4_proxy_arp_untagged.robot +++ b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot @@ -20,12 +20,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.ProxyArp | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords -| ... | Show packet trace on all DUTs | ${nodes} | AND -| ... | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *RFC1027 Proxy ARP test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with diff --git a/tests/func/ipv4/ipv4_untagged.robot b/tests/func/ipv4/ipv4_untagged.robot index b7cb9d96a9..4755f2e900 100644 --- a/tests/func/ipv4/ipv4_untagged.robot +++ b/tests/func/ipv4/ipv4_untagged.robot @@ -18,14 +18,17 @@ | Resource | resources/libraries/robot/interfaces.robot | Resource | resources/libraries/robot/ipv4.robot | Force Tags | HW_ENV -| Suite Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| ... | AND | Setup DUT nodes for IPv4 testing -| Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes} +| Suite Setup | Run Keywords +| ... | Setup all DUTs before test | AND +| ... | Setup all TGs before traffic script | AND +| ... | Update All Interface Data On All Nodes | ${nodes} | AND +| ... | Setup DUT nodes for IPv4 testing +| Test Setup | Run Keywords | Save VPP PIDs | AND +| ... | Clear interface counters on all vpp nodes in topology | ${nodes} | Test Teardown | Run Keywords | ... | Show packet trace on all DUTs | ${nodes} | AND -| ... | Show vpp trace dump on all DUTs +| ... | Show vpp trace dump on all DUTs | AND +| ... | Check VPP PID in Teardown | Documentation | *IPv4 routing test cases* | ... | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4 @@ -126,7 +129,9 @@ | | ... | step of 10Bytes. Make TG verify ICMPv4 Echo Replies are correct. | | [Tags] | 3_NODE_SINGLE_LINK_TOPO | | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} -| | [Teardown] | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} +| | [Teardown] | Run keywords +| | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} +| | ... | AND | Check VPP PID in Teardown | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${dut_port} | ${dut_node}= | Last Interface diff --git a/tests/func/ipv6/ipv6_multipath_routing.robot b/tests/func/ipv6/ipv6_multipath_routing.robot index 02d48a0a72..fddf3a98a8 100644 --- a/tests/func/ipv6/ipv6_multipath_routing.robot +++ b/tests/func/ipv6/ipv6_multipath_routing.robot @@ -20,14 +20,9 @@ | Resource | resources/libraries/robot/ipv6.robot | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Ipv6 Multipath routing test cases* | ... | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\ diff --git a/tests/func/ipv6/ipv6_ra.robot b/tests/func/ipv6/ipv6_ra.robot index 91a1b517d8..e45ce730c9 100644 --- a/tests/func/ipv6/ipv6_ra.robot +++ b/tests/func/ipv6/ipv6_ra.robot @@ -19,14 +19,9 @@ | Resource | resources/libraries/robot/ipv6.robot | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup All TGs Before Traffic Script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup All DUTs Before Test -| Test Teardown | Run Keywords -| ... | Show Packet Trace On All DUTs | ${nodes} | AND -| ... | Show VPP Trace Dump On All DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *IPv6 Router Advertisement test cases* | ... | ... | RFC4861 Neighbor Discovery. Encapsulations: Eth-IPv6-RA on links diff --git a/tests/func/ipv6/ipv6_untagged.robot b/tests/func/ipv6/ipv6_untagged.robot index 8814cf3eae..6048daad67 100644 --- a/tests/func/ipv6/ipv6_untagged.robot +++ b/tests/func/ipv6/ipv6_untagged.robot @@ -19,14 +19,17 @@ | Resource | resources/libraries/robot/default.robot | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | HW_ENV -| Suite Setup | Run Keywords | Setup ipv6 to all dut in topology | ${nodes} | ${nodes_ipv6_addr} -| ... | AND | Vpp nodes ra suppress link layer | ${nodes} -| ... | AND | Vpp nodes setup ipv6 routing | ${nodes} | ${nodes_ipv6_addr} -| ... | AND | Setup all TGs before traffic script -| Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes} +| Suite Setup | Run Keywords +| ... | Setup ipv6 to all dut in topology | ${nodes} | ${nodes_ipv6_addr} | AND +| ... | Vpp nodes ra suppress link layer | ${nodes} | AND +| ... | Vpp nodes setup ipv6 routing | ${nodes} | ${nodes_ipv6_addr} | AND +| ... | Setup all TGs before traffic script +| Test Setup | Run Keywords | Save VPP PIDs | AND +| ... | Clear interface counters on all vpp nodes in topology | ${nodes} | Test Teardown | Run Keywords | ... | Show packet trace on all DUTs | ${nodes} | AND -| ... | Show vpp trace dump on all DUTs +| ... | Show vpp trace dump on all DUTs | AND +| ... | Check VPP PID in Teardown | Documentation | *IPv6 routing test cases* | ... | ... | RFC2460 IPv6, RFC4443 ICMPv6, RFC4861 Neighbor Discovery. @@ -62,7 +65,9 @@ | | ... | step of 10Bytes. Make TG verify ICMPv6 Echo Replies are correct. | | [Tags] | 3_NODE_SINGLE_LINK_TOPO | | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} -| | [Teardown] | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} +| | [Teardown] | Run keywords +| | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} +| | ... | AND | Check VPP PID in Teardown | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${dut_port} | ${dut_node}= | Last Interface diff --git a/tests/func/l2_xconnect/l2_xconnect_untagged.robot b/tests/func/l2_xconnect/l2_xconnect_untagged.robot index 05da05308d..2554007cef 100644 --- a/tests/func/l2_xconnect/l2_xconnect_untagged.robot +++ b/tests/func/l2_xconnect/l2_xconnect_untagged.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Setup all DUTs before test -| Suite Setup | Setup all TGs before traffic script +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *L2 cross-connect test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with @@ -63,7 +63,6 @@ | | When All Vpp Interfaces Ready Wait | ${nodes} | | Then Send and receive ICMPv4 bidirectionally | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} -| | [Teardown] | Run Keyword | Show vpp trace dump on all DUTs | TC02: DUT1 and DUT2 with L2XC switch ICMPv6 between two TG links | | [Documentation] @@ -83,7 +82,6 @@ | | When All Vpp Interfaces Ready Wait | ${nodes} | | Then Send and receive ICMPv6 bidirectionally | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} -| | [Teardown] | Run Keyword | Show vpp trace dump on all DUTs | TC03: DUT with two L2XCs switches ICMPv4 between TG and local VM links | | [Documentation] @@ -107,8 +105,9 @@ | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Check VPP PID in Teardown | TC04: DUT with two L2XCs switches ICMPv6 between TG and local VM links | | [Documentation] @@ -132,6 +131,7 @@ | | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Check VPP PID in Teardown diff --git a/tests/func/lisp/api.robot b/tests/func/lisp/api.robot index e464ba221b..013eb7258c 100644 --- a/tests/func/lisp/api.robot +++ b/tests/func/lisp/api.robot @@ -23,11 +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 | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *API test cases* | ... | ... | *[Top] Network Topologies:* DUT1 1-node topology. diff --git a/tests/func/lisp/dataplane_generic.robot b/tests/func/lisp/dataplane_generic.robot index 94079d162f..9ab69b2d71 100644 --- a/tests/func/lisp/dataplane_generic.robot +++ b/tests/func/lisp/dataplane_generic.robot @@ -24,11 +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 | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *IP AFI independent functional tests.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ diff --git a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot index bdd41e3af4..18494ab565 100644 --- a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot +++ b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot @@ -35,13 +35,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} +| Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Show Vpp Settings | ${nodes['DUT1']} +| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Check VPP PID in Teardown | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf) | ... @@ -248,10 +247,11 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} -| | ... | AND | Show VPP Settings | ${dut1_node} -| | ... | AND | Show VPP Settings | ${dut2_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show VPP Settings | ${dut1_node} +| | ... | AND | Show VPP Settings | ${dut2_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 @@ -295,10 +295,11 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} -| | ... | AND | Show VPP Settings | ${dut1_node} -| | ... | AND | Show VPP Settings | ${dut2_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show VPP Settings | ${dut1_node} +| | ... | AND | Show VPP Settings | ${dut2_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 diff --git a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot index c290564d7b..71ff7d721b 100644 --- a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot +++ b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot @@ -37,13 +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 | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | VPP Show Errors | ${nodes['DUT1']} -| ... | AND | VPP Show Errors | ${nodes['DUT2']} +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... @@ -141,10 +136,11 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | VPP Show Errors | ${nodes['DUT1']} -| | ... | AND | VPP Show Errors | ${nodes['DUT2']} -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | VPP Show Errors | ${nodes['DUT1']} +| | ... | AND | VPP Show Errors | ${nodes['DUT2']} +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 @@ -181,10 +177,11 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | VPP Show Errors | ${nodes['DUT1']} -| | ... | AND | VPP Show Errors | ${nodes['DUT2']} -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | VPP Show Errors | ${nodes['DUT1']} +| | ... | AND | VPP Show Errors | ${nodes['DUT2']} +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 diff --git a/tests/func/lisp/ipsec_ipv6_lispgpe_ipv4.robot b/tests/func/lisp/ipsec_ipv6_lispgpe_ipv4.robot index 266a445011..2002d9e615 100644 --- a/tests/func/lisp/ipsec_ipv6_lispgpe_ipv4.robot +++ b/tests/func/lisp/ipsec_ipv6_lispgpe_ipv4.robot @@ -38,13 +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 | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} +| Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Show Vpp Settings | ${nodes['DUT1']} +| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Check VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -143,10 +142,11 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Show Vpp Settings | ${nodes['DUT1']} +| | ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 @@ -183,10 +183,11 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | Show Vpp Settings | ${nodes['DUT1']} +| | ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 @@ -231,6 +232,7 @@ | | ... | AND | Show vpp trace dump on all DUTs | | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | | ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 diff --git a/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot b/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot index c6707c23b1..16af411f70 100644 --- a/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot +++ b/tests/func/lisp/ipsec_ipv6_lispgpe_ipv6.robot @@ -38,14 +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 | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Show VPP Settings | ${nodes['DUT1']} -| ... | AND | Show VPP Settings | ${nodes['DUT2']} +| Test Teardown | Func Test Teardown | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* @@ -165,11 +160,12 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | VPP Show Errors | ${nodes['DUT1']} -| | ... | AND | VPP Show Errors | ${nodes['DUT2']} -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} -| | ... | AND | Show VPP Settings | ${dut1_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | VPP Show Errors | ${nodes['DUT1']} +| | ... | AND | VPP Show Errors | ${nodes['DUT2']} +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show VPP Settings | ${dut1_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 @@ -212,11 +208,12 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830, RFC4303. | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | VPP Show Errors | ${nodes['DUT1']} -| | ... | AND | VPP Show Errors | ${nodes['DUT2']} -| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} -| | ... | AND | Show VPP Settings | ${dut1_node} +| | ... | AND | Show vpp trace dump on all DUTs +| | ... | AND | VPP Show Errors | ${nodes['DUT1']} +| | ... | AND | VPP Show Errors | ${nodes['DUT2']} +| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Show VPP Settings | ${dut1_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 diff --git a/tests/func/lisp/ipv4_lispgpe_ipv4.robot b/tests/func/lisp/ipv4_lispgpe_ipv4.robot index 7810cf4db4..7caba043da 100644 --- a/tests/func/lisp/ipv4_lispgpe_ipv4.robot +++ b/tests/func/lisp/ipv4_lispgpe_ipv4.robot @@ -33,13 +33,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} +| Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Show Vpp Settings | ${nodes['DUT1']} +| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Check VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -110,11 +109,6 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| | ... | AND | Show vpp trace dump on all DUTs -| | ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| | ... | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Interfaces in 3-node path are up @@ -160,6 +154,7 @@ | | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} @@ -210,6 +205,7 @@ | | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} diff --git a/tests/func/lisp/ipv4_lispgpe_ipv6.robot b/tests/func/lisp/ipv4_lispgpe_ipv6.robot index f6596ba48b..fe92ee0882 100644 --- a/tests/func/lisp/ipv4_lispgpe_ipv6.robot +++ b/tests/func/lisp/ipv4_lispgpe_ipv6.robot @@ -29,11 +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 | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -124,6 +121,7 @@ | | ... | AND | Show vpp trace dump on all DUTs | | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | | ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| | ... | AND | Check VPP PID in Teardown | | ... | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} @@ -172,6 +170,7 @@ | | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} diff --git a/tests/func/lisp/ipv6_lispgpe_ipv4.robot b/tests/func/lisp/ipv6_lispgpe_ipv4.robot index a4ff3a61c3..5a992787a1 100644 --- a/tests/func/lisp/ipv6_lispgpe_ipv4.robot +++ b/tests/func/lisp/ipv6_lispgpe_ipv4.robot @@ -24,11 +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 | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ diff --git a/tests/func/lisp/ipv6_lispgpe_ipv6.robot b/tests/func/lisp/ipv6_lispgpe_ipv6.robot index da78cb4453..8b00eda574 100644 --- a/tests/func/lisp/ipv6_lispgpe_ipv6.robot +++ b/tests/func/lisp/ipv6_lispgpe_ipv6.robot @@ -31,14 +31,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} +| Test Setup | Run Keywords | Func Test Setup +| ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Show Vpp Settings | ${nodes['DUT1']} -| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Show Vpp Settings | ${nodes['DUT1']} +| ... | AND | Show Vpp Settings | ${nodes['DUT2']} +| ... | AND | Check VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -162,6 +161,7 @@ | | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} @@ -215,6 +215,7 @@ | | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node} +| | ... | AND | Check VPP PID in Teardown | | ... | | Given Path for 3-node testing is set | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} diff --git a/tests/func/lisp/l2_lisp_ipv4.robot b/tests/func/lisp/l2_lisp_ipv4.robot index 01cf78ffe1..c0a411cc4a 100644 --- a/tests/func/lisp/l2_lisp_ipv4.robot +++ b/tests/func/lisp/l2_lisp_ipv4.robot @@ -29,13 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | VPP Show Errors | ${nodes['DUT1']} -| ... | AND | VPP Show Errors | ${nodes['DUT2']} +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... diff --git a/tests/func/lisp/l2_lisp_ipv6.robot b/tests/func/lisp/l2_lisp_ipv6.robot index 4070a653dc..8f421977f1 100644 --- a/tests/func/lisp/l2_lisp_ipv6.robot +++ b/tests/func/lisp/l2_lisp_ipv6.robot @@ -29,13 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | VPP Show Errors | ${nodes['DUT1']} -| ... | AND | VPP Show Errors | ${nodes['DUT2']} +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | ... | Documentation | *l2-lispgpe-ip6 encapsulation test cases* | ... diff --git a/tests/func/policer/policer_ip4.robot b/tests/func/policer/policer_ip4.robot index 5c9e0bbed2..4cb3686788 100644 --- a/tests/func/policer/policer_ip4.robot +++ b/tests/func/policer/policer_ip4.robot @@ -15,11 +15,9 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | Resource | resources/libraries/robot/policer.robot | Library | resources.libraries.python.Trace -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv4 policer testing -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Teardown | Func Test Teardown | Documentation | *IPv4 policer test cases* | ... | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\ diff --git a/tests/func/policer/policer_ip6.robot b/tests/func/policer/policer_ip6.robot index a5721a2d7b..6a7ae1a306 100644 --- a/tests/func/policer/policer_ip6.robot +++ b/tests/func/policer/policer_ip6.robot @@ -15,11 +15,9 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | Resource | resources/libraries/robot/policer.robot | Library | resources.libraries.python.Trace -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv6 policer testing -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Teardown | Func Test Teardown | Documentation | *IPv6 policer test cases* | ... | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\ diff --git a/tests/func/rpf/ipv4_rpf_untagged.robot b/tests/func/rpf/ipv4_rpf_untagged.robot index c91436a1f1..708477a71d 100644 --- a/tests/func/rpf/ipv4_rpf_untagged.robot +++ b/tests/func/rpf/ipv4_rpf_untagged.robot @@ -20,14 +20,9 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace - | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Source RPF check on IPv4 test cases* | ... | ... | *[Top] Network Topologies:* TG - DUT1 - DUT2 - TG diff --git a/tests/func/softwire/lightweight_4over6.robot b/tests/func/softwire/lightweight_4over6.robot index 06f7c6efad..f96ee19b4e 100644 --- a/tests/func/softwire/lightweight_4over6.robot +++ b/tests/func/softwire/lightweight_4over6.robot @@ -19,9 +19,8 @@ | Resource | resources/libraries/robot/map.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Show Packet Trace on All DUTs | ${nodes} +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Lightweight 4 over 6 test cases* | ... | ... | LW4o6 is a subset of MAP-E, with per-subscriber rules. It uses the diff --git a/tests/func/softwire/map_e.robot b/tests/func/softwire/map_e.robot index c8b7f151fa..78246b5e44 100644 --- a/tests/func/softwire/map_e.robot +++ b/tests/func/softwire/map_e.robot @@ -20,17 +20,10 @@ | Resource | resources/libraries/robot/map.robot | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | Variables | resources/test_data/softwire/map_e_domains.py | ${5} -| Suite Setup | Run Keywords -| ... | Setup All DUTs Before Test | AND -| ... | Setup All TGs Before Traffic Script -| Test Setup | Run Keywords -| ... | Setup All DUTs Before Test | AND -| ... | Setup All TGs Before Traffic Script -| Test Teardown | Run Keywords -| ... | Show Packet Trace On All DUTs | ${nodes} | AND -| ... | Show Vpp Trace Dump On All DUTs +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Test for Basic mapping rule for MAP-E*\ | ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the | ... | nodes. @@ -66,8 +59,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Setup All DUTs Before Test | AND -| | ... | Setup All TGs Before Traffic Script | AND +| | ... | Func Test Setup | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |=================|===============|================|============|=============|==========|================|==========|==================================| @@ -92,8 +84,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Setup All DUTs Before Test | AND -| | ... | Setup All TGs Before Traffic Script | AND +| | ... | Func Test Setup | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|===============|================|============|=============|==========|================|==========|==================================| @@ -121,8 +112,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Setup All DUTs Before Test | AND -| | ... | Setup All TGs Before Traffic Script | AND +| | ... | Func Test Setup | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|===============|================|============|=============|==========|================|==========|===================================| @@ -169,8 +159,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Setup All DUTs Before Test | AND -| | ... | Setup All TGs Before Traffic Script | AND +| | ... | Func Test Setup | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|=========================|================|============|=============|==========|================|==========| @@ -187,8 +176,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Setup All DUTs Before Test | AND -| | ... | Setup All TGs Before Traffic Script | AND +| | ... | Func Test Setup | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|=========================|================|============|=============|==========|================|==========| @@ -419,7 +407,8 @@ | | [Teardown] | Run Keywords | | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND | | ... | Show Packet Trace On All DUTs | ${nodes} | AND -| | ... | Clear Packet Trace On All DUTs | ${nodes} +| | ... | Clear Packet Trace On All DUTs | ${nodes} | AND +| | ... | Check VPP PID in Teardown | Check Encapsulation With Traffic Script | | [Arguments] | ${ipv4_dst} | ${dst_port} | ${ipv6_dst} diff --git a/tests/func/softwire/map_t.robot b/tests/func/softwire/map_t.robot index 5629f50e89..4167ca2bcf 100644 --- a/tests/func/softwire/map_t.robot +++ b/tests/func/softwire/map_t.robot @@ -21,12 +21,9 @@ | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Suite Setup | Run Keywords -| ... | Setup all DUTs before test | AND -| ... | Setup all TGs before traffic script -| Test Teardown | Run Keywords -| ... | Show packet trace on all DUTs | ${nodes} | AND -| ... | Show vpp trace dump on all DUTs +| Test Setup | Run Keywords | Func Test Setup +| ... | AND | Set interfaces IP addresses and routes +| Test Teardown | Func Test Teardown | Documentation | *Test for Basic mapping rule for MAP-T*\ | ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the | ... | nodes. @@ -55,7 +52,6 @@ | TC01: MAP-T test | | [Documentation] | | | ... | Test to check map-t address translation. -| | [Setup] | Set interfaces IP addresses and routes | | [Template] | Check MAP-T configuration with traffic script # |===================|===============|================|============|=============|==========|===========|================|==========| # | ipv4_pfx | ipv6_dst_pfx | ipv6_src_pfx | ea_bit_len | psid_offset | psid_len | ipv4_src | ipv4_dst | dst_port | @@ -122,4 +118,5 @@ | | [Teardown] | Run Keywords | | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND | | ... | Show packet trace on all DUTs | ${nodes} | AND -| | ... | Clear packet trace on all DUTs | ${nodes} +| | ... | Clear packet trace on all DUTs | ${nodes} | AND +| | ... | Check VPP PID in Teardown diff --git a/tests/func/tap/tap_interface.robot b/tests/func/tap/tap_interface.robot index 13a8e619fb..2acdad8d37 100644 --- a/tests/func/tap/tap_interface.robot +++ b/tests/func/tap/tap_interface.robot @@ -24,11 +24,10 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| Test Setup | Run Keywords | Func Test Setup | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} +| Test Teardown | Run Keywords | Func Test Teardown +| ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links | ... | between nodes. @@ -91,7 +90,8 @@ | | [Teardown] | Run Keywords | | ... | Linux Del Bridge | ${dut_node} | ${bid_TAP} | AND | | ... | Show Packet Trace on All DUTs | ${nodes} | AND -| | ... | Clean Up Namespaces | ${nodes['DUT1']} +| | ... | Clean Up Namespaces | ${nodes['DUT1']} | AND +| | ... | Check VPP PID in Teardown | | ... | | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} diff --git a/tests/func/telemetry/ipfix_ipv4.robot b/tests/func/telemetry/ipfix_ipv4.robot index 603708533d..1c85d1f8a4 100644 --- a/tests/func/telemetry/ipfix_ipv4.robot +++ b/tests/func/telemetry/ipfix_ipv4.robot @@ -23,12 +23,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-204) -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *IPFIX ipv4 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with diff --git a/tests/func/telemetry/ipfix_ipv6.robot b/tests/func/telemetry/ipfix_ipv6.robot index 46d2773cd3..b8310b2a13 100644 --- a/tests/func/telemetry/ipfix_ipv6.robot +++ b/tests/func/telemetry/ipfix_ipv6.robot @@ -24,12 +24,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-204) -| Suite Setup | Run Keywords | Setup all TGs before traffic script -| ... | AND | Update All Interface Data On All Nodes | ${nodes} -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Vpp Show Errors | ${nodes['DUT1']} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *IPFIX ipv6 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with diff --git a/tests/func/telemetry/span.robot b/tests/func/telemetry/span.robot index 3872401ef0..8a7af5f0d1 100644 --- a/tests/func/telemetry/span.robot +++ b/tests/func/telemetry/span.robot @@ -21,11 +21,8 @@ | Library | resources.libraries.python.telemetry.SPAN | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | EXPECTED_FAILING # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-185) -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keyword If Test Failed | Run Keywords -| ... | Show packet trace on all DUTs | ${nodes} | AND -| ... | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *SPAN test suite* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two | ... | links between nodes. diff --git a/tests/func/vlan/qinq_l2_xconnect.robot b/tests/func/vlan/qinq_l2_xconnect.robot index 35fdcde6ca..617447666a 100644 --- a/tests/func/vlan/qinq_l2_xconnect.robot +++ b/tests/func/vlan/qinq_l2_xconnect.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Setup all DUTs before test -| Suite Setup | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *L2 cross-connect with QinQ test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with diff --git a/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot b/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot index 0ff10cd328..ebde7bf1c1 100644 --- a/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot +++ b/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot @@ -19,10 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Setup all DUTs before test -| Suite Setup | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *L2 bridge domain with VLAN tag rewrite test cases - IPv4* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot b/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot index e3d2d39dd5..6e3c76c3b0 100644 --- a/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot +++ b/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot @@ -19,10 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Setup all DUTs before test -| Suite Setup | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *L2 bridge domain with VLAN tag rewrite test cases - IPv6* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot b/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot index d509318747..bfca6d8f4a 100644 --- a/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot +++ b/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Setup all DUTs before test -| Suite Setup | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *L2 cross-connect with VLAN tag rewrite test cases - IPv4* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot b/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot index 9557fb9d6b..7f61443349 100644 --- a/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot +++ b/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Setup all DUTs before test -| Suite Setup | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *L2 cross-connect with VLAN tag rewrite test cases - IPv6* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/func/vrf/vrf_tests.robot b/tests/func/vrf/vrf_tests.robot index 74696135b1..0339573956 100644 --- a/tests/func/vrf/vrf_tests.robot +++ b/tests/func/vrf/vrf_tests.robot @@ -22,9 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Show Packet Trace on All DUTs | ${nodes} +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Vpn routed forwarding - baseline IPv4* | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two | ... | links in between nodes. diff --git a/tests/func/vrf/vrf_tests_v6.robot b/tests/func/vrf/vrf_tests_v6.robot index 6756c34837..b88b6fd577 100644 --- a/tests/func/vrf/vrf_tests_v6.robot +++ b/tests/func/vrf/vrf_tests_v6.robot @@ -22,10 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *Vpn routed forwarding - baseline IPv6* | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two | ... | links in between nodes. diff --git a/tests/func/vxlan/vxlan_bd_dot1q.robot b/tests/func/vxlan/vxlan_bd_dot1q.robot index 425017ea67..9da1e3c38f 100644 --- a/tests/func/vxlan/vxlan_bd_dot1q.robot +++ b/tests/func/vxlan/vxlan_bd_dot1q.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *RFC7348 VXLAN: Bridge-domain with VXLAN over VLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology with diff --git a/tests/func/vxlan/vxlan_bd_untagged.robot b/tests/func/vxlan/vxlan_bd_untagged.robot index f579f11d57..0bbe30c1a5 100644 --- a/tests/func/vxlan/vxlan_bd_untagged.robot +++ b/tests/func/vxlan/vxlan_bd_untagged.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *RFC7348 VXLAN: Bridge-domain with VXLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/func/vxlan/vxlan_xconnect_untagged.robot b/tests/func/vxlan/vxlan_xconnect_untagged.robot index 32e8c9f478..de38c56b2d 100644 --- a/tests/func/vxlan/vxlan_xconnect_untagged.robot +++ b/tests/func/vxlan/vxlan_xconnect_untagged.robot @@ -18,10 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Setup | Func Test Setup +| Test Teardown | Func Test Teardown | Documentation | *RFC7348 VXLAN: L2 cross-connect with VXLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology |