From 45aa8056fd26ea55e3e229c4d5b164a272a5b3c2 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 22 Jun 2017 13:24:22 +0200 Subject: Update of LXCUtil library Change-Id: I1a095e45960ca004413c4ecbfd410e41fb621c74 Signed-off-by: Peter Mikus --- resources/libraries/robot/lxc.robot | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'resources/libraries/robot/lxc.robot') diff --git a/resources/libraries/robot/lxc.robot b/resources/libraries/robot/lxc.robot index b4dd1d117d..83bd5c1837 100644 --- a/resources/libraries/robot/lxc.robot +++ b/resources/libraries/robot/lxc.robot @@ -36,7 +36,7 @@ | | Import Library | resources.libraries.python.LXCUtils | | ... | container_name=${lxc_name} | WITH NAME | ${lxc_name} | | Run keyword | ${lxc_name}.Set node | ${dut_node} -| | Run keyword | ${lxc_name}.Container create | force_create=${TRUE} +| | Run keyword | ${lxc_name}.Create container | force_create=${TRUE} | | Run keyword | ${lxc_name}.Mount host dir in container | Create LXC container on DUT node with cpuset @@ -63,10 +63,11 @@ | | ... | ${dut1_if1} | ${dut1_if2} | | ${lxc_cpus}= | CPU list per node str | ${dut_node} | ${dut_numa} | | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${False} +| | Set Suite Variable | ${lxc_cpus} | | Run keyword | ${lxc_name}.Set node | ${dut_node} -| | Run keyword | ${lxc_name}.Container create | force_create=${TRUE} +| | Run keyword | ${lxc_name}.Create container | force_create=${TRUE} | | Run keyword | ${lxc_name}.Mount host dir in container -| | Run keyword | ${lxc_name}.Container cpuset cpus | ${lxc_cpus} +| | Run keyword | ${lxc_name}.Container cpuset cpus | 0,${lxc_cpus} | Create '${nr}' LXC containers on '${dut}' node | | [Documentation] | Create and start multiple lxc containers on DUT node. @@ -136,7 +137,7 @@ | | Import Library | resources.libraries.python.LXCUtils | | ... | container_name=${lxc_name} | WITH NAME | ${lxc_name} | | Run keyword | ${lxc_name}.Set node | ${dut_node} -| | Run keyword | ${lxc_name}.Container destroy +| | Run keyword | ${lxc_name}.Destroy container | Destroy '${nr}' LXC containers on '${dut}' node | | [Documentation] | Stop and destroy multiple LXC containers on DUT node. @@ -223,6 +224,9 @@ | | Run keyword | ${lxc_name}_conf.Set node | ${dut_node} | | Run keyword | ${lxc_name}_conf.Add unix CLI listen | | Run keyword | ${lxc_name}_conf.Add unix nodaemon +| | Run keyword | ${lxc_name}_conf.Add unix exec | "/tmp/running.exec" +| | Run keyword | ${lxc_name}_conf.Add CPU main core | "0" +| | Run keyword | ${lxc_name}_conf.Add CPU corelist workers | ${lxc_cpus} | | Run keyword | ${lxc_name}_conf.Add plugin disable | "dpdk_plugin.so" | | Run Keyword | ${lxc_name}_conf.Apply config LXC | ${lxc_name} -- cgit 1.2.3-korg