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 <gabrioux@ibm.com>
(cherry picked from commit 9f72e688c79ebf7883801f108cec3772b16e8d3c)

diff --git a/src/cephadm/node-proxy/redfish_system.py b/src/cephadm/node-proxy/redfish_system.py
index 7c6ebe6de734536e5118aabd7d48fa804e93ce01..fbb26a33e4bd6505d32e2d4d82afdf86cc20ab65 100644 (file)
--- 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']