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

modified depending on comments

Browse Source
This commit is contained in:
XuWei
2018-03-15 23:01:00 -04:00
parent 84fd513f3d
commit 5ff300df35
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-openbmc-py/lib/python/agent/common/utils.py
View File

@@ -82,19 +82,15 @@ def sort_string_with_numbers(origin_list):
new_list.sort()
return [string for __,string in new_list]
def exchange_mask(mask):
def mask_str2int(mask):
count_bit = lambda bin_str: len([i for i in bin_str if i=='1'])
mask_splited = mask.split('.')
mask_count = [count_bit(bin(int(i))) for i in mask_splited]
return sum(mask_count)
def exchange_maskint(mask_int):
bin_arr = ['0' for i in range(32)]
for i in range(mask_int):
bin_arr[i] = '1'
tmpmask = [''.join(bin_arr[i * 8:i * 8 + 8]) for i in range(4)]
tmpmask = [str(int(tmpstr, 2)) for tmpstr in tmpmask]
return '.'.join(tmpmask)
def mask_int2str(mask_int):
mask_num = (0x1 << 32) - (0x1 << (32 - mask_int))
return "%s.%s.%s.%s" % (str((mask_num >> 24) & 0xff), str((mask_num >>16)&0xff), str((mask_num >> 8) & 0xff), str(mask_num & 0xff))
class Messager(object):
def __init__(self, name=None):

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

@@ -167,7 +167,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
if (20-i) % 8 == 0:
self.callback.info('%s: Still waiting for dump %s to be generated... ' % (node, dump_id))
gevent.sleep( 15 )
sleep( 15 )
if flag:
self._dump_download(obmc, node, str(dump_id), flag_dump_process=True)
@@ -430,7 +430,9 @@ rmdir \"/tmp/$userid\" \n")
if not nic:
return self.callback.error('Can not get facing NIC for %s' % bmcip, node)
if (ip == netinfo[nic]['ip'] and netmask == utils.exchange_maskint(netinfo[nic]['netmask']) and
prefix = int(utils.mask_str2int(netmask))
if (ip == netinfo[nic]['ip'] and prefix == netinfo[nic]['netmask'] and
gateway == netinfo[nic]['gateway']):
if not vlan or vlan == str(netinfo[nic]['vlanid']):
self._print_bmc_netinfo(node, ip, netmask, gateway, vlan)
@@ -443,31 +445,29 @@ rmdir \"/tmp/$userid\" \n")
pre_nic = nic.split('_')[0]
try:
obmc.set_vlan(pre_nic, vlan)
gevent.sleep( 15 )
sleep( 15 )
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)
return
nic = pre_nic + '_' + vlan
prefix = int(utils.exchange_mask(netmask))
try:
obmc.set_netinfo(nic, ip, prefix, gateway)
gevent.sleep( 5 )
sleep( 5 )
nic_netinfo = obmc.get_nic_netinfo(nic)
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)
return
if not netinfo:
if not nic_netinfo:
return self.callback.error('Did not get info for NIC %s' % nic, node)
set_success = False
for net_id, attr in nic_netinfo.items():
if attr['ip'] == ip:
attr_netmask = utils.exchange_maskint(attr["netmask"])
if (attr_netmask == netmask and
attr['gateway'] == gateway):
set_success = True
if (attr['ip'] == ip and
attr["netmask"] == prefix and
attr['gateway'] == gateway):
set_success = True
if not set_success:
return self.callback.error('Config BMC IP failed', node)
@@ -519,7 +519,7 @@ rmdir \"/tmp/$userid\" \n")
if dic_length > 1:
addon_string = " for %s" % nic
netinfodict['ip'].append("BMC IP"+addon_string+": %s" % attrs["ip"])
netinfodict['netmask'].append("BMC Netmask"+addon_string+": %s" % utils.exchange_maskint(attrs["netmask"]))
netinfodict['netmask'].append("BMC Netmask"+addon_string+": %s" % utils.mask_int2str(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"])