aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot/shared/container.robot
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2019-09-05 16:15:19 +0200
committerVratko Polak <vrpolak@cisco.com>2019-09-06 08:46:09 +0000
commite310a40eab90bb5ecd8471dbbccc1d02daf2dea3 (patch)
tree7d5e8d06d52d8942243ef8a0926e04a651b43ef4 /resources/libraries/robot/shared/container.robot
parent1c77031813057a50781784fc8e34019805d222b8 (diff)
Read environment variables in Constants.py
Instead of using EnsureGlobalVariable, which is clunky to use from Python. As a consequence, all caps variables from Constants.py are used directly and tests/__init__.robot and robot_enhancements.robot are deleted. + Rename the CRC global kill switch based on ci-man review. Change-Id: I10723792475bc83352bf8c3b7f7946ecf885a194 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/robot/shared/container.robot')
-rw-r--r--resources/libraries/robot/shared/container.robot7
1 files changed, 4 insertions, 3 deletions
diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index 15bcad7999..cb3bc29490 100644
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -16,6 +16,7 @@
| ...
| Library | resources.libraries.python.CpuUtils
| Library | resources.libraries.python.topology.Topology
+| Variables | resources/libraries/python/Constants.py
*** Keywords ***
| Construct container on all DUTs
@@ -52,9 +53,9 @@
| | :FOR | ${dut} | IN | @{duts}
| | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node}
| | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive
-| | | ${dut1_uuid_length} = | Get Length | ${dut1_uuid}
+| | | ${dut1_uuid_length} = | Get Length | ${DUT1_UUID}
| | | ${root}= | Run Keyword If | ${dut1_uuid_length}
-| | | ... | Get Docker Mergeddir | ${nodes['DUT1']} | ${dut1_uuid}
+| | | ... | Get Docker Mergeddir | ${nodes['DUT1']} | ${DUT1_UUID}
| | | ... | ELSE | Set Variable | ${EMPTY}
| | | ${node_arch}= | Get Node Arch | ${nodes['${dut}']}
| | | ${mnt}= | Create List
@@ -71,7 +72,7 @@
| | | ... | nf_chain=${nf_chain} | nf_node=${nf_node}
| | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${nf_dtc} | nf_dtcr=${nf_dtcr}
| | | &{cont_args}= | Create Dictionary
-| | | ... | name=${dut}_${container_group}${nf_id}${dut1_uuid}
+| | | ... | name=${dut}_${container_group}${nf_id}${DUT1_UUID}
| | | ... | node=${nodes['${dut}']} | mnt=${mnt} | env=${env}
| | | Run Keyword If | ${pinning}
| | | ... | Set To Dictionary | ${cont_args} | cpuset_cpus=${nf_cpus}