From fe29ca4b7e6c412c69f1c56404513a33236aa617 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 22 Feb 2017 09:06:27 +0100 Subject: CSIT-530: Add common setup and teardown to perf tests Change-Id: I2e76de710b4b758eac1d24d447a9c5938f937385 Signed-off-by: Tibor Frank --- ...eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot | 52 ++++++++++++---------- 1 file changed, 29 insertions(+), 23 deletions(-) (limited to 'tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot') diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot index 9a17a8d153..3fc4444cb5 100644 --- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot +++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 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: @@ -14,23 +14,20 @@ *** Settings *** | Resource | resources/libraries/robot/performance.robot | Library | resources.libraries.python.QemuUtils +| ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC -| ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE | VHOST | VM +| ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE | VHOST | VM +| ... | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-XL710 | Suite Teardown | 3-node Performance Suite Teardown -| Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords -| ... | Run Keyword If Test Failed -| ... | Traffic should pass with no loss | 10 -| ... | ${min_rate}pps | ${framesize} | 3-node-bridge -| ... | fail_on_loss=${False} -| ... | AND | Show Vpp Vhost On All DUTs -| ... | AND | Remove startup configuration of VPP from all DUTs -| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut1} -| ... | ${dut1_vm_refs} -| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut2} -| ... | ${dut2_vm_refs} +| ... +| Test Setup | Performance test setup +| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| ... | ${min_rate}pps | ${framesize} | 3-node-bridge +| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} +| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} +| ... | Documentation | *RFC2544: Packet throughput L2BD test cases with vhost* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -134,7 +131,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -200,7 +198,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -267,7 +266,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -333,7 +333,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -399,7 +400,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -467,7 +469,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -533,7 +536,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -599,7 +603,8 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} | tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc | | [Documentation] @@ -667,4 +672,5 @@ | | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate} -| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type} +| | ... | ${threshold} | ${perf_pdr_loss_acceptance} +| | ... | ${perf_pdr_loss_acceptance_type} -- cgit 1.2.3-korg