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

Add SMM3 to chained SMM logic

Browse Source
This commit is contained in:
Jarrod Johnson 2025-02-20 15:42:49 -05:00
parent 5fda02b9e0
commit 3a3f3a961d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,7 +1087,7 @@ def get_nodename(cfg, handler, info):
# Ok, see if it is something with a chassis-uuid and discover by
# chassis
nodename = get_nodename_from_enclosures(cfg, info)
if not nodename and handler.devname == 'SMM':
if not nodename and handler.devname in ('SMM', 'SMM3'):
nodename = get_nodename_from_chained_smms(cfg, handler, info)
if not nodename: # as a last resort, search switches for info
# This is the slowest potential operation, so we hope for the
@ -1095,7 +1095,7 @@ def get_nodename(cfg, handler, info):
nodename, macinfo = macmap.find_nodeinfo_by_mac(info['hwaddr'], cfg)
maccount = macinfo['maccount']
if nodename:
if handler.devname == 'SMM':
if handler.devname in ('SMM', 'SMM3'):
nl = list(cfg.filter_node_attributes(
'enclosure.extends=' + nodename))
if nl:
@ -1118,7 +1118,7 @@ def get_nodename(cfg, handler, info):
return None, None
if (nodename and
not handler.discoverable_by_switch(macinfo['maccount'])):
if handler.devname == 'SMM':
if handler.devname in ('SMM', 'SMM3'):
errorstr = 'Attempt to discover SMM by switch, but chained ' \
'topology or incorrect net attributes detected, ' \
'which is not compatible with switch discovery ' \