X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fcontainer.robot;h=8a56caacb401eff6a80a349b1d31eeef64e389d3;hb=refs%2Fchanges%2F84%2F13784%2F1;hp=4b23236a9631fe115961e35b26209937cfa4a32b;hpb=f65b8ddc723ed9fc444509525662eda6dbc74401;p=csit.git

diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index 4b23236a96..8a56caacb4 100644
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -22,23 +22,21 @@
 | | ... |  all DUT nodes.
 | | ...
 | | ${group}= | Set Variable | VNF
-| | ${guest_dir}= | Set Variable | /mnt/host
-| | ${host_dir}= | Set Variable | /tmp
 | | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus}
 | | 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 | LC_ALL="en_US.UTF-8"
-| | | ... | DEBIAN_FRONTEND=noninteractive | ETCDV3_ENDPOINTS=172.17.0.1:2379
+| | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive
+| | | ${mnt}= | Create List | /tmp:/mnt/host | /dev:/dev
 | | | ${cpu_node}= | Get interfaces numa node | ${nodes['${dut}']}
 | | | ... | ${dut1_if1} | ${dut1_if2}
 | | | Run Keyword | ${group}.Construct containers
-| | | ... | name=${dut}_${group} | node=${nodes['${dut}']}
-| | | ... | host_dir=${host_dir} | guest_dir=${guest_dir}
+| | | ... | 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}
 
 | Construct ETCD containers on all DUTs
@@ -47,7 +45,6 @@
 | | ${group}= | Set Variable | ETCD
 | | ${command}= | Set Variable
 | | ... | /usr/local/bin/etcd -advertise-client-urls http://0.0.0.0:2379 -listen-client-urls http://0.0.0.0:2379
-| | ${host_dir}= | Set Variable | /tmp
 | | ${image}= | Set Variable | quay.io/coreos/etcd:v3.2.5
 | | ${publish}= | Create List | 2379:2379
 | | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
@@ -59,7 +56,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}
 
@@ -79,8 +76,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
@@ -101,12 +97,19 @@
 | | ...
 | | Run Keyword | ${group}.Install VPP In All Containers
 
+| Restart VPP in all '${group}' containers
+| | [Documentation] | Restart VPP on all container(s) in specific container
+| | ... | group on all DUT nodes.
+| | ...
+| | Run Keyword | ${group}.Restart VPP In All Containers
+
 | Configure VPP in all '${group}' containers
 | | [Documentation] | Configure VPP on all container(s) in specific container
 | | ... | 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