From 095b162010491a4759e05ca46f0e5a47e8ace141 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 22 Mar 2018 13:21:05 +0100 Subject: Optimize Qemu installation to speed up vhost tests Currently Qemu is being installed if there is a change of qsz parameter between tests/suites. Qemu is installed always into the same directory. This patch changes the default behavior to install qemu over and install pathced version to separate directory. It also disables force install. Change-Id: I0d7493a02b026a6ae4a5ea8bacf54656de9db567 Signed-off-by: Peter Mikus --- ...asemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot | 41 ++-------------------- 1 file changed, 3 insertions(+), 38 deletions(-) (limited to 'tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot') diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot index 211e6b566e..3fe47b1fe8 100644 --- a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot +++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdrdisc.robot @@ -42,7 +42,7 @@ | ... | vhost-user interfaces using 5 cores pinned to cpus 5-9 and 2048M | ... | memory. Testpmd is using socket-mem=1024M (512x2M hugepages), 5 cores | ... | (1 main core and 4 cores dedicated for io), forwarding mode is set to -| ... | io, rxd/txd=256, burst=64. DUT1, DUT2 are tested with 2p10GE NIC X520 +| ... | io, rxd/txd=1024, burst=64. DUT1, DUT2 are tested with 2p10GE NIC X520 | ... | Niantic by Intel. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop | ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop @@ -59,6 +59,7 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** +| ${perf_qemu_qsz}= | 1024 # X520-DA2 bandwidth limit | ${s_limit} | ${10000000000} | ${vxlan_overhead} | ${50} @@ -68,7 +69,7 @@ | ${sock1}= | /tmp/sock-1-${bd_id1} | ${sock2}= | /tmp/sock-1-${bd_id2} # Traffic profile: -| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254 +| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254 *** Test Cases *** | tc01-64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrdisc @@ -100,8 +101,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -135,8 +134,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -170,8 +167,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -204,8 +199,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -241,8 +234,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -277,8 +268,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -313,8 +302,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -348,8 +335,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -383,8 +368,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -417,8 +400,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -454,8 +435,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -490,8 +469,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -526,8 +503,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -561,8 +536,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -596,8 +569,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -630,8 +601,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -667,8 +636,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -703,8 +670,6 @@ | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} -| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} -| | ... | ${True} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} -- cgit 1.2.3-korg