Implements: #1353

Author: micafer

IM/Stats.py

@@ -57,14 +57,16 @@ def _get_data(str_data, auth=None):
         resp['cloud_type'] = None
         resp['cloud_host'] = None
         resp['hybrid'] = False
-        for vm_data in dic['vm_list']:
+        for str_vm_data in dic['vm_list']:
+            vm_data = json.loads(str_vm_data)
+            cloud_data = json.loads(vm_data["cloud"])
 
             # only get the cloud of the first VM
             if not resp['cloud_type']:
-                resp['cloud_type'] = vm_data["cloud"]["type"]
+                resp['cloud_type'] = cloud_data["type"]
             if not resp['cloud_host']:
-                resp['cloud_host'] = vm_data["cloud"]["server"]
-            elif resp['cloud_host'] != vm_data["cloud"]["server"]:
+                resp['cloud_host'] = cloud_data["server"]
+            elif resp['cloud_host'] != cloud_data["server"]:
                 resp['hybrid'] = True
 
             vm_sys = parse_radl(vm_data['info']).systems[0]

test/unit/test_im_logic.py

@@ -1411,20 +1411,8 @@ def test_get_stats(self, check_auth_data, DataBase):
             "creation_date": 1646655374,
             "extra_info": {"TOSCA": yaml.dump({"metadata": {"icon": "kubernetes.png"}})},
             "vm_list": [
-                {
-                 "cloud": {
-                     "type": "OSCAR",
-                     "server": "sharp-elbakyan5.im.grycap.net",
-                 },
-                 "info": radl
-                },
-                {
-                 "cloud": {
-                     "type": "OSCAR",
-                     "server": "sharp-elbakyan5.im.grycap.net",
-                 },
-                 "info": radl
-                }
+                json.dumps({"cloud": '{"type": "OSCAR", "server": "sharp-elbakyan5.im.grycap.net"}', "info": radl}),
+                json.dumps({"cloud": '{"type": "OSCAR", "server": "sharp-elbakyan5.im.grycap.net"}', "info": radl})
             ]
         }
         db.select.return_value = [(json.dumps(inf_data), '2022-03-23', '1')]