From: Guillaume Abrioux Date: Mon, 22 May 2023 12:25:35 +0000 (+0200) Subject: node-proxy: redfish_system.get_system refactor X-Git-Tag: v18.2.4~314^2~102 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8b02305f1bc64b71fb4e3fbc8a31084beca0b8c;p=ceph.git node-proxy: redfish_system.get_system refactor This method should return the 'unified structure' version of the collected data instead of the huge json returned by redfish. Signed-off-by: Guillaume Abrioux (cherry picked from commit 9f72e688c79ebf7883801f108cec3772b16e8d3c) --- diff --git a/src/cephadm/node-proxy/redfish_system.py b/src/cephadm/node-proxy/redfish_system.py index 7c6ebe6de734..fbb26a33e4bd 100644 --- a/src/cephadm/node-proxy/redfish_system.py +++ b/src/cephadm/node-proxy/redfish_system.py @@ -29,7 +29,12 @@ class RedfishSystem(System): self.client.login() def get_system(self): - return self._system + result = { + 'storage': self.get_storage(), + 'processors': self.get_processors(), + 'network': self.get_network(), + } + return result def get_status(self): return self._system['Status']