X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=924ebdd7bd05fe5d75b35f82f4117f8d71688015;hp=77b968869c5b5b52e82a3a35c29f16a164b462b7;hb=b1d7312488e282599703e6179e4b7dfccba650b4;hpb=a16a4facd05265ade1bc8cdae2c796ef13e30786

diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py
index 77b9688..924ebdd 100644
--- a/osm_nbi/admin_topics.py
+++ b/osm_nbi/admin_topics.py
@@ -751,7 +751,7 @@ class RoleTopicAuth(BaseTopic):
         :param role_definitions: role definition to test
         :return: None if ok, raises ValidationError exception on error
         """
-        ignore_fields = ["_id", "name"]
+        ignore_fields = ["_id", "_admin", "name"]
         for role_def in role_definitions.keys():
             if role_def in ignore_fields:
                 continue
@@ -865,10 +865,11 @@ class RoleTopicAuth(BaseTopic):
         content[":"] = False
 
         ignore_fields = ["_id", "_admin", "name"]
-        for role_def, value in content.items():
+        content_keys = content.keys()
+        for role_def in content_keys:
             if role_def in ignore_fields:
                 continue
-            content[role_def.replace(".", ":")] = value
+            content[role_def.replace(".", ":")] = content[role_def]
             del content[role_def]
 
     @staticmethod
@@ -906,6 +907,8 @@ class RoleTopicAuth(BaseTopic):
         """
         content_keys = list(content.keys())
 
+        content["_id"] = str(content["_id"])
+
         for key in content_keys:
             if ":" in key:
                 content[key.replace(":", ".")] = content[key]
@@ -919,7 +922,7 @@ class RoleTopicAuth(BaseTopic):
         :param _id: server internal id
         :return: dictionary, raise exception if not found.
         """
-        filter_db = self._get_project_filter(session, write=False, show_all=True)
+        filter_db = self._get_project_filter(session)
         filter_db["_id"] = _id
 
         role = self.db.get_one(self.topic, filter_db)
@@ -939,6 +942,17 @@ class RoleTopicAuth(BaseTopic):
         if not filter_q:
             filter_q = {}
 
+        if "root" in filter_q:
+            filter_q[":"] = filter_q["root"]
+            del filter_q["root"]
+        
+        if len(filter_q) > 0:
+            keys = [key for key in filter_q.keys() if "." in key]
+
+            for key in keys:
+                filter_q[key.replace(".", ":")] = filter_q[key]
+                del filter_q[key]
+
         roles = self.db.get_list(self.topic, filter_q)
         new_roles = []