From 852b10b6724f0ae221e45f1ccb3f8020077b1f33 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 9 Jan 2019 13:15:09 +0000
Subject: CSIT-1389 Refactor current keywords for multichaining - CNF (II)

Change-Id: Ic6af8ebf59589bea66322fc87a33218c7dc0c132
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 resources/libraries/robot/shared/container.robot | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'resources/libraries/robot/shared/container.robot')

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.
-- 
cgit 1.2.3-korg