X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=f7cd96aa30a09a80a03008876d4d5094aa3ef5ac;hb=839c9c1a64524fe236ff435e6fbd3fe29eb97603;hp=b7516ba477de5c23a6346eab2012ed081152033a;hpb=359b07cc72476a29da235f47f05fb539cd339b42;p=csit.git diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot index b7516ba477..f7cd96aa30 100644 --- a/resources/libraries/robot/performance.robot +++ b/resources/libraries/robot/performance.robot @@ -78,7 +78,7 @@ | | ... | | Set Suite Variable | ${glob_loss_acceptance} | 0.5 | | Set Suite Variable | ${glob_loss_acceptance_type} | percentage -| | Set Suite Variable | ${glob_vm_image} | /var/lib/vm/csit-nested-1.3.img +| | Set Suite Variable | ${glob_vm_image} | /var/lib/vm/csit-nested-1.4.img | 2-node circular Topology Variables Setup | | [Documentation] @@ -676,11 +676,11 @@ | | ... | | ... | \| 2-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \| | | [Arguments] | ${topology_type} | ${nic_model} -| | Setup default startup configuration of VPP on all DUTs | | Show vpp version on all DUTs | | Setup performance global Variables | | 2-node circular Topology Variables Setup with DUT interface model | | ... | ${nic_model} +| | Setup default startup configuration of VPP on all DUTs | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | | ... | ${dut1} | ${dut1_if2} @@ -701,11 +701,11 @@ | | ... | | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \| | | [Arguments] | ${topology_type} | ${nic_model} -| | Setup default startup configuration of VPP on all DUTs | | Show vpp version on all DUTs | | Setup performance global Variables | | 3-node circular Topology Variables Setup with DUT interface model | | ... | ${nic_model} +| | Setup default startup configuration of VPP on all DUTs | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | | ... | ${dut2} | ${dut2_if2} @@ -1192,7 +1192,6 @@ | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | 3 | 3 | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Huge Allocate | | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image} | | ${vm}= | Run keyword | ${vm_name}.Qemu Start | | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7 @@ -1234,9 +1233,7 @@ | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | 3 | 3 | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Huge Allocate -| | Run keyword | ${vm_name}.Qemu Set Disk Image -| | ... | /var/lib/vm/csit-nested-1.3.img +| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image} | | ${vm}= | Run keyword | ${vm_name}.Qemu Start | | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7 | | Dpdk Testpmd Start | ${vm} | eal_coremask=0x7 @@ -1272,7 +1269,6 @@ | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | 3 | 3 | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Huge Allocate | | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image} | | ${vm}= | Run keyword | ${vm_name}.Qemu Start | | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7