xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2026-01-10 18:22:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge "Make storage layer information retrieval a bit more robust"

Browse Source
This commit is contained in:
Zuul
2025-10-08 11:54:36 +00:00
committed by Gerrit Code Review
parent 1dd3ad2d63 b3d08c048b
commit e0174b79bc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pyghmi/redfish/oem/lenovo/xcc3.py
View File

@@ -128,7 +128,9 @@ class OEMHandler(generic.OEMHandler):
anames = {}
for adata, _ in adapterdata:
skipadapter = False
clabel = adata['Slot']['Location']['PartLocation']['LocationType']
clabel = adata['Slot']['Location']['PartLocation'].get('LocationType','')
if not clabel:
clabel = adata['Slot']['Location']['PartLocation'].get('ServiceLabel', '').split("=")[0]
if clabel != 'Embedded':
aslot = adata['Slot']['Location']['PartLocation']['LocationOrdinalValue']
clabel = 'Slot {0}'.format(aslot)
@@ -240,10 +242,16 @@ class OEMHandler(generic.OEMHandler):
standalonedisks = []
pools = []
for item in rsp.get('Members',[]):
# Drives shown at 'Direct attached drives' in XCC
# cannot be used for RAID creation
if item['Id'].lower() == 'direct_attached_nvme':
continue
cdisks = [item['Drives'][i]['@odata.id'] for i in range(len(item['Drives']))]
cid = '{0},{1}'.format(
item['Id'],
item['StorageControllers'][0]['Location']['PartLocation'].get('LocationOrdinalValue', -1))
if item['Id'].lower() == 'vroc':
cid = 'vroc,0'
storage_pools = self._get_expanded_data(item['StoragePools']['@odata.id'])
for p in storage_pools['Members']:
vols = self._get_expanded_data(p['AllocatedVolumes']['@odata.id'])