diff options
| author | George Kraft <george.kraft@calxeda.com> | 2013-06-20 16:52:24 -0500 |
|---|---|---|
| committer | George Kraft <george.kraft@calxeda.com> | 2013-06-20 16:52:24 -0500 |
| commit | 0ac16c528c96bae2aee39a9901838059dca0a3f7 (patch) | |
| tree | 4a84b510b3b13d7135bb9858ebd0338e936d0799 | |
| parent | 1df4df675dbf81358880f529a49db01d40c0a248 (diff) | |
| download | cxmanage-0ac16c528c96bae2aee39a9901838059dca0a3f7.tar.gz | |
CXMAN-206: Remove error handling around bmc.check_firmware()
We expect it to raise a proper IpmiError now.
| -rw-r--r-- | cxmanage_api/node.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cxmanage_api/node.py b/cxmanage_api/node.py index efd38ba..467d896 100644 --- a/cxmanage_api/node.py +++ b/cxmanage_api/node.py @@ -702,11 +702,7 @@ class Node(object): raise Exception("Update failed (partition %i, not activated)" % partition_id) - result = self.bmc.check_firmware(partition_id) - if not hasattr(result, "crc32") or result.error != None: - raise Exception("Update failed (partition %i, post-crc32 fail)" - % partition_id) - + self.bmc.check_firmware(partition_id) def config_reset(self): """Resets configuration to factory defaults. @@ -1368,9 +1364,7 @@ class Node(object): self._wait_for_transfer(result.tftp_handle_id) # Verify crc and activate - result = self.bmc.check_firmware(partition_id) - if ((not hasattr(result, "crc32")) or (result.error != None)): - raise AttributeError("Node reported crc32 check failure") + self.bmc.check_firmware(partition_id) self.bmc.activate_firmware(partition_id) def _download_image(self, partition): |