From 7cc1d28080ff1113ddb1f1e1fd494b2651a3199b Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Wed, 6 Mar 2019 18:27:50 +0100 Subject: [PATCH] FIX: Workaround for qemu - replace qemu image by fresh backup copy Change-Id: I13fa2a7f0f4ca6c36f993352f44086ae6ca8be63 Signed-off-by: Jan Gelety --- .../libraries/robot/performance/performance_configuration.robot | 6 ++++-- resources/libraries/robot/vm/qemu.robot | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index cf287c2af6..196dc10496 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -2424,10 +2424,11 @@ | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} +| | | Copy nested qemu image | ${dut} | | | Configure guest VMs with dpdk-testpmd connected via vhost-user on node | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} -| | All VPP Interfaces Ready Wait | ${nodes} +| | All VPP Interfaces Ready Wait | ${nodes} | timeout=${90} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual | Configure guest VM with dpdk-testpmd-mac connected via vhost-user @@ -2576,10 +2577,11 @@ | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} +| | | Copy nested qemu image | ${dut} | | | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user on node | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} -| | All VPP Interfaces Ready Wait | ${nodes} +| | All VPP Interfaces Ready Wait | ${nodes} | timeout=${90} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual | Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user on node diff --git a/resources/libraries/robot/vm/qemu.robot b/resources/libraries/robot/vm/qemu.robot index 097f3cb1a8..276d639024 100644 --- a/resources/libraries/robot/vm/qemu.robot +++ b/resources/libraries/robot/vm/qemu.robot @@ -13,6 +13,7 @@ *** Settings *** | Library | resources.libraries.python.QemuUtils | Library | resources.libraries.python.ssh.SSH +| Library | resources.libraries.python.ssh *** Keywords *** @@ -97,3 +98,8 @@ | | :FOR | ${dut} | IN | @{duts} | | | Qemu Set Node | ${nodes['${dut}']} | | | Qemu Kill + +| Copy nested qemu image +| | [Arguments] | ${dut} +| | Exec Cmd | ${nodes['${dut}']} +| | ... | sudo cp ~/csit-nested-1.7.img /var/lib/vm/csit-nested-1.7.img -- 2.16.6