node-proxy: various unified interface changes

this slightly modifies the data structure of the unified interface.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit b853761836febe92f6460a13d554cd966ff2e529)
(cherry picked from commit ecc84f5b5aa8f8e45d5068956117ca793f805e18)

diff --git a/src/cephadm/node-proxy/data.py b/src/cephadm/node-proxy/data.py
index b8e69f39078ba3dbc74e0bacd93efcbde68fb7c1..70339011e4ac252d995900f89552d44f513520ed 100644 (file)
--- a/src/cephadm/node-proxy/data.py
+++ b/src/cephadm/node-proxy/data.py
@@ -14,9 +14,10 @@ system_1 = {
         'Health': 'OK'
     },
 
-    'processor': {
+    'processors': [{
         'description': '',
-        'count': '',
+        'cores': '',
+        'threads': '',
         'type': '',
         'model': '',
         'temperature': '',
@@ -24,7 +25,7 @@ system_1 = {
             'State': 'Enabled',
             'Health': 'OK'
         }
-    },
+    }],
 
     'memory': {
         'description': '',
@@ -56,6 +57,9 @@ system_1 = {
             {
                 'device': 'devc',
                 'description': 'Milk, Cheese, Bread, Fruit, Vegetables',
+                'serial_number': 'xxxxx',
+                'location': '1I:x:y',
+                'interface_type': 'SATA',
                 'model': 'Buy groceries',
                 'type': 'ssd|rotate|nvme',
                 'capacity_bytes': '',
@@ -68,8 +72,8 @@ system_1 = {
         ]
     },
 
-    'power': {
-        'power_supplies': [
+    'power':
+        [{
             'type': 'xx',
             'manufacturer': 'xxx',
             'model': 'xx',
@@ -79,14 +83,16 @@ system_1 = {
                 'State': 'Enabled',
                 'Health': 'OK'
             }
-        ]
-    },
+        }],
 
-    'cooling': {
+    'thermal': {
         'fans': [
             {
                 'id': 1,
-                'status': '',
+                'status': {
+                    'State': 'Enabled',
+                    'Health': 'OK'
+                }
             }
         ]
     },