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 --- ...0-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot | 135 --------------------- 1 file changed, 135 deletions(-) delete mode 100644 tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot (limited to 'tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot') diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot deleted file mode 100644 index 53b7ee4a0f..0000000000 --- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-mrr.robot +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright (c) 2018 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -*** Settings *** -| Resource | resources/libraries/robot/performance/performance_setup.robot -| ... -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL -| ... | IACL | ACL10 | 10k_FLOWS -| ... -| Suite Setup | Run Keywords -| ... | Set up 3-node performance topology with DUT's NIC model | L3 -| ... | Intel-X520-DA2 -| ... | AND | Set up performance test suite with ACL -| Suite Teardown | Tear down 3-node performance topology -| ... -| Test Setup | Set up performance test -| ... -| Test Teardown | Tear down mrr test with ACL -| ... -| Test Template | Local Template -| ... -| Documentation | *Raw results IPv4 test cases with ACL* -| ... -| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ -| ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing. -| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\ -| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\ -| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\ -| ... | with 2p10GE NIC X520 Niantic by Intel. -| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\ -| ... | at line rate and reports total received/sent packets over trial period.\ -| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\ -| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}\ -| ... | flows per flow-group) with all packets containing Ethernet header, IPv4\ -| ... | header with IP protocol=61 and static payload. MAC addresses are\ -| ... | matching MAC addresses of the TG node interfaces. -| ... | *[Ref] Applicable standard specifications:* RFC2544. - -*** Variables *** -# X520-DA2 bandwidth limit -| ${s_limit}= | ${10000000000} - -# ACL test setup -| ${acl_action}= | permit+reflect -| ${acl_apply_type}= | input -| ${no_hit_aces_number}= | 10 -| ${flows_per_dir}= | 10k - -# starting points for non-hitting ACLs -| ${src_ip_start}= | 30.30.30.1 -| ${dst_ip_start}= | 40.40.40.1 -| ${ip_step}= | ${1} -| ${sport_start}= | ${1000} -| ${dport_start}= | ${1000} -| ${port_step}= | ${1} -| ${trex_stream1_subnet}= | 10.10.10.0/24 -| ${trex_stream2_subnet}= | 20.20.20.0/24 - -| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc - -*** Keywords *** -| Local Template -| | [Documentation] | FIXME. -| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} -| | ... -| | 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} -| | And Apply startup configuration on all VPP DUTs -| | ${ip_nr}= | Set Variable | 10 -| | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology -| | Then Traffic should pass with maximum rate -| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} - -*** Test Cases *** -| tc01-64B-1c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 64B | 1C -| | framesize=${64} | phy_cores=${1} - -| tc02-64B-2c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 64B | 2C -| | framesize=${64} | phy_cores=${2} - -| tc03-64B-4c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 64B | 4C -| | framesize=${64} | phy_cores=${4} - -| tc04-1518B-1c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 1518B | 1C -| | framesize=${1518} | phy_cores=${1} - -| tc05-1518B-2c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 1518B | 2C -| | framesize=${1518} | phy_cores=${2} - -| tc06-1518B-4c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 1518B | 4C -| | framesize=${1518} | phy_cores=${4} - -| tc07-9000B-1c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 9000B | 1C -| | framesize=${9000} | phy_cores=${1} - -| tc08-9000B-2c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 9000B | 2C -| | framesize=${9000} | phy_cores=${2} - -| tc09-9000B-4c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | 9000B | 4C -| | framesize=${9000} | phy_cores=${4} - -| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | IMIX | 1C -| | framesize=IMIX_v4_1 | phy_cores=${1} - -| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | IMIX | 2C -| | framesize=IMIX_v4_1 | phy_cores=${2} - -| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sf-10kflows-mrr -| | [Tags] | IMIX | 4C -| | framesize=IMIX_v4_1 | phy_cores=${4} -- cgit