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/ipmi/dcmi/test_dcmi_asset_tag.robot b/ipmi/dcmi/test_dcmi_asset_tag.robot
index 7c6af70..d8959c6 100644
--- a/ipmi/dcmi/test_dcmi_asset_tag.robot
+++ b/ipmi/dcmi/test_dcmi_asset_tag.robot
@@ -104,7 +104,7 @@
Set Test Variable ${random_string}
Set Test Variable ${number_of_bytes_to_write}
- [Return] ${ret}
+ RETURN ${ret}
Get Raw Asset Tag
[Documentation] Get asset tag command in raw command.
@@ -112,7 +112,7 @@
${cmd}= Catenate ${DCMI_RAW_CMD['DCMI']['Asset_Tag'][0]} 0x${number_of_bytes_to_write}
${ret}= Run IPMI Command ${cmd}
- [Return] ${ret}
+ RETURN ${ret}
Validate Asset Tag Via Raw Command
[Documentation] Validate asset tag via raw cmd.
@@ -136,4 +136,4 @@
... '${length_1}' != '1' ${length}
${ret}= Convert To Lower Case ${length_2}
- [Return] ${ret}
+ RETURN ${ret}
diff --git a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
index 07dce0e..1873743 100644
--- a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
+++ b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
@@ -197,4 +197,4 @@
${ret}= Run External IPMI Standard Command sensor | grep -i "${sensor_name}"
- [Return] ${ret}
+ RETURN ${ret}
diff --git a/ipmi/dcmi/test_dcmi_management_controller.robot b/ipmi/dcmi/test_dcmi_management_controller.robot
index 9bde566..c21ee6b 100644
--- a/ipmi/dcmi/test_dcmi_management_controller.robot
+++ b/ipmi/dcmi/test_dcmi_management_controller.robot
@@ -136,7 +136,7 @@
${resp}= Run IPMI Command ${mcid_get_cmd}
${resp}= Strip String ${resp} mode=right characters=${SPACE}00\n
- [Return] ${resp}
+ RETURN ${resp}
Set DCMI Management Controller Identifier String
[Documentation] Set DCMI MCID String.
@@ -157,7 +157,7 @@
Set Test Variable ${random_int}
Set Test Variable ${number_of_bytes_to_write}
- [Return] ${resp}
+ RETURN ${resp}
Get Hostname From BMC Console
[Documentation] Get hostname.
@@ -167,7 +167,7 @@
${name}= Convert To List ${bmc_hostname}
${hostname_bytes}= convert_name_into_bytes_without_prefix ${name[0]}
- [Return] ${hostname_bytes}
+ RETURN ${hostname_bytes}
Get Response Length In Hex
[Documentation] Get response length in hex.
@@ -180,4 +180,4 @@
... '${length_1}' != '1' ${length}
${resp_length_3}= Convert To Lower Case ${length_2}
- [Return] ${resp_length_3}
+ RETURN ${resp_length_3}
diff --git a/ipmi/test_get_bios_post_code.robot b/ipmi/test_get_bios_post_code.robot
index 169f2c7..869646a 100644
--- a/ipmi/test_get_bios_post_code.robot
+++ b/ipmi/test_get_bios_post_code.robot
@@ -111,4 +111,4 @@
${cmd}= Catenate ping -c 4 ${host_ip}
${output}= Run ${cmd}
- [Return] ${output}
+ RETURN ${output}
diff --git a/ipmi/test_ipmi_cold_reset.robot b/ipmi/test_ipmi_cold_reset.robot
index e9ff17b..ed3d4f2 100644
--- a/ipmi/test_ipmi_cold_reset.robot
+++ b/ipmi/test_ipmi_cold_reset.robot
@@ -116,7 +116,7 @@
${data}= Wait Until Keyword Succeeds 2 min 30 sec
... Run IPMI Standard Command sensor
- [Return] ${data}
+ RETURN ${data}
Get The Sensor Name And Threshold
[Documentation] To get the sensor threshold for given sensor using IPMI.
@@ -148,7 +148,7 @@
Remove Values From List ${tmp_list} ${random_sensor}
END
- [Return] ${random_sensor} ${sensor_threshold}
+ RETURN ${random_sensor} ${sensor_threshold}
Selecting Random Sensor Name And Threshold Value
[Documentation] Select Random Sensor Name And Threshold Values.
@@ -203,7 +203,7 @@
Run Keyword If '${upper_non_recoverable_threshold_status}' == 'True'
... Set To Dictionary ${tmp_dict} unr ${ipmi_upper_non_recoverable_threshold}
- [Return] ${random_sensor_name} ${tmp_dict}
+ RETURN ${random_sensor_name} ${tmp_dict}
Modify Default Sensor Threshold Value
[Documentation] Modify Default Sensor Threshold Value with adding 100 to old threshold values.
@@ -211,7 +211,7 @@
${new_threshold}= Evaluate ${old_threshold} + 100
- [Return] ${new_threshold}
+ RETURN ${new_threshold}
Set And Get Sensor Threshold For given Sensor
[Documentation] Set/Get Sensor Threshold for given sensor Via IPMI.
@@ -224,7 +224,7 @@
${sensor_new_threshold_value}= Getting Sensor Threshold Value Based On Threshold Key ${random_threshold_key} ${sensor_name}
- [Return] ${sensor_new_threshold_value}
+ RETURN ${sensor_new_threshold_value}
Getting Sensor Threshold Value Based On Threshold Key
[Documentation] Getting Particular Sensor Threshold Value Based On Sensor Name And Threshold Key.
@@ -245,4 +245,4 @@
${get_sensor_new_threshold_value}= Get From List ${new_sensor_details} ${index_value}
${sensor_new_threshold_value}= Set Variable ${get_sensor_new_threshold_value.strip()}
- [Return] ${sensor_new_threshold_value}
+ RETURN ${sensor_new_threshold_value}
diff --git a/ipmi/test_ipmi_device_id.robot b/ipmi/test_ipmi_device_id.robot
index d82f785..3586012 100644
--- a/ipmi/test_ipmi_device_id.robot
+++ b/ipmi/test_ipmi_device_id.robot
@@ -130,7 +130,7 @@
${os_release}= Get BMC Release Info
${os_release}= Convert To Dictionary ${os_release}
- [Return] ${os_release}
+ RETURN ${os_release}
Get Device Info From BMC
@@ -144,4 +144,4 @@
${info}= Set Variable ${data[0]}
${info}= Evaluate dict(${info})
- [Return] ${info}
+ RETURN ${info}
diff --git a/ipmi/test_ipmi_fru_device.robot b/ipmi/test_ipmi_fru_device.robot
index dd2d225..d3376c5 100644
--- a/ipmi/test_ipmi_fru_device.robot
+++ b/ipmi/test_ipmi_fru_device.robot
@@ -211,7 +211,7 @@
Set To Dictionary ${fru} ${serial_number} ${tmp}
END
- [Return] ${fru}
+ RETURN ${fru}
Get DBUS Dictionary For FRU Devices
@@ -316,7 +316,7 @@
${resp}= Run IPMI Command ${IPMI_RAW_CMD['FRU']['Inventory_Area_Info'][0]} ${fru_device_id}
${resp}= Split String ${resp}
- [Return] ${resp[0]}
+ RETURN ${resp[0]}
Read FRU Data Via IPMI
@@ -332,7 +332,7 @@
${resp}= Run IPMI Command
... ${IPMI_RAW_CMD['FRU']['Read'][0]} ${fru_id} ${offset} 0xff
- [Return] ${resp}
+ RETURN ${resp}
Write FRU Data Via IPMI
@@ -365,7 +365,7 @@
${string}= Generate Random String ${initial_fru_length} [LETTERS]
${frudata_prefixed} ${fru_data}= Identify Request Data ${string}
- [Return] ${frudata_prefixed} ${fru_data}
+ RETURN ${frudata_prefixed} ${fru_data}
Get Default FRU Data
diff --git a/ipmi/test_ipmi_inband_sdr.robot b/ipmi/test_ipmi_inband_sdr.robot
index 7a2f863..a6dcdcb 100644
--- a/ipmi/test_ipmi_inband_sdr.robot
+++ b/ipmi/test_ipmi_inband_sdr.robot
@@ -365,7 +365,7 @@
${output}= Run IPMI Standard Command sdr elist all
${sensor_list}= Split String ${output} \n
${sensor_count}= Get Length ${sensor_list}
- [Return] ${sensor_count}
+ RETURN ${sensor_count}
Get Device SDR Info For Sensor Data
@@ -375,7 +375,7 @@
${sensor_data}= Run Inband IPMI Standard Command
... raw ${IPMI_RAW_CMD['Device_SDR']['Get_Info'][0]}
- [Return] ${sensor_data}
+ RETURN ${sensor_data}
Get Device SDR Info For SDR Data
@@ -385,7 +385,7 @@
${SDR_data}= Run Inband IPMI Standard Command
... raw ${IPMI_RAW_CMD['Device_SDR']['Get_Info'][1]}
- [Return] ${SDR_data}
+ RETURN ${SDR_data}
Get Sensor Count From SDR Info
@@ -399,7 +399,7 @@
${sensor_count}= Set Variable ${sensor_data[0]}
${sensor_count}= Convert To Integer ${sensor_count} 16
- [Return] ${sensor_count}
+ RETURN ${sensor_count}
Get SDR Count From SDR Info
@@ -413,7 +413,7 @@
${SDR_count}= Set Variable ${SDR_data[0]}
${SDR_count}= Convert To Integer ${SDR_count} 16
- [Return] ${SDR_count}
+ RETURN ${SDR_count}
Get Device SDR Timestamp
@@ -440,7 +440,7 @@
${timestamp}= Zfill Data ${timestamp} 8
${timestamp}= Convert To Integer ${timestamp} 16
- [Return] ${timestamp}
+ RETURN ${timestamp}
Get Count for Sensor And SDR Elist All
@@ -451,7 +451,7 @@
# Get SDR elist all via IPMI lanplus.
${SDR_count}= Get IPMI Sensor Count
- [Return] ${sensor_count} ${SDR_count}
+ RETURN ${sensor_count} ${SDR_count}
Get Reserve Device SDR Repository
@@ -461,7 +461,7 @@
${resp}= Run Inband IPMI Standard Command
... raw ${IPMI_RAW_CMD['Device_SDR']['Reserve_Repository'][0]}
- [Return] ${resp}
+ RETURN ${resp}
Get IPMI SDR Status Info
@@ -489,7 +489,7 @@
... case-insensitive
${setting_status}= Fetch From Right ${setting_line} :${SPACE}
- [Return] ${setting_status}
+ RETURN ${setting_status}
Get Record Count And Last Record From SDR
@@ -503,7 +503,7 @@
# Then Last record ID will be 57 (in decimal) - 39h.
${last_record}= Evaluate ${record_count} - 1
- [Return] ${record_count} ${last_record}
+ RETURN ${record_count} ${last_record}
Suite Setup Execution
diff --git a/ipmi/test_ipmi_network_verification.robot b/ipmi/test_ipmi_network_verification.robot
index 6fa1189..f267d7c 100644
--- a/ipmi/test_ipmi_network_verification.robot
+++ b/ipmi/test_ipmi_network_verification.robot
@@ -317,7 +317,7 @@
${mac_unique_list}= Remove Duplicates ${mac_entry_list}
${physical_interface_count}= Get Length ${mac_unique_list}
- [Return] ${physical_interface_count}
+ RETURN ${physical_interface_count}
Verify Channel Info
diff --git a/ipmi/test_ipmi_payload.robot b/ipmi/test_ipmi_payload.robot
index 9d9ec82..4f4b8f3 100644
--- a/ipmi/test_ipmi_payload.robot
+++ b/ipmi/test_ipmi_payload.robot
@@ -255,7 +255,7 @@
${payload_status}= Set Variable ${resp[1]}
- [return] ${payload_status}
+ RETURN ${payload_status}
Activate Payload
@@ -286,7 +286,7 @@
${raw_command}= Catenate ${IPMI_RAW_CMD['Payload']['Get_User_Access_Payload'][0]}
... ${channel_number} ${user_id}
${resp}= Run IPMI Command ${raw_command}
- [Return] ${resp}
+ RETURN ${resp}
Create And Verify IPMI User
@@ -304,7 +304,7 @@
Set And Verify User Access Privilege ${random_user_id} ${user_privilege_level}
Verify Username And Password ${random_user_name} ${new_user_passwd} L=${privilege}
- [Return] ${random_user_id} ${random_user_name}
+ RETURN ${random_user_id} ${random_user_name}
Set User Password
@@ -411,7 +411,7 @@
${resp}= Run IPMI Command ${set_cmd}
- [Return] ${resp}
+ RETURN ${resp}
Get Invalid User ID
@@ -427,7 +427,7 @@
END
${invalid_user_id}= Evaluate random.choice(${invalid_userid_list}) random
- [Return] ${invalid_user_id}
+ RETURN ${invalid_user_id}
Verify Set User Access Payload For Invalid Channel
diff --git a/ipmi/test_ipmi_poh_counter.robot b/ipmi/test_ipmi_poh_counter.robot
index be7507f..649f599 100644
--- a/ipmi/test_ipmi_poh_counter.robot
+++ b/ipmi/test_ipmi_poh_counter.robot
@@ -143,7 +143,7 @@
${poh_counter_reading}= Evaluate "".join(${poh_counter_reading})
${poh_counter_reading}= Convert To Integer ${poh_counter_reading} 16
- [Return] ${poh_counter_reading}
+ RETURN ${poh_counter_reading}
Suite Setup Execution
diff --git a/ipmi/test_ipmi_sdr.robot b/ipmi/test_ipmi_sdr.robot
index 89801ee..c62f554 100755
--- a/ipmi/test_ipmi_sdr.robot
+++ b/ipmi/test_ipmi_sdr.robot
@@ -246,7 +246,7 @@
... ELSE
... Return From Keyword ${reservation_id}
- [Return] ${reservation_id}
+ RETURN ${reservation_id}
Get Sensor Count
@@ -275,7 +275,7 @@
${output}= Run IPMI Standard Command sdr elist all
${sensor_list}= Split String ${output} \n
${sensor_count}= Get Length ${sensor_list}
- [Return] ${sensor_count}
+ RETURN ${sensor_count}
Get Component URIs
@@ -298,7 +298,7 @@
${component_uris}= Get Matches ${uri_list}
... regexp=^.*[0-9a-z_].${component_name}\[_0-9a-z]*$
... case_insensitive=${True}
- [Return] ${component_uris}
+ RETURN ${component_uris}
Get SDR Presence Via IPMI
@@ -333,7 +333,7 @@
${presence_ipmi}= Fetch From Right ${sdr_component_line} |
${presence_ipmi}= Strip String ${presence_ipmi}
- [Return] ${presence_ipmi}
+ RETURN ${presence_ipmi}
Verify SDR
@@ -394,7 +394,7 @@
${cmd_support}= Set Variable If ${resp_code_match} != [] no yes
- [Return] ${cmd_support}
+ RETURN ${cmd_support}
Get SDR Record ID
@@ -403,7 +403,7 @@
${resp}= Run IPMI Standard Command sdr elist
${record_id}= Get Regexp Matches ${resp} \\|\\s+([0-9]+)h\\s+\\| 1
- [Return] ${record_id[0]}
+ RETURN ${record_id[0]}
Suite Setup Execution
diff --git a/ipmi/test_ipmi_sel.robot b/ipmi/test_ipmi_sel.robot
index 3207cf9..f31d616 100644
--- a/ipmi/test_ipmi_sel.robot
+++ b/ipmi/test_ipmi_sel.robot
@@ -388,7 +388,7 @@
${resp}= Run IPMI Command ${cmd}
${resp}= Split String ${resp}
- [Return] ${resp}
+ RETURN ${resp}
Get Most Recent Addition Timestamp From SEL Info
@@ -402,7 +402,7 @@
Reverse List ${addition_timestamp}
${addition_timestamp}= Evaluate "".join(${addition_timestamp})
- [Return] ${addition_timestamp}
+ RETURN ${addition_timestamp}
Get Most Recent Erase Timestamp From SEL Info
@@ -416,7 +416,7 @@
Reverse List ${erase_timestamp}
${erase_timestamp}= Evaluate "".join(${erase_timestamp})
- [Return] ${erase_timestamp}
+ RETURN ${erase_timestamp}
Get SEL Elist Last Entry Date In Epoch
@@ -429,7 +429,7 @@
${sel_entry_date}= Fetch Added SEL Date ${resp}
${epoch_date}= Convert Date ${sel_entry_date} epoch exclude_millis=yes date_format=%m/%d/%Y %H:%M:%S
- [Return] ${epoch_date}
+ RETURN ${epoch_date}
Get BMC Time In Epoch
@@ -440,7 +440,7 @@
${epoch_date}= Convert Date ${date} epoch exclude_millis=yes date_format=%m/%d/%Y %H:%M:%S
- [Return] ${epoch_date}
+ RETURN ${epoch_date}
Install Tarball For Error Creation
diff --git a/ipmi/test_ipmi_sel_time.robot b/ipmi/test_ipmi_sel_time.robot
index d60dcdd..b71e4d6 100644
--- a/ipmi/test_ipmi_sel_time.robot
+++ b/ipmi/test_ipmi_sel_time.robot
@@ -451,7 +451,7 @@
${get_sel_time}= Run IPMI Command
... ${IPMI_RAW_CMD['SEL_entry']['Get_SEL_Time'][0]}
- [Return] ${get_sel_time}
+ RETURN ${get_sel_time}
Set SEL Time Entry Via Raw Command
@@ -492,14 +492,14 @@
${sel_entry}= Get Lines Containing String ${get_sel_entry} ${event_type}
Should Contain ${sel_entry} ${event_dir} msg=Add SEL Entry failed.
- [Return] ${sel_entry}
+ RETURN ${sel_entry}
Check Current Date Time Via IPMI
[Documentation] Verify Current Date and Time Via IPMI user command.
${resp}= Run IPMI Standard Command sel time get
- [Return] ${resp}
+ RETURN ${resp}
Get Specific Sel Date
@@ -516,7 +516,7 @@
${date}= Add Time To Date
... ${current_date} ${days}d result_format=%m/%d/%Y %H:%M:%S date_format=%m/%d/%Y %H:%M:%S
- [Return] ${date}
+ RETURN ${date}
Converting Date to HexaDecimal
@@ -541,7 +541,7 @@
Reverse List ${date}
${date}= Evaluate " ".join(${date})
- [Return] ${date}
+ RETURN ${date}
Get Time Difference
@@ -557,7 +557,7 @@
${diff}= Evaluate int(${epoch_date1}) - int(${epoch_date2})
- [Return] ${diff}
+ RETURN ${diff}
Identify SEL Time
@@ -586,7 +586,7 @@
#Set SEL Time.
${quoted_date}= Fetch Date ${datetime}
- [Return] ${quoted_date} ${datetime}
+ RETURN ${quoted_date} ${datetime}
Set SEL Time Via IPMI
diff --git a/ipmi/test_ipmi_sensor.robot b/ipmi/test_ipmi_sensor.robot
index cd16d88..eb70020 100644
--- a/ipmi/test_ipmi_sensor.robot
+++ b/ipmi/test_ipmi_sensor.robot
@@ -246,7 +246,7 @@
Set To Dictionary ${sensor_value_dict} ${sensor_key} ${sensor_value}
END
- [Return] ${sensor_value_dict}
+ RETURN ${sensor_value_dict}
Get DCMI Sensor Reading
@@ -275,7 +275,7 @@
... Set To Dictionary ${sensor_value_dict} ${sensor_key} ${sensor_value}
END
- [Return] ${sensor_value_dict}
+ RETURN ${sensor_value_dict}
Get Temperature Reading From Redfish
@@ -311,7 +311,7 @@
... Set To Dictionary ${redfish_value_dict} ${data}[DeviceName] ${reading}
END
- [Return] ${redfish_value_dict}
+ RETURN ${redfish_value_dict}
Verify Power Reading Using IPMI And Redfish
@@ -493,7 +493,7 @@
# Example of output for ${sensor_list}
# ['dcm0_cpu0', 'dcm0_cpu1', 'dcm1_cpu0', 'dcm1_cpu1']
- [RETURN] ${sensor_list}
+ RETURN ${sensor_list}
Get Sensor Id For Sensor
@@ -519,5 +519,5 @@
# Example of output for ${sensor_id} is 0x41.
- [RETURN] ${sensor_id}
+ RETURN ${sensor_id}
diff --git a/ipmi/test_ipmi_sol.robot b/ipmi/test_ipmi_sol.robot
index 853db02..18c08f2 100644
--- a/ipmi/test_ipmi_sol.robot
+++ b/ipmi/test_ipmi_sol.robot
@@ -382,7 +382,7 @@
${sol_info_dict}= Get SOL Info
${setting_status}= Get From Dictionary ${sol_info_dict} ${setting}
- [Return] ${setting_status}
+ RETURN ${setting_status}
Restore Default SOL Configuration
diff --git a/ipmi/test_ipmi_systeminfo_parameters.robot b/ipmi/test_ipmi_systeminfo_parameters.robot
index 06a590f..60a1d26 100644
--- a/ipmi/test_ipmi_systeminfo_parameters.robot
+++ b/ipmi/test_ipmi_systeminfo_parameters.robot
@@ -451,7 +451,7 @@
END
${fw_ver_hex}= Evaluate " ".join(${fw_ver_hex_list})
- [Return] ${fw_ver_hex} ${hex_data_list}
+ RETURN ${fw_ver_hex} ${hex_data_list}
Get System Info Set In Progress
@@ -462,7 +462,7 @@
... ${IPMI_RAW_CMD['System_Info']['param0_Set_In_Progress']['Get'][0]}
${resp}= Split String ${resp}
- [Return] ${resp}
+ RETURN ${resp}
Set System Info Set In Progress
@@ -484,7 +484,7 @@
... ${IPMI_RAW_CMD['System_Info']['param1_System_Firmware_Version']['Get'][0]}
${resp}= Split String ${resp}
- [Return] ${resp}
+ RETURN ${resp}
Set System Firmware Version
@@ -505,7 +505,7 @@
... ${IPMI_RAW_CMD['System_Info']['param2_System_Name']['Get'][0]}
${resp}= Split String ${resp}
- [Return] ${resp}
+ RETURN ${resp}
Set System Name
@@ -526,7 +526,7 @@
... ${IPMI_RAW_CMD['System_Info']['param3_Primary_Operating_System_Name']['Get'][0]}
${resp}= Split String ${resp}
- [Return] ${resp}
+ RETURN ${resp}
Set Primary OS Name
@@ -547,7 +547,7 @@
... ${IPMI_RAW_CMD['System_Info']['param4_Operating_System_Name']['Get'][0]}
${resp}= Split String ${resp}
- [Return] ${resp}
+ RETURN ${resp}
Set OS Name
@@ -568,7 +568,7 @@
... ${IPMI_RAW_CMD['System_Info']['param5_Present_OS_Version_number']['Get'][0]}
${resp}= Split String ${resp}
- [Return] ${resp}
+ RETURN ${resp}
Set Present OS Version Number
@@ -593,7 +593,7 @@
${prefix_list}= Prefix Bytes ${list}
${prefix_list}= Evaluate " ".join(${prefix_list})
- [Return] ${prefix_list}
+ RETURN ${prefix_list}
Suite Setup Execution
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index c0f06cd..7e2efce 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -708,4 +708,4 @@
${max_ids}= Fetch From Right ${maximum_ids} \:
${int_maximum_ids_count}= Convert To Integer ${max_ids}
- [Return] ${user_count} ${int_maximum_ids_count}
+ RETURN ${user_count} ${int_maximum_ids_count}