Robot Framework 7.0 changes
Update robot code syntax overall in the repo
Changes:
- Update the requirement.txt package version for robot
- The '[Return]' setting is deprecated.
Use the 'RETURN' statement instead.
- Singular section headers like '*** Test Case ***'
are deprecated. Use plural format like
'*** Test Cases ***' instead.
- Singular section headers like '*** Variable ***'
are deprecated
Tested:
- Ran from sandbox with the version
$ robot --version
Robot Framework 7.0 (Python 3.10.12 on linux)
and also tested on latest python version
Robot Framework 7.0 (Python 3.11.9 on linux)
Change-Id: I54e85f9d799556c63b9a39f79483f83e9b980768
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/lib/os_utilities.robot b/lib/os_utilities.robot
index d224d6f..6e82858 100755
--- a/lib/os_utilities.robot
+++ b/lib/os_utilities.robot
@@ -98,7 +98,7 @@
${running}= Set Variable If
... "Currently running" in """${status}""" ${True} ${False}
- [Return] ${running}
+ RETURN ${running}
Write Log Data To File
@@ -176,7 +176,7 @@
${cmd}= Catenate lscpu | grep min | tr -dc '0-9.\n'
${cpu_freq} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${cpu_freq}
+ RETURN ${cpu_freq}
Get CPU Min Frequency
@@ -190,7 +190,7 @@
${cmd}= Catenate ppc64_cpu --frequency -t 10 | grep min
... | cut -f 2 | cut -d ' ' -f 1 | tr -dc '0-9\n'
${cpu_freq} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${cpu_freq}
+ RETURN ${cpu_freq}
Get CPU Max Frequency Limit
@@ -201,7 +201,7 @@
${cmd}= Catenate lscpu | grep max | tr -dc '0-9.\n'
${cpu_freq} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${cpu_freq}
+ RETURN ${cpu_freq}
Get CPU Max Frequency
@@ -215,7 +215,7 @@
${cmd}= Catenate ppc64_cpu --frequency -t 10 | grep max
... | cut -f 2 | cut -d ' ' -f 1 | tr -dc '0-9\n'
${cpu_freq} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${cpu_freq}
+ RETURN ${cpu_freq}
Get CPU Max Temperature
@@ -232,7 +232,7 @@
... [ x['Value'] for x in $cpu_temperatuture_objs.values() ]
${cpu_max_temp} Evaluate int(max(map(int, $cpu_temperatures))/1000)
- [Return] ${cpu_max_temp}
+ RETURN ${cpu_max_temp}
Get CPU Min Temperature
@@ -249,7 +249,7 @@
... [ x['Value'] for x in $cpu_temperatuture_objs.values() ]
${cpu_min_temp} Evaluate int(min(map(int, $cpu_temperatures))/1000)
- [Return] ${cpu_min_temp}
+ RETURN ${cpu_min_temp}
Check For Errors On OS Dmesg Log
@@ -323,7 +323,7 @@
# Allow for sensor overshoot. That is, max power reported for
# a GPU could be a few watts above the limit.
${power_max}= Evaluate ${nvidia_out}+${7.00}
- [Return] ${power_max}
+ RETURN ${power_max}
Get GPU Max Power
@@ -339,7 +339,7 @@
${cmd}= Catenate nvidia-smi --query-gpu=power.draw
... --format=csv | cut -f 1 -d ' ' | sort -n -u | tail -n 1
${nvidia_out} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${nvidia_out}
+ RETURN ${nvidia_out}
Get GPU Min Power
@@ -349,7 +349,7 @@
${cmd}= Catenate nvidia-smi --query-gpu=power.draw --format=csv |
... grep -v 'power.draw' | cut -f 1 -d ' ' | sort -n -u | head -1
${gpu_min_power} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${gpu_min_power}
+ RETURN ${gpu_min_power}
Get GPU Temperature Limit
@@ -364,7 +364,7 @@
${cmd}= Catenate nvidia-smi -q -d TEMPERATURE | grep "GPU Max"
... | cut -f 2 -d ":" | tr -dc '0-9\n' | sort -n -u | tail -n 1
${nvidia_out} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${nvidia_out}
+ RETURN ${nvidia_out}
Get GPU Min Temperature
@@ -373,7 +373,7 @@
${cmd}= Catenate nvidia-smi --query-gpu=temperature.gpu
... --format=csv | grep -v 'temperature.gpu' | sort -n -u | head -1
${nvidia_out} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${nvidia_out}
+ RETURN ${nvidia_out}
Get GPU Max Temperature
@@ -388,7 +388,7 @@
${cmd}= Catenate nvidia-smi --query-gpu=temperature.gpu
... --format=csv | sort -n -u | tail -n 1
${nvidia_out} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${nvidia_out}
+ RETURN ${nvidia_out}
Get GPU Temperature Via REST
@@ -412,7 +412,7 @@
${max_gpu_temperature}= Evaluate
... int(max(map(int, $gpu_temperatures))/1000)
- [Return] ${max_gpu_temperature}
+ RETURN ${max_gpu_temperature}
Get GPU Clock Limit
@@ -427,7 +427,7 @@
${cmd}= Catenate nvidia-smi --query-gpu=clocks.max.gr
... --format=csv | cut -f 1 -d ' ' | sort -n -u | tail -n 1
${nvidia_out} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${nvidia_out}
+ RETURN ${nvidia_out}
Get GPU Clock
@@ -442,7 +442,7 @@
${cmd}= Catenate nvidia-smi --query-gpu=clocks.gr
... --format=csv | cut -f 1 -d ' ' | sort -n -u | tail -n 1
${nvidia_out} ${stderr} ${rc}= OS Execute Command ${cmd}
- [Return] ${nvidia_out}
+ RETURN ${nvidia_out}
Count GPUs From BMC
@@ -469,7 +469,7 @@
${num_bmc_gpus}= Run Keyword If ${present} and ${state}
... Evaluate ${num_bmc_gpus}+${1}
END
- [Return] ${num_bmc_gpus}
+ RETURN ${num_bmc_gpus}
Create Default MDT Profile
@@ -627,7 +627,7 @@
# class Device class to retrieve with lshw.
${output} ${stderr} ${rc}= OS Execute Command lshw -c ${class} -json
${output}= Verify JSON string ${output}
- [Return] ${output}
+ RETURN ${output}
Verify JSON String
@@ -637,7 +637,7 @@
# unver_string JSON String we will be checking for lshw comma errors.
${unver_string}= Convert to String ${unver_string}
${ver_string}= Replace String Using Regexp ${unver_string} }\\s*{ },{
- [Return] ${ver_string}
+ RETURN ${ver_string}
Clean Up String
@@ -650,7 +650,7 @@
${trimmed_string}= Get Substring ${clean_string} 0 -1
${clean_string}= Set Variable If '${last_char}' == ','
... ${trimmed_string} ${clean_string}
- [Return] ${clean_string}
+ RETURN ${clean_string}
Get OS Network Interface Names
@@ -658,7 +658,7 @@
${stdout} ${stderr} ${rc}= OS Execute Command ls /sys/class/net
@{interface_names}= Split String ${stdout}
- [Return] @{interface_names}
+ RETURN @{interface_names}
Run Soft Bootme