aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot/shared/container.robot
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libraries/robot/shared/container.robot')
-rw-r--r--resources/libraries/robot/shared/container.robot68
1 files changed, 48 insertions, 20 deletions
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index c39e24cf3a..e1aba74ee1 100644
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -13,6 +13,10 @@
*** Settings ***
| Documentation | Keywords related to linux containers
+| ...
+| Library | Collections
+| Library | String
+| ...
| Library | resources.libraries.python.CpuUtils
| Library | resources.libraries.python.topology.Topology
@@ -21,29 +25,41 @@
| | [Documentation] | Construct 1 CNF of specific technology 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
-| | ... | - node_id: Node ID. Type: integer
+| | ... | - chains: Total number of chains (Optional). Type: integer, default
+| | ... | value: ${1}
+| | ... | - nodeness: 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}
+| | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per
+| | ... | SUT/DUT not required. Type: boolean, default value: ${True}
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Construct container on all DUTs \| 1 \| 1 \| 1 \| 1 \|
+| | ... | \| Construct container on all DUTs \| 1 \| 1 \| 1 \| 1 \| ${True} \|
| | ...
| | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${chain_id}=${1}
-| | ... | ${node_id}=${1}
+| | ... | ${node_id}=${1} | ${set_nf_cpus}=${True}
| | ...
| | ${duts}= | Get Matches | ${nodes} | DUT*
| | :FOR | ${dut} | IN | @{duts}
| | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive
-| | | ${mnt}= | Create List | /tmp:/mnt/host | /dev/vfio:/dev/vfio
-| | | ${nf_cpus}= | Create network function CPU list | ${dut}
+| | | ${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}
-| | | Run Keyword | ${container_group}.Construct container
-| | | ... | name=${dut}_${container_group}${chain_id}${node_id}
+| | | ... | 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}
| | | ... | node=${nodes['${dut}']} | mnt=${mnt} | env=${env}
-| | | ... | cpuset_cpus=${nf_cpus}
+| | | Run Keyword If | ${set_nf_cpus}
+| | | ... | Set To Dictionary | ${cont_args} | cpuset_cpus=${nf_cpus}
+| | | Run Keyword | ${container_group}.Construct container | &{cont_args}
| Construct chain of containers on all DUTs
| | [Documentation] | Construct 1 chain of 1..N CNFs on all DUT nodes.
@@ -52,33 +68,42 @@
| | ... | - chains: Total number of chains. Type: integer
| | ... | - nodeness: Total number of nodes per chain. Type: integer
| | ... | - chain_id: Chain ID. Type: integer
+| | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per
+| | ... | SUT/DUT not required. Type: boolean, default value: ${True}
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Construct chain of containers on all DUTs \| 1 \| 1 \| 1 \|
+| | ... | \| Construct chain of containers on all DUTs \| 1 \| 1 \| 1 \
+| | ... | \| ${True} \|
| | ...
-| | [Arguments] | ${chains} | ${nodeness} | ${chain_id}
+| | [Arguments] | ${chains} | ${nodeness} | ${chain_id} | ${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}
| 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. Type: integer
-| | ... | - nodeness: Total number of nodes per chain. Type: integer
+| | ... | - chains: Total number of chains (Optional). Type: integer, default
+| | ... | value: ${1}
+| | ... | - nodeness: Total number of nodes per chain (Optional). Type: integer,
+| | ... | default value: ${1}
+| | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per
+| | ... | SUT/DUT not required. Type: boolean, default value: ${True}
| | ...
| | ... | *Example:*
| | ...
| | ... | \| Construct chains of containers on all DUTs \| 1 \| 1 \|
| | ...
-| | [Arguments] | ${chains}=${1} | ${nodeness}=${1}
+| | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${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}
| Acquire all '${group}' containers
| | [Documentation] | Acquire all container(s) in specific container group on
@@ -108,10 +133,13 @@
| | [Documentation] | Configure VPP on all container(s) in specific container
| | ... | group on all DUT nodes.
| | ...
-| | ${dut2_if2} = | Get Variable Value | \${dut2_if2} | ${EMPTY}
-| | Run Keyword | ${group}.Configure VPP In All Containers
-| | ... | chain_topology=${container_chain_topology}
+| | ${dut1_if2} = | Get Variable Value | \${dut1_if2} | ${None}
+| | ${dut2_if2} = | Get Variable Value | \${dut2_if2} | ${None}
+| | Run Keyword If | '${container_chain_topology}' == 'cross_horiz'
+| | ... | ${group}.Configure VPP In All Containers | ${container_chain_topology}
| | ... | dut1_if=${dut1_if2} | dut2_if=${dut2_if2}
+| | ... | ELSE
+| | ... | ${group}.Configure VPP In All Containers | ${container_chain_topology}
| Stop all '${group}' containers
| | [Documentation] | Stop all container(s) in specific container group on all