From e310a40eab90bb5ecd8471dbbccc1d02daf2dea3 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 5 Sep 2019 16:15:19 +0200 Subject: 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 --- .../robot/performance/performance_utils.robot | 5 +- resources/libraries/robot/robot_enhancements.robot | 55 ---------------------- resources/libraries/robot/shared/container.robot | 7 +-- resources/libraries/robot/shared/memif.robot | 5 +- .../libraries/robot/shared/test_teardown.robot | 3 +- 5 files changed, 12 insertions(+), 63 deletions(-) delete mode 100644 resources/libraries/robot/robot_enhancements.robot (limited to 'resources/libraries/robot') diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot index d809376c0f..bffd35d05e 100644 --- a/resources/libraries/robot/performance/performance_utils.robot +++ b/resources/libraries/robot/performance/performance_utils.robot @@ -23,6 +23,7 @@ | Library | resources.libraries.python.TrafficGenerator.OptimizedSearch | Library | resources.libraries.python.TrafficGenerator.TGDropRateSearchImpl | Library | resources.libraries.python.Trace +| Variables | resources/libraries/python/Constants.py | ... | Documentation | ... | Performance suite keywords - utilities to find and verify NDR and PDR. @@ -396,8 +397,8 @@ | | ... | \| Traffic should pass with maximum rate \| ${1} \| ${10.0} \ | | ... | \| ${False} \| ${False} \| ${0} \| ${1} \| | | ... -| | [Arguments] | ${trial_duration}=${perf_trial_duration} -| | ... | ${fail_no_traffic}=${True} | ${subsamples}=${perf_trial_multiplicity} +| | [Arguments] | ${trial_duration}=${PERF_TRIAL_DURATION} +| | ... | ${fail_no_traffic}=${True} | ${subsamples}=${PERF_TRIAL_MULTIPLICITY} | | ... | ${unidirection}=${False} | ${tx_port}=${0} | ${rx_port}=${1} | | ... | | ${results} = | Send traffic at specified rate | ${trial_duration} diff --git a/resources/libraries/robot/robot_enhancements.robot b/resources/libraries/robot/robot_enhancements.robot deleted file mode 100644 index 7b337eafeb..0000000000 --- a/resources/libraries/robot/robot_enhancements.robot +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) 2018 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -*** Settings *** -| Documentation -| ... | Place to store general keywords, similar to ones in BuiltIn library. -| Library | OperatingSystem -| Library | String - -*** Keywords *** -| Ensure Global Variable -| | [Documentation] | Give default value (from environment or code) to variable. -| | ... -| | ... | Ideally we would just use Variables table to set global variables. -| | ... | Unfortunately, __init__ files are special (among other things) -| | ... | by the fact that variables set in the table are not available -| | ... | for (sub)directory suites. -| | ... | Therefore we are using BuiltIn.Set_Global_Variable explicitly. -| | ... | While we are running code here, we allow environment variables -| | ... | to override the default values. -| | ... | If environment variable name is not specified (or empty), -| | ... | the upper case of the variable name is used, prefixed by "CSIT_". -| | ... | The --variable parameter to pybot takes precedence to environment. -| | ... -| | ... | *Arguments:* -| | ... | - variable_name - Name of global variable to set. Type: string -| | ... | - default_value - Value to set if not set otherwise. Type: string -| | ... | - env_var_name - Name of environment variable to read. Type: string -| | ... | - application - Prefix for default environment variable. Type: string -| | ... -| | ... | *Example:* -| | ... | \| Ensure Global Variable \| perf_trial_duration \| 10.0 \| TRIAL_DUR -| | ... -| | [Arguments] | ${variable_name} | ${default_value} | ${env_var_name}=${EMPTY} -| | ... | ${application}=CSIT -| | ... -| | ${env_var_length} = | Get Length | ${env_var_name} -| | ${default_env_var} = | Convert To Uppercase | ${variable_name} -| | ${env_var} = | Set Variable If | ${env_var_length} -| | ... | ${env_var_name} | ${application}_${default_env_var} -| | ${updated_default} = | Get Environment Variable -| | ... | ${env_var} | ${default_value} -| | ${final_value} = | Get Variable Value -| | ... | \${${variable_name}} | ${updated_default} -| | Set Global Variable | \${${variable_name}} | ${final_value} 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 -- cgit 1.2.3-korg