xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-02-14 19:59:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix async assumption about list_updates

Browse Source 
Turns out that the firmwaremanagemer methods will
generally not be async after all.
This commit is contained in:
Jarrod Johnson
2026-02-03 16:43:25 -05:00
parent 9ea971d9df
commit cdc668d717
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
View File

@@ -1727,15 +1727,15 @@ def update(nodes, element, configmanager, inputdata):
async def retrieve(nodes, element, configmanager, inputdata):
initthread()
if '/'.join(element).startswith('inventory/firmware/updates/active'):
async for ret in firmwaremanager.list_updates(nodes, configmanager.tenant,
for ret in firmwaremanager.list_updates(nodes, configmanager.tenant,
element):
yield ret
elif '/'.join(element).startswith('media/uploads'):
async for ret in firmwaremanager.list_updates(nodes, configmanager.tenant,
for ret in firmwaremanager.list_updates(nodes, configmanager.tenant,
element, 'mediaupload'):
yield ret
elif '/'.join(element).startswith('support/servicedata'):
async for ret in firmwaremanager.list_updates(nodes, configmanager.tenant,
for ret in firmwaremanager.list_updates(nodes, configmanager.tenant,
element, 'ffdc'):
yield ret
else:

8
confluent_server/confluent/plugins/hardwaremanagement/redfish.py
View File

@@ -922,7 +922,7 @@ class IpmiHandler:
await self.output.put(errorneeded)
async def handle_update_status(self):
activeupdates = list(await firmwaremanager.list_updates([self.node], None, []))
activeupdates = list(firmwaremanager.list_updates([self.node], None, []))
if activeupdates:
await self.output.put(msg.KeyValueData({'status': 'active'}, self.node))
else:
@@ -1627,15 +1627,15 @@ async def update(nodes, element, configmanager, inputdata):
async def retrieve(nodes, element, configmanager, inputdata):
if '/'.join(element).startswith('inventory/firmware/updates/active'):
async for x in firmwaremanager.list_updates(nodes, configmanager.tenant,
for x in firmwaremanager.list_updates(nodes, configmanager.tenant,
element):
yield x
elif '/'.join(element).startswith('media/uploads'):
async for x in firmwaremanager.list_updates(nodes, configmanager.tenant,
for x in firmwaremanager.list_updates(nodes, configmanager.tenant,
element, 'mediaupload'):
yield x
elif '/'.join(element).startswith('support/servicedata'):
async for x in firmwaremanager.list_updates(nodes, configmanager.tenant,
for x in firmwaremanager.list_updates(nodes, configmanager.tenant,
element, 'ffdc'):
yield x
else: