X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fuser.py;h=d28514e8ea5dfe6f530e5eca9cfaf86fd98b3ddd;hb=f6a4f77b98e5f05b74938b44bcbb2ed148e4941a;hp=190fd950c377f0974fd54bdd534db1b1a49d395c;hpb=12138cdda2fb241cb440b1224d4a3b2202107f35;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/user.py b/osmclient/sol005/user.py
index 190fd95..d28514e 100644
--- a/osmclient/sol005/user.py
+++ b/osmclient/sol005/user.py
@@ -19,7 +19,6 @@
 OSM user mgmt API
 """
 
-from osmclient.common import utils
 from osmclient.common.exceptions import ClientException
 from osmclient.common.exceptions import NotFound
 import json
@@ -202,7 +201,7 @@ class User(object):
         filter_string = ''
         if filter:
             filter_string = '?{}'.format(filter)
-        _, resp = self._http.get2_cmd('{}{}'.format(self._apiBase,filter_string,skip_query_admin=True))
+        _, resp = self._http.get2_cmd('{}{}'.format(self._apiBase,filter_string), skip_query_admin=True)
         #print('RESP: {}'.format(resp))
         if resp:
             return json.loads(resp)
@@ -213,13 +212,14 @@ class User(object):
         """
         self._logger.debug("")
         self._client.get_token()
-        if utils.validate_uuid4(name):
-            for user in self.list():
-                if name == user['_id']:
-                    return user
-        else:
-            for user in self.list():
-                if name == user['username']:
-                    return user
+        # keystone with external LDAP contains large ids, not uuid format
+        # utils.validate_uuid4(name) cannot be used
+        user_list = self.list()
+        for user in user_list:
+            if name == user['_id']:
+                return user
+        for user in user_list:
+            if name == user['username']:
+                return user
         raise NotFound("User {} not found".format(name))