From cdc668d7178b9ee081740c92fcbe948769eee82e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 3 Feb 2026 16:43:25 -0500 Subject: [PATCH] Fix async assumption about list_updates Turns out that the firmwaremanagemer methods will generally not be async after all. --- .../confluent/plugins/hardwaremanagement/ipmi.py | 6 +++--- .../confluent/plugins/hardwaremanagement/redfish.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 54f1b020..9de80934 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -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: diff --git a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py index f983c96e..d803720d 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py @@ -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: