X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=196dc104962c7aacb9a6cc2d8482bbdf814202ee;hb=7cc1d28080ff1113ddb1f1e1fd494b2651a3199b;hp=be30d3706c0d9dfa096c07c9bf31ebeedd74d2ae;hpb=d55f31f5ee2f4a851b53205bb02b85ce84aa7f0d;p=csit.git

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index be30d3706c..196dc10496 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -129,9 +129,9 @@
 | | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']}
 | | | ... | ${${dut}_if2_vf0}
 | | | ${dut_eth_vf_if1}= | VPP Create AVF Interface | ${nodes['${dut}']}
-| | | ... | ${if1_pci}
+| | | ... | ${if1_pci} | ${rxq_count_int}
 | | | ${dut_eth_vf_if2}= | VPP Create AVF Interface | ${nodes['${dut}']}
-| | | ... | ${if2_pci}
+| | | ... | ${if2_pci} | ${rxq_count_int}
 | | | Set Test Variable | ${${dut}_if1} | ${dut_eth_vf_if1}
 | | | Set Test Variable | ${${dut}_if2} | ${dut_eth_vf_if2}
 | | Set interfaces in path up
@@ -2325,7 +2325,7 @@
 | | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True}
 | | ...
 | | ${nf_cpus_count}= | Get Length | ${nf_cpus}
-| | ${rxq}= | Run Keyword If | '${auto_scale}' == ${True}
+| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True}
 | | ... | Set Variable | ${rxq_count_int}
 | | ... | ELSE | Set Variable | ${1}
 | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id}
@@ -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
@@ -2471,7 +2472,7 @@
 | | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True}
 | | ...
 | | ${nf_cpus_count}= | Get Length | ${nf_cpus}
-| | ${rxq}= | Run Keyword If | '${auto_scale}' == ${True}
+| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True}
 | | ... | Set Variable | ${rxq_count_int}
 | | ... | ELSE | Set Variable | ${1}
 | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id}
@@ -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
@@ -3067,7 +3069,7 @@
 | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1}
 | | ... | ${auto_scale}=${True}
 | | ...
-| | ${rxq}= | Run Keyword If | '${auto_scale}' == ${True}
+| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True}
 | | ... | Set Variable | ${rxq_count_int}
 | | ... | ELSE | Set Variable | ${1}
 | | ${bd_id2}= | Evaluate | ${nf_nodes}+1
@@ -3157,7 +3159,7 @@
 | | ...
 | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True}
 | | ...
-| | ${rxq}= | Run Keyword If | '${auto_scale}' == ${True}
+| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True}
 | | ... | Set Variable | ${rxq_count_int}
 | | ... | ELSE | Set Variable | ${1}
 | | ${duts}= | Get Matches | ${nodes} | DUT*