IPMI DCMI robot codes with latest directives
Changes:
- Run KeyWord If is deprecated since Robot
Framework version 5.*, use 'IF' instead
Tested:
- Checked using robot dry-run to make sure the
syntax is not broken
Change-Id: I75f5908c3c04c26cc88d20aeca7c737f998032d1
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/ipmi/dcmi/test_dcmi_get_capabilities.robot b/ipmi/dcmi/test_dcmi_get_capabilities.robot
index 1d56112..9dc5bf6 100644
--- a/ipmi/dcmi/test_dcmi_get_capabilities.robot
+++ b/ipmi/dcmi/test_dcmi_get_capabilities.robot
@@ -46,12 +46,16 @@
IF ${slave_address_status} == True BREAK
END
- Run Keyword IF ${slave_address_status} == False Fail msg=Slave address is showing wrongly.
+ IF ${slave_address_status} == False
+ Fail msg=Slave address is showing wrongly.
+ END
${output}= Get Lines Containing String ${cmd_output} Slave address of device:
${slave_address_status_1}= Run Keyword And Return Status
... Should Be Equal ${output.strip()} ${slave_address_list[1]} ignore_case=True
${output_1}= Get Lines Containing String ${cmd_output} Channel number is
- Run Keyword IF ${slave_address_status_1} == True
- ... Should Be Equal ${output_1.strip()} ${supported_capabilities[7]}
- ... ELSE Should Match Regexp ${output.strip()} [1-9]+h
+ IF ${slave_address_status_1} == True
+ Should Be Equal ${output_1.strip()} ${supported_capabilities[7]}
+ ELSE
+ Should Match Regexp ${output.strip()} [1-9]+h
+ END
diff --git a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
index 2ee8810..eacd3e4 100644
--- a/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
+++ b/ipmi/dcmi/test_dcmi_get_temperature_reading.robot
@@ -135,14 +135,22 @@
${busctl_cmd_resp}= BMC Execute Command ${busctl_cmd}
${current_temp_value_from_dbus}= Get Regexp Matches ${busctl_cmd_resp[0]}
... \\.Value\\s+property\\s+d\\s+(\\S+)\\s 1
- Run Keyword If '${current_temp_value_from_dbus[0]}' == 'nan' and '${dcmi_reading_value}' == '0'
- ... Fail msg=sensor reading value is not present.
- Run Keyword If '${current_temp_value_from_dbus[0]}' != 'nan' and '${dcmi_reading_value}' == '0'
- ... Fail msg=sensor reading value is showing as 0 in dcmi get temperature raw command.
+
+ IF '${current_temp_value_from_dbus[0]}' == 'nan' and '${dcmi_reading_value}' == '0'
+ Fail msg=sensor reading value is not present.
+ END
+
+ IF '${current_temp_value_from_dbus[0]}' != 'nan' and '${dcmi_reading_value}' == '0'
+ Fail msg=sensor reading value is showing as 0 in dcmi get temperature raw command.
+ END
+
${dbus_reading_value}= Set Variable .${current_temp_value_from_dbus[0].split(".")[1].strip()}
${status}= Run Keyword And Return Status Should Be True ${dbus_reading_value} > .499
- Run Keyword If ${status} == False
- ... Fail msg=sensor reading value is showing wrongly in dcmi get temperature raw command.
+
+ IF ${status} == False
+ Fail msg=sensor reading value is showing wrongly in dcmi get temperature raw command.
+ END
+
${dbus_reading_value}= Set Variable ${current_temp_value_from_dbus[0].split(".")[0].strip()}
Should Be Equal ${dcmi_reading_value} ${dbus_reading_value}
... msg=sensor reading value is showing wrongly in dcmi get temperature raw command.
@@ -163,16 +171,18 @@
${ipmi_resp_list}= Split String ${ipmi_resp}
${temperature_reading}= Get From List ${ipmi_resp_list} ${get_reading_value}
${dcmi_reading}= Convert To Integer ${temperature_reading} 16
- Run Keyword If '${dcmi_reading}' == '0'
- ... Check Reading Value In D-Bus ${key} ${instance} ${dcmi_reading}
+ IF '${dcmi_reading}' == '0'
+ Check Reading Value In D-Bus ${key} ${instance} ${dcmi_reading}
+ END
${dcmi_temp_reading}= Convert To String ${dcmi_reading}
${ipmi_sensor_cmd_resp}= Get IPMI Sensor Reading ${key} ${instance}
${ipmi_sensor_cmd_resp_list}= Split String ${ipmi_sensor_cmd_resp} |
${ipmi_temp_reading}= Set Variable ${ipmi_sensor_cmd_resp_list[1].strip().split(".")[0]}
${reading_status}= Run Keyword And Return Status Should Be Equal
... ${dcmi_temp_reading} ${ipmi_temp_reading}
- Run Keyword If ${reading_status} == False
- ... Check Reading Value In D-Bus ${key} ${instance} ${dcmi_temp_reading}
+ IF ${reading_status} == False
+ Check Reading Value In D-Bus ${key} ${instance} ${dcmi_temp_reading}
+ END
Get IPMI Sensor Reading
[Documentation] Return ipmi sensor reading.
@@ -190,10 +200,10 @@
${sensor_name_status}= Run Keyword And Return Status Should Contain
... ${sensor_format} _
- ${sensor_name}= Run Keyword If ${sensor_name_status} == True
- ... Set Variable ${sensor_name_dbus}
- ... ELSE
- ... Replace String ${sensor_name} _ ${SPACE}
+ ${replaced_str}= Replace String ${sensor_name} _ ${SPACE}
+ ${sensor_name}= Set Variable If ${sensor_name_status} == True
+ ... ${sensor_name_dbus}
+ ... ${replaced_str}
${ret}= Run External IPMI Standard Command sensor | grep -i "${sensor_name}"