diff options
Diffstat (limited to 'resources/libraries/robot/shared')
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 66 |
1 files changed, 41 insertions, 25 deletions
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index e1aba74ee1..cbfbccc787 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -25,12 +25,15 @@ | | [Documentation] | Construct 1 CNF of specific technology on all DUT nodes. | | ... | | ... | *Arguments:* -| | ... | - chains: Total number of chains (Optional). Type: integer, default +| | ... | - nf_chains: Total number of chains (Optional). Type: integer, default | | ... | value: ${1} -| | ... | - nodeness: Total number of nodes per chain (Optional). Type: integer, +| | ... | - nf_nodes: Total number of nodes per chain (Optional). Type: integer, | | ... | default value: ${1} -| | ... | - chain_id: Chain ID (Optional). Type: integer, default value: ${1} -| | ... | - node_id: Node ID (Optional). Type: integer, default value: ${1} +| | ... | - nf_chain: Chain ID (Optional). Type: integer, default value: ${1} +| | ... | - nf_node: Node ID (Optional). Type: integer, default value: ${1} +| | ... | - auto_scale - If True, use same amount of Dataplane threads for +| | ... | network function as DUT, otherwise use single physical core for +| | ... | every network function. Type: boolean | | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per | | ... | SUT/DUT not required. Type: boolean, default value: ${True} | | ... @@ -38,24 +41,25 @@ | | ... | | ... | \| Construct container on all DUTs \| 1 \| 1 \| 1 \| 1 \| ${True} \| | | ... -| | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${chain_id}=${1} -| | ... | ${node_id}=${1} | ${set_nf_cpus}=${True} +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${nf_chain}=${1} +| | ... | ${nf_node}=${1} | ${auto_scale}=${True} | ${set_nf_cpus}=${True} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} +| | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} | | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive | | | ${tmp}= | Get Variable Value | ${tmp_volume} | /tmp | | | ${mnt}= | Create List | ${tmp}:/mnt/host | /dev/vfio:/dev/vfio | | | ${nf_cpus}= | Run Keyword If | ${set_nf_cpus} | | | ... | Create network function CPU list | ${dut} -| | | ... | chains=${chains} | nodeness=${nodeness} | chain_id=${chain_id} -| | | ... | node_id=${node_id} | auto_scale=${True} +| | | ... | chains=${nf_chains} | nodeness=${nf_nodes} | chain_id=${nf_chain} +| | | ... | node_id=${nf_node} | auto_scale=${auto_scale} | | | ... | ELSE | Set Variable | ${None} | | | ${uuid_str}= | Run Keyword If | '${tmp}' == '/tmp' | | | ... | Set Variable | ${EMPTY} | | | ... | ELSE | Remove String | ${tmp} | ${dut}_VOL | | | &{cont_args}= | Create Dictionary -| | | ... | name=${dut}_${container_group}${chain_id}${node_id}${uuid_str} +| | | ... | name=${dut}_${container_group}${nf_id}${uuid_str} | | | ... | node=${nodes['${dut}']} | mnt=${mnt} | env=${env} | | | Run Keyword If | ${set_nf_cpus} | | | ... | Set To Dictionary | ${cont_args} | cpuset_cpus=${nf_cpus} @@ -65,9 +69,12 @@ | | [Documentation] | Construct 1 chain of 1..N CNFs on all DUT nodes. | | ... | | ... | *Arguments:* -| | ... | - chains: Total number of chains. Type: integer -| | ... | - nodeness: Total number of nodes per chain. Type: integer -| | ... | - chain_id: Chain ID. Type: integer +| | ... | - nf_chains: Total number of chains. Type: integer +| | ... | - nf_nodes: Total number of nodes per chain. Type: integer +| | ... | - nf_chain: Chain ID. Type: integer +| | ... | - auto_scale - If True, use same amount of Dataplane threads for +| | ... | network function as DUT, otherwise use single physical core for +| | ... | every network function. Type: boolean | | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per | | ... | SUT/DUT not required. Type: boolean, default value: ${True} | | ... @@ -76,21 +83,25 @@ | | ... | \| Construct chain of containers on all DUTs \| 1 \| 1 \| 1 \ | | ... | \| ${True} \| | | ... -| | [Arguments] | ${chains} | ${nodeness} | ${chain_id} | ${set_nf_cpus}=${True} +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${nf_chain}=${1} +| | ... | ${auto_scale}=${True} | ${set_nf_cpus}=${True} | | ... -| | :FOR | ${node_id} | IN RANGE | 1 | ${nodeness}+1 -| | | Construct container on all DUTs | chains=${chains} | nodeness=${nodeness} -| | | ... | chain_id=${chain_id} | node_id=${node_id} -| | | ... | set_nf_cpus=${set_nf_cpus} +| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1 +| | | Construct container on all DUTs | nf_chains=${nf_chains} +| | | ... | nf_nodes=${nf_nodes} | nf_chain=${nf_chain} | nf_node=${nf_node} +| | | ... | auto_scale=${auto_scale} | set_nf_cpus=${set_nf_cpus} | Construct chains of containers on all DUTs | | [Documentation] | Construct 1..N chains of 1..N CNFs on all DUT nodes. | | ... | | ... | *Arguments:* -| | ... | - chains: Total number of chains (Optional). Type: integer, default +| | ... | - nf_chains: Total number of chains (Optional). Type: integer, default | | ... | value: ${1} -| | ... | - nodeness: Total number of nodes per chain (Optional). Type: integer, +| | ... | - nf_nodes: Total number of nodes per chain (Optional). Type: integer, | | ... | default value: ${1} +| | ... | - auto_scale - If True, use same amount of Dataplane threads for +| | ... | network function as DUT, otherwise use single physical core for +| | ... | every network function. Type: boolean | | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per | | ... | SUT/DUT not required. Type: boolean, default value: ${True} | | ... @@ -98,12 +109,13 @@ | | ... | | ... | \| Construct chains of containers on all DUTs \| 1 \| 1 \| | | ... -| | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${set_nf_cpus}=${True} +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} +| | ... | ${set_nf_cpus}=${True} | | ... -| | :FOR | ${chain_id} | IN RANGE | 1 | ${chains}+1 -| | | Construct chain of containers on all DUTs | chains=${chains} -| | | ... | nodeness=${nodeness} | chain_id=${chain_id} -| | | ... | set_nf_cpus=${set_nf_cpus} +| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 +| | | Construct chain of containers on all DUTs | nf_chains=${nf_chains} +| | | ... | nf_nodes=${nf_nodes} | nf_chain=${nf_chain} +| | | ... | auto_scale=${auto_scale} | set_nf_cpus=${set_nf_cpus} | Acquire all '${group}' containers | | [Documentation] | Acquire all container(s) in specific container group on @@ -135,7 +147,11 @@ | | ... | | ${dut1_if2} = | Get Variable Value | \${dut1_if2} | ${None} | | ${dut2_if2} = | Get Variable Value | \${dut2_if2} | ${None} -| | Run Keyword If | '${container_chain_topology}' == 'cross_horiz' +| | Run Keyword If | '${container_chain_topology}' == 'chain_ip4' +| | ... | ${group}.Configure VPP In All Containers | ${container_chain_topology} +| | ... | tg_if1_mac=${tg_if1_mac} | tg_if2_mac=${tg_if2_mac} +| | ... | nodes=${nf_nodes} +| | ... | ELSE IF | '${container_chain_topology}' == 'cross_horiz' | | ... | ${group}.Configure VPP In All Containers | ${container_chain_topology} | | ... | dut1_if=${dut1_if2} | dut2_if=${dut2_if2} | | ... | ELSE |