xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Improve autosense of other nics

Browse Source
This commit is contained in:
Jarrod Johnson 2021-10-27 17:12:03 -04:00
parent 621ded7256
commit 00b22bb18b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
confluent_server/confluent/netutil.py
View File

@ -244,9 +244,23 @@ class NetManager(object):
myattribs['current_nic'] = True
myattribs['ipv6_address'] = '{0}/{1}'.format(ipv6addr, addr[2])
if '/' not in myattribs.get('ipv6_address', '/'):
ipn = socket.inet_pton(socket.AF_INET6, myattribs['ipv6_address'])
plen = 64
for addr in get_my_addresses():
if addr[0] != socket.AF_INET6:
continue
if ipn_on_same_subnet(addr[0], ipn, addr[1], addr[2]):
plen = addr[2]
myattribs['ipv6_address'] += '/64'
if '/' not in myattribs.get('ipv4_address', '/'):
myattribs['ipv4_address'] += '/16'
ipn = socket.inet_pton(socket.AF_INET, myattribs['ipv4_address'])
plen = 16
for addr in get_my_addresses():
if addr[0] != socket.AF_INET:
continue
if ipn_on_same_subnet(addr[0], ipn, addr[1], addr[2]):
plen = addr[2]
myattribs['ipv4_address'] += '/'.format(plen)
if 'current_nic' not in myattribs:
myattribs['current_nic'] = False