Merge pull request #1668 from grycap/devel

Save data in json format in mongo

Author: micafer

IM/CloudInfo.py

@@ -140,11 +140,11 @@ def get_cloud_list(auth_data):
         return res
 
     def serialize(self):
-        return json.dumps(self.__dict__)
+        return self.__dict__
 
     @staticmethod
     def deserialize(str_data):
-        dic = json.loads(str_data)
+        dic = str_data if isinstance(str_data, dict) else json.loads(str_data)
         nwecloud = CloudInfo()
         nwecloud.__dict__.update(dic)
         return nwecloud

IM/InfrastructureInfo.py

@@ -143,13 +143,13 @@ def serialize(self):
             odict['radl'] = str(odict['radl'])
         if odict['extra_info'] and "TOSCA" in odict['extra_info']:
             odict['extra_info'] = {'TOSCA': odict['extra_info']['TOSCA'].serialize()}
-        return json.dumps(odict)
+        return odict
 
     @staticmethod
     def deserialize(str_data):
         newinf = InfrastructureInfo()
         newinf.creation_date = None
-        dic = json.loads(str_data)
+        dic = str_data if isinstance(str_data, dict) else json.loads(str_data)
         vm_list = dic['vm_list']
         vm_master_id = dic['vm_master']
         dic['vm_master'] = None

IM/InfrastructureList.py

@@ -19,6 +19,7 @@
 import time
 import logging
 import threading
+import json
 
 from IM.db import DataBase
 from IM.config import Config
@@ -242,7 +243,8 @@ def _save_data_to_db(db_url, inf_list, inf_id=None):
                 else:
                     res = db.execute("replace into inf_list (id, deleted, data, date, auth)"
                                      " values (%s, %s, %s, now(), %s)",
-                                     (inf.id, int(inf.deleted), data, inf.auth.serialize()))
+                                     (inf.id, int(inf.deleted), json.dumps(data),
+                                      json.dumps(inf.auth.serialize())))
 
             db.close()
             return res
@@ -266,18 +268,16 @@ def _gen_where_from_auth(auth):
 
     @staticmethod
     def _gen_filter_from_auth(auth):
-        like = ""
+        usernames = []
         if auth:
             for elem in auth.getAuthInfo('InfrastructureManager'):
                 if elem.get("admin"):
                     return {}
                 if elem.get("username"):
-                    if like:
-                        like += "|"
-                    like += '"%s"' % elem.get("username")
+                    usernames.append(elem.get("username"))
 
-        if like:
-            return {"auth": {"$regex": like}}
+        if usernames:
+            return {"auth": {"$elemMatch": {"username": {"$in": usernames}}}}
         else:
             return {}
 

IM/Stats.py

@@ -34,7 +34,7 @@ class Stats():
 
     @staticmethod
     def _get_data(str_data, init_date=None, end_date=None):
-        dic = json.loads(str_data)
+        dic = str_data if isinstance(str_data, dict) else json.loads(str_data)
         resp = {'creation_date': ''}
         if 'creation_date' in dic and dic['creation_date']:
             creation_date = datetime.datetime.fromtimestamp(float(dic['creation_date']))

IM/VirtualMachine.py

@@ -122,11 +122,11 @@ def serialize(self):
             odict['requested_radl'] = str(odict['requested_radl'])
         if odict['cloud']:
             odict['cloud'] = odict['cloud'].serialize()
-        return json.dumps(odict)
+        return odict
 
     @staticmethod
     def deserialize(str_data):
-        dic = json.loads(str_data)
+        dic = str_data if isinstance(str_data, dict) else json.loads(str_data)
         if dic['cloud']:
             dic['cloud'] = IM.CloudInfo.CloudInfo.deserialize(dic['cloud'])
         if dic['info']:

IM/auth.py

@@ -223,11 +223,12 @@ def read_auth_data(filename):
         return res
 
     def serialize(self):
-        return json.dumps(self.auth_list, sort_keys=True)
+        return self.auth_list
 
     @staticmethod
     def deserialize(str_data):
-        return Authentication(json.loads(str_data))
+        data = str_data if isinstance(str_data, list) else json.loads(str_data)
+        return Authentication(data)
 
     def delAuthInfo(self, auth_type, host=None):
         """