xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

catch all type error for rspconfig options (#5048)

Browse Source
This commit is contained in:
xuweibj 2018-04-03 17:44:33 +08:00 committed by Bin Xu
parent 3e9acb10d2
commit eb967a72e6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
View File

@ -145,7 +145,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
for key in keys:
self._dump_download(obmc, node, str(key))
except SelfServerException as e:
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)
def dump_process(self, **kw):
@ -174,7 +174,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
else:
self.callback.error('Could not find dump %s after waiting %d seconds.' % (dump_id, 20 * 15), node)
except SelfServerException as e:
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)
def gard_clear(self, **kw):
@ -188,7 +188,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
obmc.clear_gard()
self.callback.info('%s: GARD cleared' % node)
except SelfServerException as e:
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)
def pre_set_sshcfg(self, *arg, **kw):

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

@ -198,8 +198,8 @@ RSPCONFIG_APIS = {
'get_data': [],
'display_name': "BMC PowerSupplyRedundancy",
'attr_values': {
'disabled': "Disables",
'enabled': "Enabled",
'disabled': ["Disables"],
'enabled': ["Enabled"],
},
},
'powerrestorepolicy': {
@ -751,7 +751,11 @@ class OpenBMCRest(object):
data = attr_info['attr_values'][value]
else:
data = value
self.request('PUT', set_url, payload={"data": data}, cmd="set_%s" % key)
method = 'PUT'
if key == 'powersupplyredundancy':
method = 'POST'
self.request(method, set_url, payload={"data": data}, cmd="set_%s" % key)
def get_apis_values(self, key):
attr_info = RSPCONFIG_APIS[key]