bug(descriptor): missing fields in stored descriptors. 1408, 1388

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

diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py
index 4f9ab0c..819ec42 100644 (file)
--- a/osm_nbi/admin_topics.py
+++ b/osm_nbi/admin_topics.py
@@ -243,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
@@ -459,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", []):
@@ -473,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):
         """
@@ -605,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
@@ -720,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
@@ -903,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):
         """
@@ -1045,7 +1051,7 @@ 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)
@@ -1174,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
@@ -1348,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: