Reverted kdur creation following the kdu modeling before SOL006

[osm/NBI.git] / osm_nbi / admin_topics.py

diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py
index 998c12f..4f9ab0c 100644 (file)
--- a/osm_nbi/admin_topics.py
+++ b/osm_nbi/admin_topics.py
@@ -27,6 +27,7 @@ from osm_nbi.validation import user_new_schema, user_edit_schema, project_new_sc
 from osm_nbi.base_topic import BaseTopic, EngineException
 from osm_nbi.authconn import AuthconnNotFoundException, AuthconnConflictException
 from osm_common.dbbase import deep_update_rfc7396
+import copy
 
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 
@@ -533,7 +534,7 @@ class OsmRepoTopic(BaseTopic):
 
 class UserTopicAuth(UserTopic):
     # topic = "users"
-    # topic_msg = "users"
+    topic_msg = "users"
     schema_new = user_new_schema
     schema_edit = user_edit_schema
 
@@ -674,17 +675,18 @@ class UserTopicAuth(UserTopic):
 
             rollback.append({"topic": self.topic, "_id": _id})
             # del content["password"]
-            # self._send_msg("created", content, not_send_msg=not_send_msg)
+            self._send_msg("created", content, not_send_msg=None)
             return _id, None
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
-    def show(self, session, _id):
+    def show(self, session, _id, api_req=False):
         """
         Get complete information on an topic
 
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id or username
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: dictionary, raise exception if not found.
         """
         # Allow _id to be a name or uuid
@@ -807,16 +809,19 @@ class UserTopicAuth(UserTopic):
                                    "add_project_role_mappings": mappings_to_add,
                                    "remove_project_role_mappings": mappings_to_remove
                                    })
+            data_to_send = {'_id': _id, "changes": indata}
+            self._send_msg("edited", data_to_send, not_send_msg=None)
 
             # return _id
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
-    def list(self, session, filter_q=None):
+    def list(self, session, filter_q=None, api_req=False):
         """
         Get a list of the topic that matches a filter
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param filter_q: filter of data to be applied
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: The list, it can be empty if no one match the filter.
         """
         user_list = self.auth.get_user_list(filter_q)
@@ -842,13 +847,14 @@ class UserTopicAuth(UserTopic):
         self.check_conflict_on_del(session, uid, user)
         if not dry_run:
             v = self.auth.delete_user(uid)
+            self._send_msg("deleted", user, not_send_msg=not_send_msg)
             return v
         return None
 
 
 class ProjectTopicAuth(ProjectTopic):
     # topic = "projects"
-    # topic_msg = "projects"
+    topic_msg = "project"
     schema_new = project_new_schema
     schema_edit = project_edit_schema
 
@@ -958,17 +964,18 @@ class ProjectTopicAuth(ProjectTopic):
             self.format_on_new(content, project_id=session["project_id"], make_public=session["public"])
             _id = self.auth.create_project(content)
             rollback.append({"topic": self.topic, "_id": _id})
-            # self._send_msg("created", content, not_send_msg=not_send_msg)
+            self._send_msg("created", content, not_send_msg=None)
             return _id, None
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
-    def show(self, session, _id):
+    def show(self, session, _id, api_req=False):
         """
         Get complete information on an topic
 
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: dictionary, raise exception if not found.
         """
         # Allow _id to be a name or uuid
@@ -982,7 +989,7 @@ class ProjectTopicAuth(ProjectTopic):
         else:
             raise EngineException("Project not found", HTTPStatus.NOT_FOUND)
 
-    def list(self, session, filter_q=None):
+    def list(self, session, filter_q=None, api_req=False):
         """
         Get a list of the topic that matches a filter
 
@@ -1014,6 +1021,7 @@ class ProjectTopicAuth(ProjectTopic):
         self.check_conflict_on_del(session, pid, proj)
         if not dry_run:
             v = self.auth.delete_project(pid)
+            self._send_msg("deleted", proj, not_send_msg=None)
             return v
         return None
 
@@ -1039,9 +1047,11 @@ class ProjectTopicAuth(ProjectTopic):
             indata = self._validate_input_edit(indata, content, force=session["force"])
             self.check_conflict_on_edit(session, content, indata, _id=_id)
             self.format_on_edit(content, indata)
-
+            content_original = copy.deepcopy(content)
             deep_update_rfc7396(content, indata)
             self.auth.update_project(content["_id"], content)
+            proj_data = {"_id": _id, "changes": indata, "original": content_original}
+            self._send_msg("edited", proj_data, not_send_msg=None)
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
@@ -1078,9 +1088,9 @@ class RoleTopicAuth(BaseTopic):
             if role_def[-1] == ":":
                 raise ValidationError("Operation cannot end with ':'")
 
-            role_def_matches = [op for op in operations if op.startswith(role_def)]
+            match = next((op for op in operations if op == role_def or op.startswith(role_def + ":")), None)
 
-            if len(role_def_matches) == 0:
+            if not match:
                 raise ValidationError("Invalid permission '{}'".format(role_def))
 
     def _validate_input_new(self, input, force=False):
@@ -1231,12 +1241,13 @@ class RoleTopicAuth(BaseTopic):
             final_content["permissions"]["admin"] = False
         return None
 
-    def show(self, session, _id):
+    def show(self, session, _id, api_req=False):
         """
         Get complete information on an topic
 
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: dictionary, raise exception if not found.
         """
         filter_q = {BaseTopic.id_field(self.topic, _id): _id}
@@ -1248,7 +1259,7 @@ class RoleTopicAuth(BaseTopic):
             raise AuthconnConflictException("Found more than one role with filter {}".format(filter_q))
         return roles[0]
 
-    def list(self, session, filter_q=None):
+    def list(self, session, filter_q=None, api_req=False):
         """
         Get a list of the topic that matches a filter