diff options
author | Peter Mikus <pmikus@cisco.com> | 2019-01-09 13:15:09 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2019-01-10 07:13:11 +0000 |
commit | 852b10b6724f0ae221e45f1ccb3f8020077b1f33 (patch) | |
tree | beba124ec6ccb0ac08a6cf4564406d9f56cb8597 /resources/libraries/robot/shared | |
parent | 11be8edf29b2740825110d629a23ea0bbe8a50a8 (diff) |
CSIT-1389 Refactor current keywords for multichaining - CNF (II)
Change-Id: Ic6af8ebf59589bea66322fc87a33218c7dc0c132
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot/shared')
-rw-r--r-- | resources/libraries/robot/shared/container.robot | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index e4748dbf60..c39e24cf3a 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -33,9 +33,6 @@ | | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${chain_id}=${1} | | ... | ${node_id}=${1} | | ... -| | ${group}= | Set Variable | CNF -| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager -| | ... | engine=${container_engine} | WITH NAME | ${group} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive @@ -43,10 +40,10 @@ | | | ${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 | ${group}.Construct container -| | | ... | name=${dut}_${group}${chain_id}${node_id} | node=${nodes['${dut}']} -| | | ... | mnt=${mnt} | env=${env} | cpuset_cpus=${nf_cpus} -| | Append To List | ${container_groups} | ${group} +| | | Run Keyword | ${container_group}.Construct container +| | | ... | name=${dut}_${container_group}${chain_id}${node_id} +| | | ... | node=${nodes['${dut}']} | mnt=${mnt} | env=${env} +| | | ... | cpuset_cpus=${nf_cpus} | Construct chain of containers on all DUTs | | [Documentation] | Construct 1 chain of 1..N CNFs on all DUT nodes. |