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

Update rspconfig in python PR based on comments

Browse Source
This commit is contained in:
ertaozh 2018-02-22 23:18:55 -05:00
parent 6ed2e68c59
commit 01f80c52f9
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,9 +101,10 @@ rmdir \"/tmp/$userid\" \n")
debugmode=self.debugmode, verbose=self.verbose)
try:
obmc.login()
obmc.set_ipdhcp(key)
obmc.set_ipdhcp()
except (SelfServerException, SelfClientException) as e:
self.callback.info("%s: %s" % (node, e.message))
return
self.callback.info("%s: BMC Setting IP to DHCP..." % (node))
try:
@ -214,38 +215,34 @@ rmdir \"/tmp/$userid\" \n")
if hostname:
self.callback.info("%s: BMC Hostname: %s" %(node, bmchostname))
dic_length = len(netinfo)
ip_list = []
ipsrc_list = []
netmask_list = []
gateway_list = []
vlan_list = []
ntpserver_list = []
netinfodict = {'ip':[], 'netmask':[], 'gateway':[],
'vlan':[], 'ipsrc':[], 'ntpserver':[]}
for nic,attrs in netinfo.items():
addon_string = ''
if dic_length > 1:
addon_string = " for %s" % nic
ip_list.append("BMC IP"+addon_string+": %s" % attrs["ip"])
netmask_list.append("BMC Netmask"+addon_string+": %s" % attrs["netmask"])
gateway_list.append("BMC Gateway"+addon_string+": %s (default: %s)" % (attrs["gateway"], defaultgateway))
vlan_list.append("BMC VLAN ID"+addon_string+": %s" % attrs["vlanid"])
ipsrc_list.append("BMC IP Source"+addon_string+": %s" % attrs["ipsrc"])
ntpserver_list.append("BMC NTP Servers"+addon_string+": %s" % attrs["ntpservers"])
netinfodict['ip'].append("BMC IP"+addon_string+": %s" % attrs["ip"])
netinfodict['netmask'].append("BMC Netmask"+addon_string+": %s" % attrs["netmask"])
netinfodict['gateway'].append("BMC Gateway"+addon_string+": %s (default: %s)" % (attrs["gateway"], defaultgateway))
netinfodict['vlan'].append("BMC VLAN ID"+addon_string+": %s" % attrs["vlanid"])
netinfodict['ipsrc'].append("BMC IP Source"+addon_string+": %s" % attrs["ipsrc"])
netinfodict['ntpserver'].append("BMC NTP Servers"+addon_string+": %s" % attrs["ntpservers"])
if ip:
for i in ip_list:
for i in netinfodict['ip']:
self.callback.info("%s: %s" % (node, i))
if netmask:
for i in netmask_list:
for i in netinfodict['netmask']:
self.callback.info("%s: %s" % (node, i))
if gateway:
for i in gateway_list:
for i in netinfodict['gateway']:
self.callback.info("%s: %s" % (node, i))
if ipsrc:
for i in ipsrc_list:
for i in netinfodict['ipsrc']:
self.callback.info("%s: %s" % (node, i))
if vlan:
for i in vlan_list:
for i in netinfodict['vlan']:
self.callback.info("%s: %s" % (node, i))
if ntpserver:
for i in ntpserver_list:
for i in netinfodict['netserver']:
self.callback.info("%s: %s" % (node, i))
return netinfo

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

@ -554,7 +554,7 @@ class OpenBMCRest(object):
utils.update2Ddict(netinfo, nicid, "ip", v["Address"])
if dev in data:
info = data[dev]
utils.update2Ddict(netinfo, nicid, "vlanid", info["Id"])
utils.update2Ddict(netinfo, nicid, "vlanid", info.get("Id", "Disable"))
utils.update2Ddict(netinfo, nicid, "mac", info["MACAddress"])
utils.update2Ddict(netinfo, nicid, "ntpservers", info["NTPServers"])
return netinfo