diff options
author | Vratko Polak <vrpolak@cisco.com> | 2019-09-05 16:15:19 +0200 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2019-09-06 08:46:09 +0000 |
commit | e310a40eab90bb5ecd8471dbbccc1d02daf2dea3 (patch) | |
tree | 7d5e8d06d52d8942243ef8a0926e04a651b43ef4 /resources/libraries/robot/shared | |
parent | 1c77031813057a50781784fc8e34019805d222b8 (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')
-rw-r--r-- | resources/libraries/robot/shared/container.robot | 7 | ||||
-rw-r--r-- | resources/libraries/robot/shared/memif.robot | 5 | ||||
-rw-r--r-- | resources/libraries/robot/shared/test_teardown.robot | 3 |
3 files changed, 9 insertions, 6 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} diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot index 0fda454764..a0fae656f9 100644 --- a/resources/libraries/robot/shared/memif.robot +++ b/resources/libraries/robot/shared/memif.robot @@ -15,6 +15,7 @@ | Documentation | Memif interface keyword library. | ... | Library | resources.libraries.python.Memif +| Variables | resources/libraries/python/Constants.py *** Keywords *** | Set up memif interfaces on DUT node @@ -56,10 +57,10 @@ | | ${sid_1}= | Evaluate | (${mid}*2)-1 | | ${sid_2}= | Evaluate | (${mid}*2) | | ${memif_1}= | Create memif interface | ${dut_node} -| | ... | ${filename1}${mid}${dut1_uuid}-${sid_1} | ${mid} | ${sid_1} +| | ... | ${filename1}${mid}${DUT1_UUID}-${sid_1} | ${mid} | ${sid_1} | | ... | rxq=${rxq} | txq=${txq} | role=${role} | | ${memif_2}= | Create memif interface | ${dut_node} -| | ... | ${filename2}${mid}${dut1_uuid}-${sid_2} | ${mid} | ${sid_2} +| | ... | ${filename2}${mid}${DUT1_UUID}-${sid_2} | ${mid} | ${sid_2} | | ... | rxq=${rxq} | txq=${txq} | role=${role} | | Set Interface State | ${dut_node} | ${memif_1} | up | | Set Interface State | ${dut_node} | ${memif_2} | up diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot index e130038fbc..5d2c2fa165 100644 --- a/resources/libraries/robot/shared/test_teardown.robot +++ b/resources/libraries/robot/shared/test_teardown.robot @@ -17,6 +17,7 @@ | Resource | resources/libraries/robot/shared/container.robot | Library | resources.libraries.python.PapiHistory | Library | resources.libraries.python.topology.Topology +| Variables | resources/libraries/python/Constants.py | ... | Documentation | Test teardown keywords. @@ -44,7 +45,7 @@ | | ... | Additional teardown for tests which uses performance measurement. | | ... | | Run Keyword If Test Failed -| | ... | Send traffic at specified rate | ${perf_trial_duration} | 10000pps +| | ... | Send traffic at specified rate | ${PERF_TRIAL_DURATION} | 10000pps | | ... | ${frame_size} | ${traffic_profile} | pkt_trace=${True} | Additional Test Tear Down Action For packet_trace |