X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fcontainer.robot;h=e1aba74ee1d74f44ebcc6ac51e4b1556143fe813;hp=8a56caacb401eff6a80a349b1d31eeef64e389d3;hb=5a53823d8a6e99072152654ac632bb06a6b467ac;hpb=3f074f530223783e9e986dfe2f4b64af93483abc

diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index 8a56caacb4..e1aba74ee1 100644
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -13,71 +13,97 @@
 
 *** Settings ***
 | Documentation | Keywords related to linux containers
+| ...
+| Library | Collections
+| Library | String
+| ...
 | Library | resources.libraries.python.CpuUtils
 | Library | resources.libraries.python.topology.Topology
 
 *** Keywords ***
-| Construct VNF containers on all DUTs
-| | [Documentation] | Construct 1..N VNF container(s) of specific technology on
-| | ... |  all DUT nodes.
-| | ...
-| | ${group}= | Set Variable | VNF
-| | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus}
-| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
-| | ... | engine=${container_engine} | WITH NAME | ${group}
+| Construct container on all DUTs
+| | [Documentation] | Construct 1 CNF of specific technology on all DUT nodes.
+| | ...
+| | ... | *Arguments:*
+| | ... | - chains: Total number of chains (Optional). Type: integer, default
+| | ... | value: ${1}
+| | ... | - nodeness: Total number of nodes per chain (Optional). Type: integer,
+| | ... | default value: ${1}
+| | ... | - chain_id: Chain ID (Optional). Type: integer, default value: ${1}
+| | ... | - node_id: Node ID (Optional). Type: integer, default value: ${1}
+| | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per
+| | ... | SUT/DUT not required. Type: boolean, default value: ${True}
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Construct container on all DUTs \| 1 \| 1 \| 1 \| 1 \| ${True} \|
+| | ...
+| | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${chain_id}=${1}
+| | ... | ${node_id}=${1} | ${set_nf_cpus}=${True}
+| | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
 | | | ${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}']} | mnt=${mnt}
-| | | ... | image=${container_image} | cpu_count=${container_cpus}
-| | | ... | 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}
+| | | ${tmp}= | Get Variable Value | ${tmp_volume} | /tmp
+| | | ${mnt}= | Create List | ${tmp}:/mnt/host | /dev/vfio:/dev/vfio
+| | | ${nf_cpus}= | Run Keyword If | ${set_nf_cpus}
+| | | ... | Create network function CPU list | ${dut}
+| | | ... | chains=${chains} | nodeness=${nodeness} | chain_id=${chain_id}
+| | | ... | node_id=${node_id} | auto_scale=${True}
+| | | ... | ELSE | Set Variable | ${None}
+| | | ${uuid_str}= | Run Keyword If | '${tmp}' == '/tmp'
+| | | ... | Set Variable | ${EMPTY}
+| | | ... | ELSE | Remove String | ${tmp} | ${dut}_VOL
+| | | &{cont_args}= | Create Dictionary
+| | | ... | name=${dut}_${container_group}${chain_id}${node_id}${uuid_str}
+| | | ... | node=${nodes['${dut}']} | mnt=${mnt} | env=${env}
+| | | Run Keyword If | ${set_nf_cpus}
+| | | ... | Set To Dictionary | ${cont_args} | cpuset_cpus=${nf_cpus}
+| | | Run Keyword | ${container_group}.Construct container | &{cont_args}
 
-| Construct ETCD containers on all DUTs
-| | [Documentation] | Construct Docker ETCD container on all DUTs.
-| | ...
-| | ${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
-| | ${image}= | Set Variable | quay.io/coreos/etcd:v3.2.5
-| | ${publish}= | Create List | 2379:2379
-| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
-| | ... | engine=Docker | WITH NAME | ${group}
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | ${cpu_node}= | Get interfaces numa node | ${nodes['${dut}']}
-| | | ... | ${dut1_if1} | ${dut1_if2}
-| | | Run Keyword | ${group}.Construct container
-| | | ... | name=${dut}_${group} | node=${nodes['${dut}']}
-| | | ... | image=${container_image} | cpu_count=${1} | cpu_skip=${0}
-| | | ... | cpuset_mems=${cpu_node} | cpu_shared=${True}
-| | | ... | publish=${publish} | command=${command}
-| | Append To List | ${container_groups} | ${group}
+| Construct chain of containers on all DUTs
+| | [Documentation] | Construct 1 chain of 1..N CNFs on all DUT nodes.
+| | ...
+| | ... | *Arguments:*
+| | ... | - chains: Total number of chains. Type: integer
+| | ... | - nodeness: Total number of nodes per chain. Type: integer
+| | ... | - chain_id: Chain ID. Type: integer
+| | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per
+| | ... | SUT/DUT not required. Type: boolean, default value: ${True}
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Construct chain of containers on all DUTs \| 1 \| 1 \| 1 \
+| | ... | \| ${True} \|
+| | ...
+| | [Arguments] | ${chains} | ${nodeness} | ${chain_id} | ${set_nf_cpus}=${True}
+| | ...
+| | :FOR | ${node_id} | IN RANGE | 1 | ${nodeness}+1
+| | | Construct container on all DUTs | chains=${chains} | nodeness=${nodeness}
+| | | ... | chain_id=${chain_id} | node_id=${node_id}
+| | | ... | set_nf_cpus=${set_nf_cpus}
 
-| Construct Kafka containers on all DUTs
-| | [Documentation] | Construct Docker Kafka container on all DUTs.
-| | ...
-| | ${group}= | Set Variable | Kafka
-| | ${image}= | Set Variable | spotify/kafka
-| | ${publish}= | Create List | 2181:2181 | 9092:9092
-| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
-| | ... | engine=Docker | WITH NAME | ${group}
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | ${env}= | Create List | ADVERTISED_HOST=172.17.0.1 | ADVERTISED_PORT=9092
-| | | ${cpu_node}= | Get interfaces numa node | ${nodes['${dut}']}
-| | | ... | ${dut1_if1} | ${dut1_if2}
-| | | Run Keyword | ${group}.Construct container
-| | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | image=${image}
-| | | ... | cpu_count=${1} | cpu_skip=${0} | cpuset_mems=${cpu_node}
-| | | ... | cpu_shared=${True} | publish=${publish} | env=${env}
-| | Append To List | ${container_groups} | ${group}
+| Construct chains of containers on all DUTs
+| | [Documentation] | Construct 1..N chains of 1..N CNFs on all DUT nodes.
+| | ...
+| | ... | *Arguments:*
+| | ... | - chains: Total number of chains (Optional). Type: integer, default
+| | ... | value: ${1}
+| | ... | - nodeness: Total number of nodes per chain (Optional). Type: integer,
+| | ... | default value: ${1}
+| | ... | - set_nf_cpus: Set False if CPUs allocatation for network function per
+| | ... | SUT/DUT not required. Type: boolean, default value: ${True}
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Construct chains of containers on all DUTs \| 1 \| 1 \|
+| | ...
+| | [Arguments] | ${chains}=${1} | ${nodeness}=${1} | ${set_nf_cpus}=${True}
+| | ...
+| | :FOR | ${chain_id} | IN RANGE | 1 | ${chains}+1
+| | | Construct chain of containers on all DUTs | chains=${chains}
+| | | ... | nodeness=${nodeness} | chain_id=${chain_id}
+| | | ... | set_nf_cpus=${set_nf_cpus}
 
 | Acquire all '${group}' containers
 | | [Documentation] | Acquire all container(s) in specific container group on
@@ -107,9 +133,13 @@
 | | [Documentation] | Configure VPP on all container(s) in specific container
 | | ... | group on all DUT nodes.
 | | ...
-| | Run Keyword | ${group}.Configure VPP In All Containers
-| | ... | chain_topology=${container_chain_topology}
-| | ... | dut1_if=${dut1_if2} | dut2_if=${dut2_if1}
+| | ${dut1_if2} = | Get Variable Value | \${dut1_if2} | ${None}
+| | ${dut2_if2} = | Get Variable Value | \${dut2_if2} | ${None}
+| | Run Keyword If | '${container_chain_topology}' == 'cross_horiz'
+| | ... | ${group}.Configure VPP In All Containers | ${container_chain_topology}
+| | ... | dut1_if=${dut1_if2} | dut2_if=${dut2_if2}
+| | ... | ELSE
+| | ... | ${group}.Configure VPP In All Containers | ${container_chain_topology}
 
 | Stop all '${group}' containers
 | | [Documentation] | Stop all container(s) in specific container group on all