X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=819ec4284cd7bda536296d32ae7488d91978827e;hp=bc13c9f478f3f4aefe5b1a032cc1be0d750c6579;hb=b995ea260a3a2f88a4e041c7e2dd745daee91825;hpb=e19707be54905bd804289a967812e617c8e2ce98 diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index bc13c9f..819ec42 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -22,10 +22,12 @@ from osm_nbi.validation import user_new_schema, user_edit_schema, project_new_sc vim_account_new_schema, vim_account_edit_schema, sdn_new_schema, sdn_edit_schema, \ wim_account_new_schema, wim_account_edit_schema, roles_new_schema, roles_edit_schema, \ k8scluster_new_schema, k8scluster_edit_schema, k8srepo_new_schema, k8srepo_edit_schema, \ - validate_input, ValidationError, is_valid_uuid # To check that User/Project Names don't look like UUIDs + osmrepo_new_schema, osmrepo_edit_schema, \ + validate_input, ValidationError, is_valid_uuid # To check that User/Project Names don't look like UUIDs 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 " @@ -241,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 @@ -324,14 +328,14 @@ class CommonVimWimSdn(BaseTopic): # do not remove reference, but order via kafka to delete it if session["project_id"] and session["project_id"]: other_projects_referencing = next((p for p in db_content["_admin"]["projects_read"] - if p not in session["project_id"]), None) + if p not in session["project_id"] and p != "ANY"), None) # check if there are projects referencing it (apart from ANY, that means, public).... if other_projects_referencing: # remove references but not delete - update_dict_pull = {"_admin.projects_read.{}".format(p): None for p in session["project_id"]} - update_dict_pull.update({"_admin.projects_write.{}".format(p): None for p in session["project_id"]}) - self.db.set_one(self.topic, filter_q, update_dict=None, pull=update_dict_pull) + update_dict_pull = {"_admin.projects_read": session["project_id"], + "_admin.projects_write": session["project_id"]} + self.db.set_one(self.topic, filter_q, update_dict=None, pull_list=update_dict_pull) return None else: can_write = next((p for p in db_content["_admin"]["projects_write"] if p == "ANY" or @@ -397,6 +401,7 @@ class WimAccountTopic(CommonVimWimSdn): class SdnTopic(CommonVimWimSdn): topic = "sdns" topic_msg = "sdn" + quota_name = "sdn_controllers" schema_new = sdn_new_schema schema_edit = sdn_edit_schema multiproject = True @@ -418,8 +423,8 @@ class SdnTopic(CommonVimWimSdn): input = super()._validate_input_new(input, force) return self._obtain_url(input, True) - def _validate_input_edit(self, input, force=False): - input = super()._validate_input_edit(input, force) + def _validate_input_edit(self, input, content, force=False): + input = super()._validate_input_edit(input, content, force) return self._obtain_url(input, False) @@ -456,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", []): @@ -470,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): """ @@ -520,9 +526,18 @@ class K8sRepoTopic(CommonVimWimSdn): return oid +class OsmRepoTopic(BaseTopic): + topic = "osmrepos" + topic_msg = "osmrepos" + schema_new = osmrepo_new_schema + schema_edit = osmrepo_edit_schema + multiproject = True + # TODO: Implement user/password + + class UserTopicAuth(UserTopic): # topic = "users" - # topic_msg = "users" + topic_msg = "users" schema_new = user_new_schema schema_edit = user_edit_schema @@ -593,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 @@ -663,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 @@ -704,11 +722,10 @@ class UserTopicAuth(UserTopic): if kwargs: BaseTopic._update_input_with_kwargs(indata, kwargs) try: - indata = self._validate_input_edit(indata, force=session["force"]) - if not content: content = self.show(session, _id) - self.check_conflict_on_edit(session, content, indata, _id=_id) + indata = self._validate_input_edit(indata, content, force=session["force"]) + 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 @@ -797,16 +814,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) @@ -832,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 @@ -887,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): """ @@ -948,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 @@ -972,7 +995,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 @@ -1004,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 @@ -1024,15 +1048,16 @@ class ProjectTopicAuth(ProjectTopic): if kwargs: BaseTopic._update_input_with_kwargs(indata, kwargs) try: - indata = self._validate_input_edit(indata, force=session["force"]) - if not content: content = self.show(session, _id) - self.check_conflict_on_edit(session, content, indata, _id=_id) + indata = self._validate_input_edit(indata, content, force=session["force"]) + 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) @@ -1069,9 +1094,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): @@ -1088,7 +1113,7 @@ class RoleTopicAuth(BaseTopic): return input - def _validate_input_edit(self, input, force=False): + def _validate_input_edit(self, input, content, force=False): """ Validates input user content for updating an entry. @@ -1155,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 @@ -1222,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} @@ -1239,7 +1267,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 @@ -1324,11 +1352,11 @@ class RoleTopicAuth(BaseTopic): if kwargs: self._update_input_with_kwargs(indata, kwargs) try: - indata = self._validate_input_edit(indata, force=session["force"]) if not content: 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: