xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-03-20 18:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Implement fastpath for delegated discovery

Browse Source 
When an enlisted discovery agent
notifies, skip slow searches and use
the agents information directly.
This commit is contained in:
Jarrod Johnson 2022-10-27 15:42:58 -04:00
parent f6d8294e83
commit d534f29c57
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
confluent_server/confluent/discovery/core.py
View File

@ -855,6 +855,47 @@ def get_smm_neighbor_fingerprints(smmaddr, cv):
continue
yield 'sha256$' + b64tohex(neigh['sha256'])
def get_nodename_sysdisco(cfg, handler, info):
switchname = info['forwarder_server']
switchnode = None
nl = cfg.filter_node_attributes('net.*switch=' + switchname)
brokenattrs = False
for n in nl:
na = cfg.get_node_attributes(n, 'net.*switchport').get(n, {})
for sp in na:
pv = na[sp].get('value', '')
if pv and macmap._namesmatch(info['port'], pv):
if switchnode:
log.log({'error': 'Ambiguous port information between {} and {}'.format(switchnode, n)})
brokenattrs = True
else:
switchnode = n
break
if brokenattrs or not switchnode:
return None
if 'enclosure_num' not in info:
return switchnode
chainlen = info['enclosure_num']
currnode = switchnode
while chainlen > 1:
nl = list(cfg.filter_node_attributes('enclosure.extends=' + currnode))
if len(nl) > 1:
log.log({'error': 'Multiple enclosures specify extending ' + currnode})
return None
if len(nl) == 0:
log.log({'error': 'No enclosures specify extending ' + currnode + ' but an enclosure seems to be extending it'})
return None
currnode = nl[0]
chainlen -= 1
if info['type'] == 'lenovo-smm2':
return currnode
else:
baynum = info['bay']
nl = cfg.filter_node_attributes('enclosure.manager=' + currnode)
nl = list(cfg.filter_node_attributes('enclosure.bay={0}'.format(baynum), nl))
if len(nl) == 1:
return nl[0]
def get_nodename(cfg, handler, info):
nodename = None
@ -883,6 +924,10 @@ def get_nodename(cfg, handler, info):
if not nodename and info['handler'] == pxeh:
enrich_pxe_info(info)
nodename = info.get('nodename', None)
if 'forwarder_server' in info:
# this has been registered by a remote discovery registry,
# thus verification and specific location is fixed
return get_nodename_sysdisco(cfg, handler, info), None
if not nodename:
# Ok, see if it is something with a chassis-uuid and discover by
# chassis

2
confluent_server/confluent/selfservice.py
View File

@ -203,6 +203,8 @@ def handle_request(env, start_response):
rb['addresses'] = [(newhost, newport)]
rb['forwarder_url'] = targurl
rb['forwarder_server'] = nodename
if 'bay' in rb:
rb['enclosure.bay'] = rb['bay']
if rb['type'] == 'lenovo-xcc':
ssdp.check_fish(('/DeviceDescription.json', rb), newport, verify_cert)
elif rb['type'] == 'lenovo-smm2':