diff options
Diffstat (limited to 'resources/libraries/robot/shared')
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 10 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/vm.robot | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 51ce513078..cf6b599a29 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -70,6 +70,9 @@ | Resource | resources/libraries/robot/shared/traffic.robot | Resource | resources/libraries/robot/shared/vm.robot +*** Variables *** +| ${cpu_alloc_str}= | ${0} + *** Keywords *** | Configure crypto device on all DUTs | | [Documentation] | Verify if Crypto QAT device virtual functions are @@ -217,12 +220,15 @@ | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C | | END +| | ${cpu_alloc_str}= | Catenate | SEPARATOR=, | ${cpu_alloc_str} | ${cpu_main} +| | ${cpu_alloc_str}= | Catenate | SEPARATOR=, | ${cpu_alloc_str} | ${cpu_wt} | | Set Test Variable | ${smt_used} -| | Set Test Variable | ${thr_count_int} +| | Set Test Variable | ${cpu_alloc_str} | | Set Test Variable | ${cpu_count_int} -| | Set Test Variable | ${rxq_count_int} +| | Set Test Variable | ${thr_count_int} | | Set Test Variable | ${rxd_count_int} | | Set Test Variable | ${txd_count_int} +| | Set Test Variable | ${rxq_count_int} | Add DPDK VLAN strip offload switch off between DUTs | | [Documentation] diff --git a/resources/libraries/robot/shared/vm.robot b/resources/libraries/robot/shared/vm.robot index 2f15853779..c33ca5fea9 100644 --- a/resources/libraries/robot/shared/vm.robot +++ b/resources/libraries/robot/shared/vm.robot @@ -54,7 +54,9 @@ | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${nf_dtc} | nf_dtcr=${nf_dtcr} | | ... | rxq_count_int=${rxq_count_int} | enable_csum=${False} | | ... | enable_gso=${False} -| | Run Keyword | vnf_manager.Start All VMs | pinning=${pinning} +| | ${cpu_wt}= | Run Keyword | vnf_manager.Start All VMs | pinning=${pinning} +| | ${cpu_alloc_str}= | Catenate | SEPARATOR=, | ${cpu_alloc_str} | ${cpu_wt} +| | Set Test Variable | ${cpu_alloc_str} | | All VPP Interfaces Ready Wait | ${nodes} | retries=${300} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual @@ -100,7 +102,9 @@ | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${nf_dtc} | nf_dtcr=${nf_dtcr} | | ... | rxq_count_int=${rxq_count_int} | enable_csum=${False} | | ... | enable_gso=${False} -| | Run Keyword | vnf_manager.Start All VMs | pinning=${pinning} +| | ${cpu_wt}= | Run Keyword | vnf_manager.Start All VMs | pinning=${pinning} +| | ${cpu_alloc_str}= | Catenate | SEPARATOR=, | ${cpu_alloc_str} | ${cpu_wt} +| | Set Test Variable | ${cpu_alloc_str} | | All VPP Interfaces Ready Wait | ${nodes} | retries=${300} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual @@ -142,4 +146,6 @@ | | ... | rxq_count_int=${rxq_count_int} | enable_csum=${False} | | ... | enable_gso=${False} | | ... | if1=${DUT1_${int}1}[0] | if2=${DUT1_${int}2}[0] -| | Run Keyword | vnf_manager.Start All VMs | pinning=${pinning} +| | ${cpu_wt}= | Run Keyword | vnf_manager.Start All VMs | pinning=${pinning} +| | ${cpu_alloc_str}= | Catenate | SEPARATOR=, | ${cpu_alloc_str} | ${cpu_wt} +| | Set Test Variable | ${cpu_alloc_str} |