From 5e6145a4260ffce1c302e94b9b241851f90838e1 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 4 Apr 2019 13:45:11 +0200 Subject: Upgrade autogen to NICs and search types + All perf suites updated, as autogen change is backward incompatible. + Only x710 -ndrpdr suites remain in git repository. + Removed retry feature of run_tests. + Renamed topology_type and traffic_type to traffic_profile. + Renamed framesize to frame_size; nic_model to nic_name. + Reordered Variables table to start with nic_name and overhead. + Fixed wrong overhead value in some cbc-sha1 suites. + Fixed some suite tags. ++ Introduced tags to distinguish suites, such as IPSECINT. + Bound crypto hardware to NIC name. + Implemented NIC limit hiding. + Also search and teardown related arguments are now hidden. + Main measurement keywords updated to new arg handling. + Max rate related keywords moved to performance_limits.robot + Teardowns unified. + Generated tests are archived. ++ Generated directory is .gitignore-d. + Regenerator raises an exception on seeing non-compatible suite. ++ Relatively helpful message should be seen in exception. + Suite and template Documentation has generated parts. +- With short NIC names only. + Autogen checker also upgraded. + Tag expressions replaced with long files to ensure analogous tests. Change-Id: I60e9a999187e7da1f60d0eb4fb02afa14682aa46 Signed-off-by: Vratko Polak --- .../2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot | 58 ++++++++++------------ 1 file changed, 27 insertions(+), 31 deletions(-) (limited to 'tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot') diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot index 80e0e764fa..41a6a33730 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -18,12 +18,11 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | IP4BASE | ... | Suite Setup | Set up 2-node performance topology with DUT's NIC model -| ... | L3 | Intel-X710 +| ... | L3 | ${nic_name} | Suite Teardown | Tear down 2-node performance topology | ... | Test Setup | Set up performance test -| Test Teardown | Tear down performance discovery test | ${min_rate}pps -| ... | ${framesize} | ${traffic_profile} +| Test Teardown | Tear down performance test | ... | Test Template | Local Template | ... @@ -34,12 +33,12 @@ | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing. | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 | ... | routing and two static IPv4 /24 route entries. DUT1 tested with -| ... | 2p10GE NIC X710 by Intel. -| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop -| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop -| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage -| ... | of packets transmitted. NDR and PDR are discovered for different -| ... | Ethernet L2 frame sizes using MLRsearch library. +| ... | ${nic_name}.\ +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library.\ | ... | Test packets are generated by TG on links to DUTs. TG traffic profile | ... | contains two L3 flow-groups (flow-group per direction, 253 flows per | ... | flow-group) with all packets containing Ethernet header, IPv4 header @@ -48,8 +47,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** -# X710 bandwidth limit -| ${s_limit}= | ${10000000000} +| ${nic_name}= | Intel-X710 +| ${overhead}= | ${0} # Traffic profile: | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src253 @@ -61,70 +60,67 @@ | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ | | ... | | ... | *Arguments:* -| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1). | | ... | Type: integer, string | | ... | - phy_cores - Number of physical cores. Type: integer | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer | | ... -| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} | | ... -| | Set Test Variable | ${framesize} -| | Set Test Variable | ${min_rate} | ${10000} +| | Set Test Variable | \${frame_size} | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg -| | ... | ${s_limit} | ${framesize} +| | Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | When Initialize IPv4 forwarding in circular topology | | Then Find NDR and PDR intervals using optimized search -| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} *** Test Cases *** | tc01-64B-1c-ethip4-ip4base-ndrpdr | | [Tags] | 64B | 1C -| | framesize=${64} | phy_cores=${1} +| | frame_size=${64} | phy_cores=${1} | tc02-64B-2c-ethip4-ip4base-ndrpdr | | [Tags] | 64B | 2C -| | framesize=${64} | phy_cores=${2} +| | frame_size=${64} | phy_cores=${2} | tc03-64B-4c-ethip4-ip4base-ndrpdr | | [Tags] | 64B | 4C -| | framesize=${64} | phy_cores=${4} +| | frame_size=${64} | phy_cores=${4} | tc04-1518B-1c-ethip4-ip4base-ndrpdr | | [Tags] | 1518B | 1C -| | framesize=${1518} | phy_cores=${1} +| | frame_size=${1518} | phy_cores=${1} | tc05-1518B-2c-ethip4-ip4base-ndrpdr | | [Tags] | 1518B | 2C -| | framesize=${1518} | phy_cores=${2} +| | frame_size=${1518} | phy_cores=${2} | tc06-1518B-4c-ethip4-ip4base-ndrpdr | | [Tags] | 1518B | 4C -| | framesize=${1518} | phy_cores=${4} +| | frame_size=${1518} | phy_cores=${4} | tc07-9000B-1c-ethip4-ip4base-ndrpdr | | [Tags] | 9000B | 1C -| | framesize=${9000} | phy_cores=${1} +| | frame_size=${9000} | phy_cores=${1} | tc08-9000B-2c-ethip4-ip4base-ndrpdr | | [Tags] | 9000B | 2C -| | framesize=${9000} | phy_cores=${2} +| | frame_size=${9000} | phy_cores=${2} | tc09-9000B-4c-ethip4-ip4base-ndrpdr | | [Tags] | 9000B | 4C -| | framesize=${9000} | phy_cores=${4} +| | frame_size=${9000} | phy_cores=${4} | tc10-IMIX-1c-ethip4-ip4base-ndrpdr | | [Tags] | IMIX | 1C -| | framesize=IMIX_v4_1 | phy_cores=${1} +| | frame_size=IMIX_v4_1 | phy_cores=${1} | tc11-IMIX-2c-ethip4-ip4base-ndrpdr | | [Tags] | IMIX | 2C -| | framesize=IMIX_v4_1 | phy_cores=${2} +| | frame_size=IMIX_v4_1 | phy_cores=${2} | tc12-IMIX-4c-ethip4-ip4base-ndrpdr | | [Tags] | IMIX | 4C -| | framesize=IMIX_v4_1 | phy_cores=${4} +| | frame_size=IMIX_v4_1 | phy_cores=${4} -- cgit 1.2.3-korg