xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-08-28 17:46:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #270 from Obihoernchen/fix/fpc-sensor-enumeration

Browse Source 
Fix FPC/SMM sensor enumeration
This commit is contained in:
Jarrod Johnson
2026-08-10 18:31:20 -04:00
committed by GitHub
parent 8cbfaa9662 f5ee86f97e
commit 1a4475f64e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_server/aiohmi/ipmi/oem/lenovo/handler.py
+2 -2
View File
@@ -526,8 +526,8 @@ class OEMHandler(generic.OEMHandler):
yield await self.immhandler.get_oem_sensor_reading(name,
self.ipmicmd)
elif await self.is_fpc():
for name in nextscale.get_sensor_names(self.ipmicmd,
self._fpc_variant):
async for name in nextscale.get_sensor_names(
self.ipmicmd, self._fpc_variant):
yield await nextscale.get_sensor_reading(name, self.ipmicmd,
self._fpc_variant)
elif await self.has_ami():
confluent_server/aiohmi/ipmi/oem/lenovo/nextscale.py
+4 -4
View File
@@ -255,7 +255,7 @@ fpc_sensors = {
}
def get_sensor_names(ipmicmd, size):
async def get_sensor_names(ipmicmd, size):
global fpc_sensors
for name in fpc_sensors:
if size != 6 and name in ('Fan Power', 'Total Power Capacity',
@@ -272,7 +272,7 @@ def get_sensor_names(ipmicmd, size):
elemidx += 1
yield '{0} {1}'.format(name, elemidx)
elif 'elementsfun' in sensor:
for elemidx in range(sensor['elementsfun'](ipmicmd, size)):
for elemidx in range(await sensor['elementsfun'](ipmicmd, size)):
elemidx += 1
yield '{0} {1}'.format(name, elemidx)
elif 'elements' in sensor:
@@ -283,7 +283,7 @@ def get_sensor_names(ipmicmd, size):
yield name
def get_sensor_descriptions(ipmicmd, size):
async def get_sensor_descriptions(ipmicmd, size):
global fpc_sensors
for name in fpc_sensors:
if size != 6 and name in ('Fan Power', 'Total Power Capacity',
@@ -300,7 +300,7 @@ def get_sensor_descriptions(ipmicmd, size):
yield {'name': '{0} {1}'.format(name, elemidx),
'type': sensor['type']}
elif 'elementsfun' in sensor:
for elemidx in range(sensor['elementsfun'](ipmicmd, size)):
for elemidx in range(await sensor['elementsfun'](ipmicmd, size)):
elemidx += 1
yield {'name': '{0} {1}'.format(name, elemidx),
'type': sensor['type']}