bug(descriptor): missing fields in stored descriptors. 1408, 1388
[osm/NBI.git] / osm_nbi / admin_topics.py
index 7e71459..819ec42 100644 (file)
@@ -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>"
 
@@ -242,6 +243,8 @@ class CommonVimWimSdn(BaseTopic):
         if not session["force"] and edit_content.get("name"):
             self.check_unique_name(session, edit_content["name"], _id=_id)
 
+        return final_content
+
     def format_on_edit(self, final_content, edit_content):
         """
         Modifies final_content inserting admin information upon edition
@@ -458,8 +461,8 @@ class K8sClusterTopic(CommonVimWimSdn):
         return oid
 
     def check_conflict_on_edit(self, session, final_content, edit_content, _id):
-        super(CommonVimWimSdn, self).check_conflict_on_edit(session, final_content, edit_content, _id)
-        super().check_conflict_on_edit(session, final_content, edit_content, _id)
+        final_content = super(CommonVimWimSdn, self).check_conflict_on_edit(session, final_content, edit_content, _id)
+        final_content = super().check_conflict_on_edit(session, final_content, edit_content, _id)
         # Update Helm/Juju Repo lists
         repos = {"helm-chart": [], "juju-bundle": []}
         for proj in session.get("set_project", []):
@@ -472,6 +475,7 @@ class K8sClusterTopic(CommonVimWimSdn):
             if rlist not in final_content["_admin"]:
                 final_content["_admin"][rlist] = []
             final_content["_admin"][rlist] += repos[k]
+        return final_content
 
     def check_conflict_on_del(self, session, _id, db_content):
         """
@@ -533,7 +537,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
 
@@ -604,6 +608,8 @@ class UserTopicAuth(UserTopic):
                     raise EngineException("You cannot remove system_admin role from admin user",
                                           http_code=HTTPStatus.FORBIDDEN)
 
+        return final_content
+
     def check_conflict_on_del(self, session, _id, db_content):
         """
         Check if deletion can be done because of dependencies if it is not force. To override
@@ -674,17 +680,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
@@ -718,7 +725,7 @@ class UserTopicAuth(UserTopic):
             if not content:
                 content = self.show(session, _id)
             indata = self._validate_input_edit(indata, content, force=session["force"])
-            self.check_conflict_on_edit(session, content, indata, _id=_id)
+            content = self.check_conflict_on_edit(session, content, indata, _id=_id)
             # self.format_on_edit(content, indata)
 
             if not ("password" in indata or "username" in indata or indata.get("remove_project_role_mappings") or
@@ -807,6 +814,8 @@ 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:
@@ -817,6 +826,7 @@ class UserTopicAuth(UserTopic):
         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 +852,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
 
@@ -897,6 +908,7 @@ class ProjectTopicAuth(ProjectTopic):
             # Check that project name is not used, regardless keystone already checks this
             if project_name and self.auth.get_project_list(filter_q={"name": project_name}):
                 raise EngineException("project '{}' is already used".format(project_name), HTTPStatus.CONFLICT)
+        return final_content
 
     def check_conflict_on_del(self, session, _id, db_content):
         """
@@ -958,17 +970,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
@@ -1014,6 +1027,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
 
@@ -1037,11 +1051,13 @@ class ProjectTopicAuth(ProjectTopic):
             if not content:
                 content = self.show(session, _id)
             indata = self._validate_input_edit(indata, content, force=session["force"])
-            self.check_conflict_on_edit(session, content, indata, _id=_id)
+            content = 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)
 
@@ -1164,6 +1180,8 @@ class RoleTopicAuth(BaseTopic):
             if roles and roles[0][BaseTopic.id_field("roles", _id)] != _id:
                 raise EngineException("role name '{}' exists".format(role_name), HTTPStatus.CONFLICT)
 
+        return final_content
+
     def check_conflict_on_del(self, session, _id, db_content):
         """
         Check if deletion can be done because of dependencies if it is not force. To override
@@ -1231,12 +1249,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}
@@ -1337,7 +1356,7 @@ class RoleTopicAuth(BaseTopic):
                 content = self.show(session, _id)
             indata = self._validate_input_edit(indata, content, force=session["force"])
             deep_update_rfc7396(content, indata)
-            self.check_conflict_on_edit(session, content, indata, _id=_id)
+            content = self.check_conflict_on_edit(session, content, indata, _id=_id)
             self.format_on_edit(content, indata)
             self.auth.update_role(content)
         except ValidationError as e: