xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Catch BMC status error from get status request

Browse Source
This commit is contained in:
Mark Gurevich 2018-03-21 14:55:48 -04:00
parent 11ea3b6e82
commit 6698609aaa
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
View File

@ -82,6 +82,11 @@ class OpenBMCPowerTask(ParallelNodesCommand):
if bmc_state != 'Ready':
bmc_state = bmc_not_ready
bmc_state_error = state.get('error')
if bmc_state_error is not None:
# BMC is not ready and we have some error as to why
self.callback.info('%s: %s (%s)' % (node, openbmc.RPOWER_STATES.get(bmc_state, bmc_state), bmc_state_error))
return bmc_state
self.callback.info('%s: %s' % (node, openbmc.RPOWER_STATES.get(bmc_state, bmc_state)))

7
xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
View File

@ -320,6 +320,8 @@ class OpenBMCRest(object):
'Validate BMC configuration and retry the command.'
self._print_error_log(e.message, cmd)
raise
except SelfClientException as e:
raise SelfClientException(e.message, e.code)
except ValueError:
error = 'Received wrong format response: %s' % response
self._print_error_log(error, cmd)
@ -410,9 +412,12 @@ class OpenBMCRest(object):
def get_bmc_state(self):
state = self.request('GET', BMC_URLS['state']['path'], cmd='get_bmc_state')
try:
state = self.request('GET', BMC_URLS['state']['path'], cmd='get_bmc_state')
return {'bmc': state.split('.')[-1]}
except SelfClientException as e:
# Return error message received from the request
return {'bmc': "NotReady", 'error': e.message}
except KeyError:
error = 'Received wrong format response: %s' % state
raise SelfServerException(error)