Implements: #1353

Author: micafer

IM/InfrastructureManager.py

@@ -1747,7 +1747,7 @@ def GetStats(date, auth):
         # First check the auth data
         auth = InfrastructureManager.check_auth_data(auth)
         stats = Stats.get_stats(date, auth)
-        if not stats:
+        if stats is None:
             raise Exception("ERROR connecting with the database!.")
         else:
             return stats

IM/Stats.py

@@ -34,8 +34,9 @@ class Stats():
     @staticmethod
     def _get_data(str_data, auth=None):
         dic = json.loads(str_data)
-        inf_auth = Authentication(dic['auth'])
-        if auth is not None and not inf_auth.compare(auth, 'InfrastructureManager'):
+        inf_auth = Authentication.deserialize(dic['auth']).getAuthInfo('InfrastructureManager')[0]
+        user_auth = auth.getAuthInfo('InfrastructureManager')[0]
+        if inf_auth['username'] != user_auth['username'] or inf_auth['password'] != user_auth['password']:
             return None
 
         resp = {'creation_date': None}
@@ -73,8 +74,7 @@ def _get_data(str_data, auth=None):
                 resp['memory_size'] += vm_sys.getFeature('memory.size').getValue('M')
             resp['vm_count'] += 1
 
-        im_auth = inf_auth.getAuthInfo("InfrastructureManager")[0]
-        resp['im_user'] = im_auth.get('username', "")
+        resp['im_user'] = inf_auth.get('username')
         return resp
 
     @staticmethod
@@ -108,12 +108,14 @@ def get_stats(init_date="1970-01-01", auth=None):
                 data = elem[0]
                 date = elem[1]
                 inf_id = elem[2]
-                res = Stats._get_data(data.decode(), auth)
-                if res:
-                    res['inf_id'] = inf_id
-                    res['last_date'] = str(date)
-                    stats.append(res)
-
+                try:
+                    res = Stats._get_data(data, auth)
+                    if res:
+                        res['inf_id'] = inf_id
+                        res['last_date'] = str(date)
+                        stats.append(res)
+                except Exception:
+                    Stats.logger.exception("ERROR reading infrastructure info from Inf ID: %s" % inf_id)
             db.close()
             return stats
         else:

test/unit/test_im_logic.py

@@ -1401,13 +1401,13 @@ def test_get_stats(self, check_auth_data, DataBase):
             )"""
 
         auth = Authentication([{'type': 'InfrastructureManager', 'token': 'atoken',
-                                'username': '__OPENID__mcaballer', 'pass': 'pass'}])
+                                'username': '__OPENID__mcaballer', 'password': 'pass'}])
         check_auth_data.return_value = auth
 
         db = MagicMock()
         inf_data = {
             "id": "1",
-            "auth": auth.auth_list,
+            "auth": auth.serialize(),
             "creation_date": 1646655374,
             "extra_info": {"TOSCA": yaml.dump({"metadata": {"icon": "kubernetes.png"}})},
             "vm_list": [
@@ -1427,7 +1427,7 @@ def test_get_stats(self, check_auth_data, DataBase):
                 }
             ]
         }
-        db.select.return_value = [(json.dumps(inf_data).encode(), '2022-03-23', '1')]
+        db.select.return_value = [(json.dumps(inf_data), '2022-03-23', '1')]
         DataBase.return_value = db
 
         stats = IM.GetStats('2001-01-01', auth)