From 5aa03bac1ea4fe07f59c6b294b23fce94a0a805b Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 24 Jun 2016 16:38:03 +0100 Subject: [PATCH] CSIT-180 Add VPP api trace dump after each TC - Add VPP api trace dump after each TC Change-Id: I7c8bc0ffbca620f6fdb48369014a2ca9ffa3b3e4 Signed-off-by: pmikus --- resources/libraries/python/DUTSetup.py | 20 ++++++++++++++++++++ resources/libraries/robot/default.robot | 7 +++++++ resources/templates/vat/api_trace_dump.vat | 1 + resources/templates/vat/api_trace_save.vat | 1 + .../bridge_domain/bridge_domain_untagged.robot | 7 ++++++- tests/suites/cop/cop_whitelist_blacklist.robot | 10 +++++----- tests/suites/cop/cop_whitelist_blacklist_IPv6.robot | 10 +++++----- tests/suites/dhcp/dhcp_client.robot | 5 +++-- .../suites/fds_related_tests/provider_network.robot | 7 +++++-- tests/suites/fds_related_tests/tenant_network.robot | 7 +++++-- tests/suites/gre/gre_encapsulation.robot | 3 ++- tests/suites/ipv4/ipv4_arp_untagged.robot | 3 ++- tests/suites/ipv4/ipv4_iacl_untagged.robot | 1 + tests/suites/ipv4/ipv4_untagged.robot | 1 + tests/suites/ipv6/ipv6_iacl_untagged.robot | 4 +++- tests/suites/ipv6/ipv6_ra.robot | 3 ++- tests/suites/ipv6/ipv6_untagged.robot | 1 + tests/suites/l2_xconnect/l2_xconnect_untagged.robot | 4 ++++ tests/suites/lisp/lisp_api_untagged.robot | 3 ++- tests/suites/lisp/lisp_dataplane_untagged.robot | 3 ++- .../Long_Bridge_Domain_Intel-X520-DA2.robot | 3 ++- .../performance/Long_IPv4_Cop_Intel-X520-DA2.robot | 3 ++- .../performance/Long_IPv4_Intel-X520-DA2.robot | 3 ++- .../performance/Long_IPv4_iAcl_Intel-X520-DA2.robot | 3 ++- .../performance/Long_IPv6_Cop_Intel-X520-DA2.robot | 3 ++- .../performance/Long_IPv6_Intel-X520-DA2.robot | 3 ++- .../Long_Xconnect_Dot1q_Intel-X520-DA2.robot | 3 ++- .../performance/Long_Xconnect_Intel-X520-DA2.robot | 3 ++- .../Short_Bridge_Domain_Intel-X520-DA2.robot | 5 +++-- .../performance/Short_IPv4_Cop_Intel-X520-DA2.robot | 3 ++- .../performance/Short_IPv4_Intel-X520-DA2.robot | 3 ++- .../performance/Short_IPv4_iAcl_Intel-X520-DA2.robot | 3 ++- .../performance/Short_IPv6_Cop_Intel-X520-DA2.robot | 3 ++- .../performance/Short_IPv6_Intel-X520-DA2.robot | 3 ++- .../Short_Xconnect_Dot1q_Intel-X520-DA2.robot | 3 ++- .../performance/Short_Xconnect_Intel-X520-DA2.robot | 3 ++- tests/suites/tagging/qinq_l2_xconnect.robot | 3 ++- tests/suites/vxlan/vxlan_bd_dot1q.robot | 3 ++- tests/suites/vxlan/vxlan_bd_untagged.robot | 3 ++- tests/suites/vxlan/vxlan_xconnect_untagged.robot | 3 ++- 40 files changed, 119 insertions(+), 44 deletions(-) create mode 100644 resources/templates/vat/api_trace_dump.vat create mode 100644 resources/templates/vat/api_trace_save.vat diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 4731063fba..e2d183fe4e 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -45,6 +45,26 @@ class DUTSetup(object): vat = VatExecutor() vat.execute_script("show_version_verbose.vat", node, json_out=False) + @staticmethod + def vpp_api_trace_save(node): + """Run "api trace save" CLI command. + + :param node: Node to run command on. + :type node: dict + """ + vat = VatExecutor() + vat.execute_script("api_trace_save.vat", node, json_out=False) + + @staticmethod + def vpp_api_trace_dump(node): + """Run "api trace custom-dump" CLI command. + + :param node: Node to run command on. + :type node: dict + """ + vat = VatExecutor() + vat.execute_script("api_trace_dump.vat", node, json_out=False) + @staticmethod def setup_all_duts(nodes): """Prepare all DUTs in given topology for test execution.""" diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot index 2b116f5a7a..81f991bb83 100644 --- a/resources/libraries/robot/default.robot +++ b/resources/libraries/robot/default.robot @@ -34,6 +34,13 @@ | | :FOR | ${dut} | IN | @{duts} | | | Vpp show version verbose | ${nodes['${dut}']} +| Show vpp trace dump on all DUTs +| | [Documentation] | Save API trace and dump output on all DUTs +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Vpp api trace save | ${nodes['${dut}']} +| | | Vpp api trace dump | ${nodes['${dut}']} + | Add '${m}' worker threads and rxqueues '${n}' without HTT to all DUTs | | [Documentation] | Setup M worker threads without HTT and rxqueues N in | | ... | startup configuration of VPP to all DUTs diff --git a/resources/templates/vat/api_trace_dump.vat b/resources/templates/vat/api_trace_dump.vat new file mode 100644 index 0000000000..a0f94a34ed --- /dev/null +++ b/resources/templates/vat/api_trace_dump.vat @@ -0,0 +1 @@ +exec api trace custom-dump /tmp/csit.api diff --git a/resources/templates/vat/api_trace_save.vat b/resources/templates/vat/api_trace_save.vat new file mode 100644 index 0000000000..f3d2fa3780 --- /dev/null +++ b/resources/templates/vat/api_trace_save.vat @@ -0,0 +1 @@ +exec api trace save csit.api diff --git a/tests/suites/bridge_domain/bridge_domain_untagged.robot b/tests/suites/bridge_domain/bridge_domain_untagged.robot index 8df8713581..1876d901bb 100644 --- a/tests/suites/bridge_domain/bridge_domain_untagged.robot +++ b/tests/suites/bridge_domain/bridge_domain_untagged.robot @@ -20,7 +20,8 @@ | Force Tags | HW_ENV | VM_ENV | 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 Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -221,6 +222,7 @@ | | 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} | TC07: DUT with two L2BDs (MAC learn) switches ICMPv6 between TG and VM links @@ -253,6 +255,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 | Show vpp trace dump on all DUTs | | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} | TC08: DUT with two L2BDs (static MACs) switches ICMPv4 between TG and VM links @@ -307,6 +310,7 @@ | | 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} | TC09: DUT with two L2BDs (static MACs) switches ICMPv6 between TG and VM links @@ -361,4 +365,5 @@ | | 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/suites/cop/cop_whitelist_blacklist.robot b/tests/suites/cop/cop_whitelist_blacklist.robot index c83b5e109b..c84387d349 100644 --- a/tests/suites/cop/cop_whitelist_blacklist.robot +++ b/tests/suites/cop/cop_whitelist_blacklist.robot @@ -22,11 +22,11 @@ | 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 -| 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 | Clear interface counters on all vpp nodes in topology | ${nodes} -| Test Teardown | Show packet trace on all DUTs | ${nodes} +| 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 | Documentation | *COP Security IPv4 Blacklist and Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot b/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot index 054e376789..3fb9428680 100644 --- a/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot +++ b/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot @@ -22,11 +22,11 @@ | 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 -| 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 | Clear interface counters on all vpp nodes in topology | ${nodes} -| Test Teardown | Show packet trace on all DUTs | ${nodes} +| 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 | Documentation | *COP Security IPv6 Blacklist and Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/dhcp/dhcp_client.robot b/tests/suites/dhcp/dhcp_client.robot index bf019320ad..eb34544d0b 100644 --- a/tests/suites/dhcp/dhcp_client.robot +++ b/tests/suites/dhcp/dhcp_client.robot @@ -20,7 +20,8 @@ | 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 Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *DHCP Client related test cases* *** Variables *** @@ -114,4 +115,4 @@ | | And Run Keyword And Expect Error | ICMP echo Rx timeout | | ... | Node replies to ICMP echo request | ${tg_node} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} -| | ... | ${client_ip} | ${server_ip} \ No newline at end of file +| | ... | ${client_ip} | ${server_ip} diff --git a/tests/suites/fds_related_tests/provider_network.robot b/tests/suites/fds_related_tests/provider_network.robot index 5379204d4f..bda5525885 100644 --- a/tests/suites/fds_related_tests/provider_network.robot +++ b/tests/suites/fds_related_tests/provider_network.robot @@ -23,8 +23,11 @@ | 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 | Qemu Teardown | ${dut1_node} | ${qemu_node1} | qemu_node1 -| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} | qemu_node2 +| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Qemu Teardown | ${dut1_node} | ${qemu_node1} +| ... | qemu_node1 +| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} +| ... | qemu_node2 | Documentation | *Provider network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG diff --git a/tests/suites/fds_related_tests/tenant_network.robot b/tests/suites/fds_related_tests/tenant_network.robot index 5751a3c046..e57b374583 100644 --- a/tests/suites/fds_related_tests/tenant_network.robot +++ b/tests/suites/fds_related_tests/tenant_network.robot @@ -23,8 +23,11 @@ | 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 | Qemu Teardown | ${dut1_node} | ${qemu_node1} | qemu_node1 -| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} | qemu_node2 +| ... | AND | Show vpp trace dump on all DUTs +| ... | AND | Qemu Teardown | ${dut1_node} | ${qemu_node1} +| ... | qemu_node1 +| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} +| ... | qemu_node2 | Documentation | *Tenant network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG diff --git a/tests/suites/gre/gre_encapsulation.robot b/tests/suites/gre/gre_encapsulation.robot index 2da767bd83..17b3fffff2 100644 --- a/tests/suites/gre/gre_encapsulation.robot +++ b/tests/suites/gre/gre_encapsulation.robot @@ -22,7 +22,8 @@ | Force Tags | VM_ENV | HW_ENV | 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 Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *GREoIPv4 test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links diff --git a/tests/suites/ipv4/ipv4_arp_untagged.robot b/tests/suites/ipv4/ipv4_arp_untagged.robot index 099cd64020..f92d9713d5 100644 --- a/tests/suites/ipv4/ipv4_arp_untagged.robot +++ b/tests/suites/ipv4/ipv4_arp_untagged.robot @@ -25,7 +25,8 @@ | 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 | Show packet trace on all DUTs | ${nodes} +| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *IPv4 ARP test cases* | ... | ... | RFC826 ARP: Eth-IPv4 and Eth-ARP on links TG-DUT1, TG-DUT2, DUT1-DUT2: diff --git a/tests/suites/ipv4/ipv4_iacl_untagged.robot b/tests/suites/ipv4/ipv4_iacl_untagged.robot index 57ffe8ac2d..5421db7315 100644 --- a/tests/suites/ipv4/ipv4_iacl_untagged.robot +++ b/tests/suites/ipv4/ipv4_iacl_untagged.robot @@ -29,6 +29,7 @@ | 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 | Documentation | *IPv4 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv4 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv4 diff --git a/tests/suites/ipv4/ipv4_untagged.robot b/tests/suites/ipv4/ipv4_untagged.robot index e19cc02388..3b6716d858 100644 --- a/tests/suites/ipv4/ipv4_untagged.robot +++ b/tests/suites/ipv4/ipv4_untagged.robot @@ -24,6 +24,7 @@ | ... | AND | Setup DUT nodes for IPv4 testing | Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes} | Test Teardown | Run Keyword If Test Failed | Show packet trace on all DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *IPv4 routing test cases* | ... | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4 diff --git a/tests/suites/ipv6/ipv6_iacl_untagged.robot b/tests/suites/ipv6/ipv6_iacl_untagged.robot index e8b363373d..db814b221b 100644 --- a/tests/suites/ipv6/ipv6_iacl_untagged.robot +++ b/tests/suites/ipv6/ipv6_iacl_untagged.robot @@ -23,11 +23,13 @@ | 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 +| 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 | Documentation | *IPv6 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv6 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv6 diff --git a/tests/suites/ipv6/ipv6_ra.robot b/tests/suites/ipv6/ipv6_ra.robot index f5272011d3..cf6d09ef8e 100644 --- a/tests/suites/ipv6/ipv6_ra.robot +++ b/tests/suites/ipv6/ipv6_ra.robot @@ -26,7 +26,8 @@ | 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 | Show packet trace on all DUTs | ${nodes} +| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *IPv6 Router Advertisement test cases* | ... | ... | RFC4861 Neighbor Discovery. Encapsulations: Eth-IPv6-RA on links diff --git a/tests/suites/ipv6/ipv6_untagged.robot b/tests/suites/ipv6/ipv6_untagged.robot index adc74ae88f..8557182a5f 100644 --- a/tests/suites/ipv6/ipv6_untagged.robot +++ b/tests/suites/ipv6/ipv6_untagged.robot @@ -25,6 +25,7 @@ | ... | AND | Setup all TGs before traffic script | Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes} | Test Teardown | Run Keyword If Test Failed | Show packet trace on all DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *IPv6 routing test cases* | ... | ... | RFC2460 IPv6, RFC4443 ICMPv6, RFC4861 Neighbor Discovery. diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot index f800083f0c..05da05308d 100644 --- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot +++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot @@ -63,6 +63,7 @@ | | 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] @@ -82,6 +83,7 @@ | | 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] @@ -106,6 +108,7 @@ | | ... | ${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 | TC04: DUT with two L2XCs switches ICMPv6 between TG and local VM links | | [Documentation] @@ -130,4 +133,5 @@ | | ... | ${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 diff --git a/tests/suites/lisp/lisp_api_untagged.robot b/tests/suites/lisp/lisp_api_untagged.robot index ba4951f805..21ccc68858 100644 --- a/tests/suites/lisp/lisp_api_untagged.robot +++ b/tests/suites/lisp/lisp_api_untagged.robot @@ -26,7 +26,8 @@ | 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 | Show Packet Trace on All DUTs | ${nodes} +| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *LISP API test cases* | ... | ... | *[Top] Network Topologies:* DUT1 1-node topology. diff --git a/tests/suites/lisp/lisp_dataplane_untagged.robot b/tests/suites/lisp/lisp_dataplane_untagged.robot index 9cb60cba53..47c7cf87be 100644 --- a/tests/suites/lisp/lisp_dataplane_untagged.robot +++ b/tests/suites/lisp/lisp_dataplane_untagged.robot @@ -28,7 +28,8 @@ | 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 | Show Packet Trace on All DUTs | ${nodes} +| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *LISP static remote mapping test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot index 106a7a7d17..257694055f 100644 --- a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot @@ -20,7 +20,8 @@ | ... | L2 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput L2BD test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot index 47a22fd686..0920e543ad 100644 --- a/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot @@ -22,7 +22,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput IPv4 whitelist test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot index 16e1797a82..9267591635 100644 --- a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot @@ -24,7 +24,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot index 96dc17281d..cc31d4a41c 100644 --- a/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot @@ -22,7 +22,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput IPv4 iAcl whitelist test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot index 40e3291721..e19fe619e6 100644 --- a/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot @@ -20,7 +20,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput IPv6 whitelist test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot index 4d06528b30..4f6804acd1 100644 --- a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot @@ -19,7 +19,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot index 23339d6031..021e12695b 100644 --- a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot @@ -20,7 +20,8 @@ | ... | L2 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput L2XC test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot index b01b5ef93d..490641ba24 100644 --- a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot +++ b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot @@ -21,7 +21,8 @@ | ... | L2 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC2544: Pkt throughput L2XC test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot b/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot index b0aec9ba16..21e1451496 100644 --- a/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot @@ -20,7 +20,8 @@ | ... | L2 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput L2BD verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -46,7 +47,7 @@ | | ... | [Cfg] DUT runs L2BD config with 1 thread, 1 phy core, \ | | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte | | ... | frames using single trial throughput test. -| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR +| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | THIS | | ${framesize}= | Set Variable | 64 | | ${duration}= | Set Variable | 10 | | ${rate}= | Set Variable | 3.2mpps diff --git a/tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot index ff7bdcf1c0..45ded08b97 100644 --- a/tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot @@ -22,7 +22,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput IPv4 whitelist verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot index 10a2cf4b21..698197fef0 100644 --- a/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot @@ -24,7 +24,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput IPv4 routing verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot index 98eb7442da..0d95c9dcb8 100644 --- a/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot @@ -22,7 +22,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput IPv4 whitelist verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot index 17addec047..9e3c659a38 100644 --- a/tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot @@ -20,7 +20,8 @@ | ... | L3 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput IPv6 whitelist verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot index 4b79a3495d..febc25ed97 100644 --- a/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot @@ -20,7 +20,8 @@ | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput IPv6 routing verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot index 864962daa0..e5f7a60504 100644 --- a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot @@ -20,7 +20,8 @@ | ... | L2 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput L2XC verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot b/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot index 44a31f753f..8011e0bd56 100644 --- a/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot +++ b/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot @@ -21,7 +21,8 @@ | ... | L2 | Intel-X520-DA2 | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs +| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *Reference NDR throughput L2XC verify test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/tagging/qinq_l2_xconnect.robot b/tests/suites/tagging/qinq_l2_xconnect.robot index 37c0bf6b70..968f723d97 100644 --- a/tests/suites/tagging/qinq_l2_xconnect.robot +++ b/tests/suites/tagging/qinq_l2_xconnect.robot @@ -20,7 +20,8 @@ | 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 | Show Packet Trace on All DUTs | ${nodes} +| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *L2 cross-connect with QinQ test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with diff --git a/tests/suites/vxlan/vxlan_bd_dot1q.robot b/tests/suites/vxlan/vxlan_bd_dot1q.robot index d8253f2dec..425017ea67 100644 --- a/tests/suites/vxlan/vxlan_bd_dot1q.robot +++ b/tests/suites/vxlan/vxlan_bd_dot1q.robot @@ -20,7 +20,8 @@ | 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 | Show Packet Trace on All DUTs | ${nodes} +| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | 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/suites/vxlan/vxlan_bd_untagged.robot b/tests/suites/vxlan/vxlan_bd_untagged.robot index 7fd6caeea8..f579f11d57 100644 --- a/tests/suites/vxlan/vxlan_bd_untagged.robot +++ b/tests/suites/vxlan/vxlan_bd_untagged.robot @@ -20,7 +20,8 @@ | 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 | Show Packet Trace on All DUTs | ${nodes} +| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC7348 VXLAN: Bridge-domain with VXLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/suites/vxlan/vxlan_xconnect_untagged.robot b/tests/suites/vxlan/vxlan_xconnect_untagged.robot index 05a11db9c8..32e8c9f478 100644 --- a/tests/suites/vxlan/vxlan_xconnect_untagged.robot +++ b/tests/suites/vxlan/vxlan_xconnect_untagged.robot @@ -20,7 +20,8 @@ | 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 | Show Packet Trace on All DUTs | ${nodes} +| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} +| ... | AND | Show vpp trace dump on all DUTs | Documentation | *RFC7348 VXLAN: L2 cross-connect with VXLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology -- 2.16.6