X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fcontainer.robot;h=1d4c9a17b003cd1886cbc81c34047e181d8e8445;hp=9cd54e811c9a6f819bd8c518915508b48976d2d0;hb=9780b57a9640e9ab40e40ec122ac80e09cd74c79;hpb=5dc176ab31af5dff73be6dd5266169a7be19dd13 diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 9cd54e811c..1d4c9a17b0 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: @@ -211,8 +211,8 @@ | | Run Keyword If | '${container_chain_topology}' == 'chain_ip4' | | ... | ${group}.Configure VPP In All Containers | | ... | ${container_chain_topology} -| | ... | tg_pf1_mac=${TG_pf1_mac} -| | ... | tg_pf2_mac=${TG_pf2_mac} +| | ... | tg_pf1_mac=${TG_pf1_mac}[0] +| | ... | tg_pf2_mac=${TG_pf2_mac}[0] | | ... | nodes=${nf_nodes} | | ... | ELSE IF | '${container_chain_topology}' == 'chain_ipsec' | | ... | ${group}.Configure VPP In All Containers @@ -330,9 +330,10 @@ | | ${thr_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} +| | ${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(${thr_count_int}/${rxq_ratio}) | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | ... | Set variable | ${1} | | ... | ELSE | Set variable | ${rxq_count_int}