xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-02-26 15:21:05 +00:00
Code Issues Projects Releases Wiki Activity

Handle redfish modeling of some IB adapters

Browse Source 
IB adapters may be modeled with 'None' Ethernet elements.

Handle this and also check for InfiniBand instead.

Change-Id: I80b6769b3bb4c5f478cb48b261f5666dfd6a97e0
This commit is contained in:
Jarrod Johnson 2025-02-07 15:15:48 -05:00
parent 2cde74a34f
commit 345fd8b44e
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pyghmi/redfish/oem/generic.py
View File

@ -788,17 +788,29 @@ class OEMHandler(object):
if 'Name' not in nadinfo:
continue
nicname = nadinfo['Name']
if nicname == 'NetworkAdapter':
nicname = nadinfo.get('Model', nicname)
yieldinf = {}
macidx = 1
if 'Ports' in nadinfo:
for portinfo in self._get_expanded_data(
nadinfo['Ports']['@odata.id']).get('Members', []):
macs = [x for x in portinfo.get('Ethernet', {}).get('AssociatedMACAddresses', [])]
for mac in macs:
label = 'MAC Address {}'.format(macidx)
yieldinf[label] = _normalize_mac(mac)
macidx += 1
foundmacs = True
ethinfo = portinfo.get('Ethernet', {})
if ethinfo:
macs = [x for x in ethinfo.get('AssociatedMACAddresses', [])]
for mac in macs:
label = 'MAC Address {}'.format(macidx)
yieldinf[label] = _normalize_mac(mac)
macidx += 1
foundmacs = True
ibinfo = portinfo.get('InfiniBand', {})
if ibinfo:
macs = [x for x in ibinfo.get('AssociatedPortGUIDs', [])]
for mac in macs:
label = 'Port GUID {}'.format(macidx)
yieldinf[label] = mac
macidx += 1
foundmacs = True
macinfobyadpname[nicname] = yieldinf
else:
for ctrlr in nadinfo.get('Controllers', []):