Revert "Automation fix for code update"
This reverts commit 9066c059fdb094cbe786c288a921601864049ed2.
Reason for revert:
Redfish BMC Code Update :: Update the firmware image. | [31mFAIL[0m |
No keyword with name 'AND 'xx.xx.xx-g4bf5dd1ef' == 'xx.xx.xx-g6b70a894a'' found.
Change-Id: Ifec804aaf38768708cc3ad1342db791e36c5fd08
diff --git a/lib/redfish_code_update_utils.robot b/lib/redfish_code_update_utils.robot
index 40a1595..7f82c1f 100644
--- a/lib/redfish_code_update_utils.robot
+++ b/lib/redfish_code_update_utils.robot
@@ -135,10 +135,6 @@
# functional_state Functional state can be either True or False.
${resp}= Filter Struct ${sw_inv} [('functional', ${functional_state})]
-
- ${num_records}= Get Length ${resp}
- Return From Keyword If ${num_records} == ${0} ${EMPTY}
-
${list_inv_dict}= Get Dictionary Values ${resp}
[Return] ${list_inv_dict}[0]
diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index 228622e..fafc3c5 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -59,11 +59,10 @@
${sw_inv}= Get Functional Firmware BMC image
${nonfunctional_sw_inv}= Get Non Functional Firmware ${sw_inv} False
- ${num_records}= Get Length ${nonfunctional_sw_inv}
# Redfish active software image API.
Run Keyword If not ${FORCE_UPDATE}
- ... Run Keyword If ${num_records} > 0 AND '${nonfunctional_sw_inv['version']}' == '${image_version}'
+ ... Run Keyword If '${nonfunctional_sw_inv['version']}' == '${image_version}'
... Run Keywords Switch Backup Firmware Image To Functional AND
... Wait For Reboot start_boot_seconds=${state['epoch_seconds']} AND
... Redfish Verify BMC Version ${IMAGE_FILE_PATH} AND