Fix deprecated Exit For Loop builtin for IPMI
Changes:
- Exit For Loop If is deprecated since
Robot Framework version 5.*, use IF and BREAK instead
Tested:
- Checked using robot dry-run to make sure the
syntax is not broken
Change-Id: I25903fb2937325b5c78ba412b44c16d6e9e1558a
Signed-off-by: Sridevi Ramesh <sridevra@in.ibm.com>
diff --git a/ipmi/dcmi/test_dcmi_get_capabilities.robot b/ipmi/dcmi/test_dcmi_get_capabilities.robot
index 91eb869..1d56112 100644
--- a/ipmi/dcmi/test_dcmi_get_capabilities.robot
+++ b/ipmi/dcmi/test_dcmi_get_capabilities.robot
@@ -43,7 +43,7 @@
FOR ${slave_address} IN @{slave_address_list}
${slave_address_status}= Run Keyword And Return Status
... Should Contain ${cmd_output} ${slave_address} ignore_case=True
- Exit For Loop IF ${slave_address_status} == True
+ IF ${slave_address_status} == True BREAK
END
Run Keyword IF ${slave_address_status} == False Fail msg=Slave address is showing wrongly.
diff --git a/ipmi/test_ipmi_fru.robot b/ipmi/test_ipmi_fru.robot
index e10eb8b..7dd8ff3 100644
--- a/ipmi/test_ipmi_fru.robot
+++ b/ipmi/test_ipmi_fru.robot
@@ -86,10 +86,10 @@
Exit For Loop IF "${value}" == "${EMPTY}"
FOR ${ipmi_fru_component} IN ${ipmi_fru_component_obj}
FOR ${redfish_fru_component} IN ${redfish_fru_component_obj}
- Run Keyword If '${ipmi_fru_component['product_name']}' == '${redfish_fru_component['Name']}'
- ... Should Contain ${redfish_fru_component_obj['${value}']}
- ... ${ipmi_fru_component_obj['${key}']}
- ... msg=Comparison failed.
+ IF '${ipmi_fru_component['product_name']}' == '${redfish_fru_component['Name']}'
+ Should Contain ${redfish_fru_component_obj['${value}']}
+ ... ${ipmi_fru_component_obj['${key}']} msg=Comparison failed.
+ END
END
END
END
diff --git a/ipmi/test_ipmi_fru_device.robot b/ipmi/test_ipmi_fru_device.robot
index cb1af7e..3c7bc7e 100644
--- a/ipmi/test_ipmi_fru_device.robot
+++ b/ipmi/test_ipmi_fru_device.robot
@@ -190,10 +190,11 @@
IF '${ipmi_fru_board_serial_status}' == 'True' BREAK
END
${frudata}= Get From List ${output} ${num}
- ${serial_no}= Run Keyword If '${ipmi_fru_board_serial_status}' == 'True'
- ... Get Lines Containing String ${frudata} Board Serial
- ... ELSE
- ... Get Lines Containing String ${frudata} Product Serial
+
+ ${serial_str}= Set Variable If '${ipmi_fru_board_serial_status}' == 'True'
+ ... Board Serial Product Serial
+
+ ${serial_no}= Get Lines Containing String ${frudata} ${serial_str}
# Get each device and split field as key and value and append to a dictionary.
${serial_nos}= Set Variable ${serial_no.strip()}
@@ -232,8 +233,9 @@
${dbus_output}= Execute DBUS Introspect Command ${cmd}
${dbus_fru_board_serial_status}= Run Keyword And Return Status Should Contain ${dbus_output} .BOARD_SERIAL
${dbus_fru_product_serial_status}= Run Keyword And Return Status Should Contain ${dbus_output} .PRODUCT_SERIAL
- Run Keyword If '${dbus_fru_board_serial_status}' == 'True' or '${dbus_fru_product_serial_status}' == 'True'
- ... Create Dictionary For DBUS URI ${dbus_output} ${ipmi_fru} ${dbus_fru_board_serial_status} ${cmd}
+ IF '${dbus_fru_board_serial_status}' == 'True' or '${dbus_fru_product_serial_status}' == 'True'
+ Create Dictionary For DBUS URI ${dbus_output} ${ipmi_fru} ${dbus_fru_board_serial_status} ${cmd}
+ END
END
@@ -253,16 +255,20 @@
# If matches then, sets the serial number as key and FRU uri as value.
# ${dbus_dict} defined under variable section.
FOR ${ipmi_fru_serial_no} IN @{ipmi_fru.keys()}
- ${serial_no}= Run Keyword If '${dbus_fru_board_serial_status}' == 'True'
- ... Get Lines Containing String ${dbus_output} .BOARD_SERIAL
- ... ELSE
- ... Get Lines Containing String ${dbus_output} .PRODUCT_SERIAL
+ ${serial_str}= Set Variable If '${ipmi_fru_board_serial_status}' == 'True'
+ ... Board Serial Product Serial
+
+ ${serial_no}= Get Lines Containing String ${frudata} ${serial_str}
+
${serial_no}= Split String ${serial_no} "
${dbus_serial_no}= Set Variable ${serial_no[1].strip()}
- ${serial_no_status}= Run Keyword And Return Status Should Be Equal As Strings ${ipmi_fru_serial_no} ${dbus_serial_no}
- Run Keyword If '${serial_no_status}' == 'True'
- ... Run Keywords Set To Dictionary ${dbus_dict} ${dbus_serial_no} ${fru_command} AND
- ... Exit For Loop
+ ${serial_no_status}= Run Keyword And Return Status Should Be Equal As Strings
+ ... ${ipmi_fru_serial_no} ${dbus_serial_no}
+
+ IF '${serial_no_status}' == 'True'
+ Set To Dictionary ${dbus_dict} ${dbus_serial_no} ${fru_command}
+ BREAK
+ END
END
diff --git a/ipmi/test_ipmi_network_configuration.robot b/ipmi/test_ipmi_network_configuration.robot
index 6fe622b..0861bc0 100644
--- a/ipmi/test_ipmi_network_configuration.robot
+++ b/ipmi/test_ipmi_network_configuration.robot
@@ -205,7 +205,7 @@
[Documentation] Restore the configuration to its pre-test state.
${length}= Get Length ${initial_lan_config}
- Return From Keyword If ${length} == ${0}
+ IF ${length} == ${0} RETURN
Set IPMI Inband Network Configuration ${ip_address} ${subnet_mask}
... ${initial_lan_config['Default Gateway IP']} login=${0}
@@ -227,9 +227,10 @@
@{network_configurations}= Get Network Configuration
FOR ${network_configuration} IN @{network_configurations}
- Run Keyword If '${network_configuration['Address']}' == '${ip_address}'
- ... Run Keywords Set Suite Variable ${subnet_mask} ${network_configuration['SubnetMask']} AND
- ... Exit For Loop
+ IF '${network_configuration['Address']}' == '${ip_address}'
+ Set Suite Variable ${subnet_mask} ${network_configuration['SubnetMask']}
+ BREAK
+ END
END
Test Teardown Execution
diff --git a/ipmi/test_ipmi_network_verification.robot b/ipmi/test_ipmi_network_verification.robot
index 5f03c33..63be3df 100644
--- a/ipmi/test_ipmi_network_verification.robot
+++ b/ipmi/test_ipmi_network_verification.robot
@@ -107,7 +107,7 @@
${ip_address_source}=
... Set Variable if '${ipv4_address['Address']}' == '${lan_config['IP Address']}'
... ${ipv4_address['AddressOrigin']} Address
- Exit For Loop IF "${ip_address_source}" != 'None'
+ IF "${ip_address_source}" != 'None' BREAK
END
Valid Value lan_config['IP Address Source'] ['${ip_address_source}']
@@ -324,11 +324,11 @@
[Documentation] Verify the channel info.
[Arguments] ${channel_number} ${network_parameter} ${valid_channels_list}
- Run Keyword If '${network_parameter}' == 'IPv4StaticAddresses'
- ... Verify IPv4 Static Address ${channel_number} ${valid_channels_list}
- ... ELSE IF '${network_parameter}' == 'MACAddress'
- ... Verify MAC Address ${channel_number} ${valid_channels_list}
-
+ IF '${network_parameter}' == 'IPv4StaticAddresses'
+ Verify IPv4 Static Address ${channel_number} ${valid_channels_list}
+ ELSE IF '${network_parameter}' == 'MACAddress'
+ Verify MAC Address ${channel_number} ${valid_channels_list}
+ END
Verify IPv4 Static Address
[Documentation] Verify the IPv4 Static Address.
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index 1c94f1a..a05caeb 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -604,7 +604,7 @@
... user set password ${random_userid} ${password} ${password_option}
Rprint Vars status
Valid Value status [${expected_result}]
- Return From Keyword If '${expected_result}' == '${False}'
+ IF '${expected_result}' == '${False}' RETURN
# Set admin privilege and enable IPMI messaging for newly created user.
Set Channel Access ${random_userid} ipmi=on privilege=${admin_level_priv}
@@ -651,7 +651,7 @@
Check Enabled User Count
# Skip root user checking if user decides not to use root user as default.
- Run Keyword If '${IPMI_USERNAME}' == 'root' Determine Root User Id
+ IF '${IPMI_USERNAME}' == 'root' Determine Root User Id
Determine Root User Id
@@ -668,13 +668,13 @@
${root_found}= Get Lines Matching Regexp ${line} ${root_pattern}
IF '${root_found}' != '${EMPTY}'
${root_userid}= Set Variable ${id_index}
- Exit For Loop
+ BREAK
END
END
Set Suite Variable ${root_userid}
Log To Console The root user ID is ${root_userid}.
- Run Keyword If ${root_userid} < ${1} Fail msg= Did not identify root user ID.
+ IF ${root_userid} < ${1} Fail msg= Did not identify root user ID.
Wait And Confirm New Username And Password