CXMAN-255: Don't retry on firware reset errors

1 files changed, 13 insertions, 4 deletions

diff --git a/cxmanage_api/node.py b/cxmanage_api/node.py
index 133ebb1..2897945 100644
--- a/cxmanage_api/node.py
+++ b/cxmanage_api/node.py
@@ -923,16 +923,25 @@ updating the EEPROM
 communication.
 
         """
-        # Reset CDB
-        self.bmc.reset_firmware()
+        try:
+
+            # Reset CDB
+            self.bmc.reset_firmware()
+
+        except IpmiError as err:
+            if ('Error resetting firmware to factory default' != str(err)):
+                raise
 
-        # Reset ubootenv
-        fwinfo = self.get_firmware_info()
         try:
+
+            # Reset ubootenv
+            fwinfo = self.get_firmware_info()
+
             running_part = self._get_partition(fwinfo, "UBOOTENV", "FIRST")
             factory_part = self._get_partition(fwinfo, "UBOOTENV", "SECOND")
             image = self._download_image(factory_part)
             self._upload_image(image, running_part)
+
         except NoPartitionError:
             pass  # Only one partition? Don't mess with it!