From 5a81279b9d083697f5c71d4c792faf7059fdf443 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 15 Mar 2021 16:45:43 -0400 Subject: [PATCH] Fix servicedata fetch In the new framework with filehandle passing, the provided callback must accept a data argument. get_diags can't actually use it, but does have to accept a token value. --- confluent_server/confluent/plugins/hardwaremanagement/ipmi.py | 2 +- .../confluent/plugins/hardwaremanagement/redfish.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 881d336d..f9b73f29 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -603,7 +603,7 @@ class IpmiHandler(object): self.output.put(msg.CreatedResource( 'nodes/{0}/media/uploads/{1}'.format(self.node, u.name))) - def get_diags(self, savefile, progress): + def get_diags(self, savefile, progress, data=None): return self.ipmicmd.get_diagnostic_data( savefile, progress=progress, autosuffix=True) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py index 1f7eab97..20fde9da 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py @@ -468,7 +468,7 @@ class IpmiHandler(object): self.output.put(msg.CreatedResource( 'nodes/{0}/media/uploads/{1}'.format(self.node, u.name))) - def get_diags(self, savefile, progress): + def get_diags(self, savefile, progress, data=None): return self.ipmicmd.get_diagnostic_data( savefile, progress=progress, autosuffix=True)