FIX: LXC container creation on Ubuntu Bionic

[csit.git] / resources / libraries / robot / shared / container.robot

diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index b44e438..cf19464 100644 (file)
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -28,13 +28,14 @@
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive
-| | | ${mnt}= | Create List | /tmp:/mnt/host | /dev:/dev
+| | | ${mnt}= | Create List | /tmp:/mnt/host | /dev/vfio:/dev/vfio
+| | | ... | /dev/bus:/dev/bus
 | | | ${cpu_node}= | Get interfaces numa node | ${nodes['${dut}']}
 | | | ... | ${dut1_if1} | ${dut1_if2}
 | | | Run Keyword | ${group}.Construct containers
 | | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | mnt=${mnt}
 | | | ... | image=${container_image} | cpu_count=${container_cpus}
-| | | ... | cpu_skip=${skip_cpus} | smt_used=${False} | cpuset_mems=${cpu_node}
+| | | ... | cpu_skip=${skip_cpus} | cpuset_mems=${cpu_node}
 | | | ... | cpu_shared=${False} | env=${env} | count=${container_count}
 | | | ... | install_dkms=${container_install_dkms}
 | | Append To List | ${container_groups} | ${group}
@@ -56,7 +57,7 @@
 | | | Run Keyword | ${group}.Construct container
 | | | ... | name=${dut}_${group} | node=${nodes['${dut}']}
 | | | ... | image=${container_image} | cpu_count=${1} | cpu_skip=${0}
-| | | ... | smt_used=${False} | cpuset_mems=${cpu_node} | cpu_shared=${True}
+| | | ... | cpuset_mems=${cpu_node} | cpu_shared=${True}
 | | | ... | publish=${publish} | command=${command}
 | | Append To List | ${container_groups} | ${group}
 
@@ -76,8 +77,7 @@
 | | | Run Keyword | ${group}.Construct container
 | | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | image=${image}
 | | | ... | cpu_count=${1} | cpu_skip=${0} | cpuset_mems=${cpu_node}
-| | | ... | smt_used=${False} | cpu_shared=${True} | publish=${publish}
-| | | ... | env=${env}
+| | | ... | cpu_shared=${True} | publish=${publish} | env=${env}
 | | Append To List | ${container_groups} | ${group}
 
 | Acquire all '${group}' containers
@@ -109,7 +109,8 @@
 | | ... | group on all DUT nodes.
 | | ...
 | | Run Keyword | ${group}.Configure VPP In All Containers
-| | ... | memif_create_cnt.vat
+| | ... | chain_topology=${container_chain_topology}
+| | ... | dut1_if=${dut1_if2} | dut2_if=${dut2_if1}
 
 | Stop all '${group}' containers
 | | [Documentation] | Stop all container(s) in specific container group on all