diff options
Diffstat (limited to 'resources/libraries/robot/shared/container.robot')
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 06ac1209e5..9f08e6b1d4 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) 2024 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: @@ -84,9 +84,9 @@ | | ... | ${nf_dtc} | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive -| | ${dut1_uuid_length} = | Get Length | ${DUT1_UUID} -| | ${root}= | Run Keyword If | ${dut1_uuid_length} -| | ... | Get Docker Mergeddir | ${nodes['DUT1']} | ${DUT1_UUID} +| | ${in_container}= | Running in Container | ${nodes['${dut}']} +| | ${root}= | Run Keyword If | ${in_container} +| | ... | Get Docker Mergeddir | ${nodes['${dut}']} | | ... | ELSE | Set Variable | ${EMPTY} | | ${node_arch}= | Get Node Arch | ${nodes['${dut}']} | | ${name}= | Set Variable | ${dut}_${container_group}${nf_id}${DUT1_UUID} @@ -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} @@ -240,6 +240,10 @@ | | ... | ${container_chain_topology} | | ... | dut1_if=${DUT1_${int}2}[0] | | ... | dut2_if=${DUT2_${int}2}[0] +| | ... | ELSE IF | '${container_chain_topology}' == 'chain_dma' +| | ... | ${group}.Configure VPP In All Containers +| | ... | ${container_chain_topology} +| | ... | dma_wqs=${DUT1_dma_wqs} | | ... | ELSE | | ... | ${group}.Configure VPP In All Containers | | ... | ${container_chain_topology} @@ -325,14 +329,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} |