X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fuser.py;h=6c10325add5802c036019fcf09731f32b0ea23e1;hb=63ab62675e9db9c956f7a676e2f0230f01d8ce9a;hp=1321aa5a80cdda2d5a37481dc27928c4b8616a75;hpb=a63fb3c6887ecf8221e868e0c8d39d51319ea085;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/user.py b/osmclient/sol005/user.py index 1321aa5..6c10325 100644 --- a/osmclient/sol005/user.py +++ b/osmclient/sol005/user.py @@ -23,12 +23,14 @@ from osmclient.common import utils from osmclient.common.exceptions import ClientException from osmclient.common.exceptions import NotFound import json +import logging class User(object): def __init__(self, http=None, client=None): self._http = http self._client = client + self._logger = logging.getLogger('osmclient') self._apiName = '/admin' self._apiVersion = '/v1' self._apiResource = '/users' @@ -38,23 +40,29 @@ class User(object): def create(self, name, user): """Creates a new OSM user """ - if len(user["projects"]) == 1: + self._logger.debug("") + self._client.get_token() + if not user["projects"] or (len(user["projects"]) == 1 and not user["projects"][0]): + del user["projects"] + elif len(user["projects"]) == 1: user["projects"] = user["projects"][0].split(",") - if user["project-role-mappings"]: + if user["project_role_mappings"]: project_role_mappings = [] - for set_mapping in user["project-role-mappings"]: - set_mapping_clean = [m.trim() for m in set_mapping.split(",")] + for set_mapping in user["project_role_mappings"]: + set_mapping_clean = [m.strip() for m in set_mapping.split(",")] project, roles = set_mapping_clean[0], set_mapping_clean[1:] for role in roles: - mapping = [project, role] + mapping = {"project": project, "role": role} if mapping not in project_role_mappings: project_role_mappings.append(mapping) - user["project-role-mappings"] = project_role_mappings + user["project_role_mappings"] = project_role_mappings + else: + del user["project_role_mappings"] http_code, resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=user) @@ -79,71 +87,76 @@ class User(object): def update(self, name, user): """Updates an existing OSM user identified by name """ - myuser = self.get(name) + self._logger.debug("") + self._client.get_token() + # print(user) + myuser = self.get(name) update_user = { - "_id": myuser["_id"], - "name": myuser["user"], - "project_role_mappings": myuser["project_role_mappings"] + "add_project_role_mappings": [], + "remove_project_role_mappings": [], } # if password is defined, update the password if user["password"]: update_user["password"] = user["password"] - + if user["username"]: + update_user["username"] = user["username"] + if user["set-project"]: + # Remove project and insert project role mapping for set_project in user["set-project"]: - set_project_clean = [m.trim() for m in set_project.split(",")] + + set_project_clean = [m.strip() for m in set_project.split(",")] project, roles = set_project_clean[0], set_project_clean[1:] - update_user["project_role_mappings"] = [mapping for mapping - in update_user["project_role_mappings"] - if mapping[0] != project] + update_user["remove_project_role_mappings"].append({"project": project}) for role in roles: - update_user["project_role_mappings"].append([project, role]) + mapping = {"project": project, "role": role} + update_user["add_project_role_mappings"].append(mapping) if user["remove-project"]: for remove_project in user["remove-project"]: - update_user["project_role_mappings"] = [mapping for mapping - in update_user["project_role_mappings"] - if mapping[0] != remove_project] - + update_user["remove_project_role_mappings"].append({"project": remove_project}) + if user["add-project-role"]: for add_project_role in user["add-project-role"]: - add_project_role_clean = [m.trim() for m in add_project_role.split(",")] + add_project_role_clean = [m.strip() for m in add_project_role.split(",")] project, roles = add_project_role_clean[0], add_project_role_clean[1:] for role in roles: - mapping = [project, role] - if mapping not in update_user["project_role_mappings"]: - update_user["project_role_mappings"].append(mapping) - + mapping = {"project": project, "role": role} + update_user["add_project_role_mappings"].append(mapping) + if user["remove-project-role"]: for remove_project_role in user["remove-project-role"]: - remove_project_role_clean = [m.trim() for m in remove_project_role.split(",")] + remove_project_role_clean = [m.strip() for m in remove_project_role.split(",")] project, roles = remove_project_role_clean[0], remove_project_role_clean[1:] for role in roles: - mapping_to_remove = [project, role] - update_user["project_role_mappings"] = [mapping for mapping - in update_user["project_role_mappings"] - if mapping != mapping_to_remove] + mapping = {"project": project, "role": role} + update_user["remove_project_role_mappings"].append(mapping) - if not user["password"] and not user["set-project"] and not user["remove-project"] \ - and not user["add-project-role"] and not user["remove-project-role"]: - raise ClientException("At least one parameter should be defined.") + if not update_user["remove_project_role_mappings"]: + del update_user["remove_project_role_mappings"] + if not update_user["add_project_role_mappings"]: + del update_user["add_project_role_mappings"] + if not update_user: + raise ClientException("At least something should be changed.") - http_code, resp = self._http.put_cmd(endpoint='{}/{}'.format(self._apiBase,myuser['_id']), + http_code, resp = self._http.patch_cmd(endpoint='{}/{}'.format(self._apiBase, myuser['_id']), postfields_dict=update_user) - #print('HTTP CODE: {}'.format(http_code)) - #print('RESP: {}'.format(resp)) - if http_code in (200, 201, 202, 204): + # print('HTTP CODE: {}'.format(http_code)) + # print('RESP: {}'.format(resp)) + if http_code in (200, 201, 202): if resp: resp = json.loads(resp) if not resp or 'id' not in resp: raise ClientException('unexpected response from server - {}'.format( resp)) print(resp['id']) + elif http_code == 204: + print('Updated') else: msg = "" if resp: @@ -156,6 +169,8 @@ class User(object): def delete(self, name, force=False): """Deletes an existing OSM user identified by name """ + self._logger.debug("") + self._client.get_token() user = self.get(name) querystring = '' if force: @@ -182,6 +197,8 @@ class User(object): def list(self, filter=None): """Returns the list of OSM users """ + self._logger.debug("") + self._client.get_token() filter_string = '' if filter: filter_string = '?{}'.format(filter) @@ -194,6 +211,8 @@ class User(object): def get(self, name): """Returns an OSM user based on name or id """ + self._logger.debug("") + self._client.get_token() if utils.validate_uuid4(name): for user in self.list(): if name == user['_id']: @@ -204,4 +223,3 @@ class User(object): return user raise NotFound("User {} not found".format(name)) -