X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fcontainer.robot;h=931508bdc96371d6590b394c6693497f15be11de;hb=4d870922e1dcf7c979b6806b1bf2ed1bca0cf24a;hp=06ac1209e5b0104bba54a3511b089495dc371c1a;hpb=fd70b6786c00f8a0f0021b517f0601154e0a0498;p=csit.git diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 06ac1209e5..931508bdc9 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -106,7 +106,7 @@ | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${nf_dtc} | nf_dtcr=${nf_dtcr} | | &{cont_args}= | Create Dictionary | | ... | name=${name} | node=${nodes['${dut}']} | mnt=${mnt} | env=${env} -| | ... | root=${root} +| | ... | root=${root} | page_size=${page_size} | | Run Keyword If | ${pinning} | | ... | Set To Dictionary | ${cont_args} | cpuset_cpus=${nf_cpus} | | Run Keyword | ${container_group}.Construct container | &{cont_args} @@ -325,14 +325,15 @@ | | Acquire all '${container_group}' containers | | Create all '${container_group}' containers | | ${cpu_count_int} | Convert to Integer | ${phy_cores} -| | ${thr_count_int} | Convert to Integer | ${phy_cores} +| | ${dp_count_int} | Convert to Integer | ${phy_cores} | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} -| | ${thr_count_int}= | Run keyword if | ${smt_used} +| | ${dp_count_int}= | Run keyword if | ${smt_used} | | ... | Evaluate | int(${cpu_count_int}*2) -| | ... | ELSE | Set variable | ${thr_count_int} -| | ${rxq_count_int}= | Run keyword if | ${rx_queues} +| | ... | ELSE | Set variable | ${dp_count_int} +| | ${rxq_ratio} = | Get Variable Value | \${rxq_ratio} | ${1} +| | ${rxq_count_int}= | Run Keyword If | ${rx_queues} | | ... | Set variable | ${rx_queues} -| | ... | ELSE | Evaluate | int(${thr_count_int}/2) +| | ... | ELSE | Evaluate | int(${dp_count_int}/${rxq_ratio}) | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | ... | Set variable | ${1} | | ... | ELSE | Set variable | ${rxq_count_int}