Implements: #1353

Author: micafer

IM/InfrastructureManager.py

@@ -1746,8 +1746,7 @@ def GetStats(date, auth):
         """
         # First check the auth data
         auth = InfrastructureManager.check_auth_data(auth)
-        im_auth = auth.getAuthInfo("InfrastructureManager")[0]
-        stats = Stats.get_stats(date, im_auth)
+        stats = Stats.get_stats(date, auth)
         if not stats:
             raise Exception("ERROR connecting with the database!.")
         else:

IM/Stats.py

@@ -23,8 +23,7 @@
 from IM.db import DataBase
 from IM.auth import Authentication
 from IM.config import Config
-from IM.VirtualMachine import VirtualMachine
-
+from radl.radl_parse import parse_radl
 
 class Stats():
 
@@ -34,12 +33,14 @@ 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'):
+            return None
+
         resp = {'creation_date': None}
         if 'creation_date' in dic and dic['creation_date']:
             resp['creation_date'] = str(datetime.datetime.fromtimestamp(float(dic['creation_date'])))
-        auth = Authentication.deserialize(dic['auth'])
         resp['icon'] = None
-        im_auth = auth.getAuthInfo("InfrastructureManager")[0]
         if 'extra_info' in dic and dic['extra_info'] and "TOSCA" in dic['extra_info']:
             try:
                 tosca = yaml.safe_load(dic['extra_info']['TOSCA'])
@@ -55,28 +56,25 @@ def _get_data(str_data, auth=None):
         resp['cloud_host'] = None
         resp['hybrid'] = False
         for vm_data in dic['vm_list']:
-            vm = VirtualMachine.deserialize(vm_data)
 
             # only get the cloud of the first VM
             if not resp['cloud_type']:
-                resp['cloud_type'] = vm.cloud.type
+                resp['cloud_type'] = vm_data["cloud"]["type"]
             if not resp['cloud_host']:
-                resp['cloud_host'] = vm.cloud.get_url()
-            elif resp['cloud_host'] != vm.cloud.get_url():
+                resp['cloud_host'] = vm_data["cloud"]["server"]
+            elif resp['cloud_host'] != vm_data["cloud"]["server"]:
                 resp['hybrid'] = True
 
-            vm_sys = vm.info.systems[0]
+            vm_sys = parse_radl(vm_data['info']).systems[0]
             if vm_sys.getValue('cpu.count'):
                 resp['cpu_count'] += vm_sys.getValue('cpu.count')
             if vm_sys.getValue('memory.size'):
                 resp['memory_size'] += vm_sys.getFeature('memory.size').getValue('M')
             resp['vm_count'] += 1
 
-        if auth is None or im_auth.compare(auth):
-            resp['im_user'] = im_auth.get('username', "")
-            return resp
-        else:
-            return None
+        im_auth = inf_auth.getAuthInfo("InfrastructureManager")[0]
+        resp['im_user'] = im_auth.get('username', "")
+        return resp
 
     @staticmethod
     def get_stats(init_date="1970-01-01", auth=None):

test/unit/test_im_logic.py

@@ -23,6 +23,7 @@
 import sys
 import json
 import base64
+import yaml
 
 from mock import Mock, patch, MagicMock
 
@@ -1390,72 +1391,58 @@ def test_change_inf_auth(self):
                                              " provided for the InfrastructureManager."))
 
     @patch('IM.Stats.DataBase')
-    def test_get_stats(self, DataBase):
+    @patch('IM.InfrastructureManager.InfrastructureManager.check_auth_data')
+    def test_get_stats(self, check_auth_data, DataBase):
 
         radl = """
-            network public ( outbound = 'yes' )
-            system plants (
-            name = 'plants' and
-            memory.size = 488M and
-            script = '#!/bin/bash
-            echo "Hola"
-            ' and
-            cpu.count = 0.5 and
-            disk.0.image.url = 'oscar://sharp-elbakyan5.im.grycap.net/grycap/image' and
-            input.0.provider = 'minio.default' and
-            input.0.path = 'input' and
-            output.0.provider = 'minio.default' and
-            output.0.path = 'output' and
-            alpine = 0 and
-            net_interface.0.connection = 'public' and
-            state = 'configured' and
-            provider.type = 'OSCAR' and
-            instance_id = 'plants' and
-            net_interface.0.dns_name = 'vnode-0' and
-            token = 'ebfb145ab57a35520669fc89bc115edab1b231a5c8f92e895ecaee256f841bac'
-            )
-
-            configure plants ()
-            contextualize  (
-            system plants configure plants step 1 
-            )
-            deploy plants 1
+            system node (
+            memory.size = 512M and
+            cpu.count = 2
+            )"""
 
-        """
+        auth = Authentication([{'type': 'InfrastructureManager', 'token': 'atoken',
+                                'username': '__OPENID__mcaballer', 'pass': 'pass'}])
+        check_auth_data.return_value = auth
 
         db = MagicMock()
         inf_data = {
             "id": "1",
-            "auth": [
-                {"password": "https://aai.egi.eu/oidc/a67fff9c06e62401975aeb29ad35b8faf7c4fc74b4526a5504e5132b01496831@egi.eu",
-                 "type": "InfrastructureManager",
-                 "username": "__OPENID__mcaballer"
-                 }
-            ],
+            "auth": auth.auth_list,
+            "creation_date": 1646655374,
+            "extra_info": {"TOSCA": yaml.dump({"metadata": {"icon": "kubernetes.png"}})},
             "vm_list": [
-                {"last_update": 1646656730,
-                 "destroy": True, 
-                 "state": "deleting",
-                 "id": "plants",
-                 "im_id": 0,
+                {
                  "cloud": {
-                     "id": "oscar",
                      "type": "OSCAR",
                      "server": "sharp-elbakyan5.im.grycap.net",
-                     "protocol": "https"
                  },
-                 "info": radl,
-                 "cont_out": "",
-                 "configured": True, 
-                 "creation_date": 1646655378
+                 "info": radl
                 },
-                "extra_info": {"TOSCA": {"metadata": {"icon": "kubernetes.png"}}}
+                {
+                 "cloud": {
+                     "type": "OSCAR",
+                     "server": "sharp-elbakyan5.im.grycap.net",
+                 },
+                 "info": radl
+                }
             ]
         }
-        db.select.return_value = [(inf_data, '2022-03-23', '1')]
+        db.select.return_value = [(json.dumps(inf_data).encode(), '2022-03-23', '1')]
         DataBase.return_value = db
 
-        IM.GetStats()
+        stats = IM.GetStats('2001-01-01', auth)
+        expected_res = [{'creation_date': '2022-03-07 13:16:14',
+                         'icon': 'kubernetes',
+                         'vm_count': 2,
+                         'cpu_count': 4,
+                         'memory_size': 1024,
+                         'cloud_type': 'OSCAR',
+                         'cloud_host': 'sharp-elbakyan5.im.grycap.net',
+                         'hybrid': False,
+                         'im_user': '__OPENID__mcaballer',
+                         'inf_id': '1',
+                         'last_date': '2022-03-23'}]
+        self.assertEqual(stats, expected_res)
 
 
 if __name__ == "__main__":