xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 11:22:27 +00:00
Code Issues Releases Wiki Activity

Show error msg when set hostname as IP address

Browse Source
This commit is contained in:
XuWei
2018-04-08 22:27:14 -04:00
parent 1aeaefeadf
commit dc61ea57da
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,9 +301,10 @@ rmdir \"/tmp/$userid\" \n")
def _set_hostname(self, hostname, **kw):
node = kw['node']
if hostname == '*':
if kw['nodeinfo']['bmc'] == kw['nodeinfo']['bmcip']:
self.callback.info("%s: set BMC ip as BMC Hostname" % node)
hostname = kw['nodeinfo']['bmc']
if kw['nodeinfo']['bmc'] != kw['nodeinfo']['bmcip']:
hostname = kw['nodeinfo']['bmc']
else:
return self.callback.error("Invalid OpenBMC Hostname %s, can't set to OpenBMC" % kw['nodeinfo']['bmc'], node)
self._set_apis_values("hostname", hostname, **kw)
self._get_netinfo(hostname=True, ntpserver=False, **kw)
return
@@ -383,7 +384,15 @@ rmdir \"/tmp/$userid\" \n")
try:
obmc.login()
obmc.set_apis_values(key, value)
except (SelfServerException, SelfClientException) as e:
except SelfServerException as e:
return self.callback.error(e.message, node)
except SelfClientException:
if e.code == 404:
return self.callback.error('404 Not Found - Requested endpoint does not exists and may \
indicate function is not supported on this OpenBMC firmware.', node)
if e.code == 403:
return self.callback.error('403 Forbidden - Requested endpoint does not exists and may \
indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error(e.message, node)
self.callback.info("%s: BMC Setting %s..." % (node, openbmc.RSPCONFIG_APIS[key]['display_name']))
@@ -396,7 +405,15 @@ rmdir \"/tmp/$userid\" \n")
obmc.login()
value = obmc.get_apis_values(key)
except (SelfServerException, SelfClientException) as e:
except SelfServerException as e:
return self.callback.error(e.message, node)
except SelfClientException:
if e.code == 404:
return self.callback.error('404 Not Found - Requested endpoint does not exists and may \
indicate function is not supported on this OpenBMC firmware.', node)
if e.code == 403:
return self.callback.error('403 Forbidden - Requested endpoint does not exists and may \
indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error(e.message, node)
if isinstance(value, dict):