# or implied, of GRNET S.A.
from logging import getLogger
-from astakosclient import AstakosClient as SynnefoAstakosClient
+from astakosclient import AstakosClient as OriginalAstakosClient
+from astakosclient import AstakosClientException, parse_endpoints
-from kamaki.clients import Client, ClientError
+from kamaki.clients import Client, ClientError, RequestManager, recvlog
-class AstakosClient(Client):
+class AstakosClient(OriginalAstakosClient):
+ """Wrap Original AstakosClient to ensure compatibility in kamaki clients"""
+
+ def __init__(self, *args, **kwargs):
+ if args:
+ args = list(args)
+ url = args.pop(0)
+ token = args.pop(0) if args else kwargs.pop('token', None)
+ args = tuple([token, url] + args)
+ elif 'base_url' in kwargs:
+ kwargs['auth_url'] = kwargs.get('auth_url', kwargs['base_url'])
+ super(AstakosClient, self).__init__(*args, **kwargs)
+
+ def get_service_endpoints(self, service_type, version=None):
+ services = parse_endpoints(
+ self.get_endpoints(), ep_type=service_type, ep_version_id=version)
+ return services[0]['endpoints'][0] if services else []
+
+
+def _astakos_error(foo):
+ def wrap(self, *args, **kwargs):
+ try:
+ return foo(self, *args, **kwargs)
+ except AstakosClientException as sace:
+ self._raise_for_status(sace)
+ return wrap
+
+
+class LoggedAstakosClient(AstakosClient):
+ """An AstakosClient wrapper with modified logging
+
+ Logs are adjusted to appear similar to the ones of kamaki clients.
+ No other changes are made to the parent class.
+ """
+
+ LOG_TOKEN = False
+ LOG_DATA = False
+
+ def _dump_response(self, request, status, message, data):
+ recvlog.info('\n%d %s' % (status, message))
+ recvlog.info('data size: %s' % len(data))
+ if not self.LOG_TOKEN:
+ token = request.headers.get('X-Auth-Token', '')
+ if self.LOG_DATA:
+ data = data.replace(token, '...') if token else data
+ if self.LOG_DATA:
+ recvlog.info(data)
+ recvlog.info('- - - - - - -')
+
+ def _call_astakos(self, *args, **kwargs):
+ r = super(LoggedAstakosClient, self)._call_astakos(*args, **kwargs)
+ try:
+ log_request = getattr(self, 'log_request', None)
+ if log_request:
+ req = RequestManager(
+ method=log_request['method'],
+ url='%s://%s' % (self.scheme, self.astakos_base_url),
+ path=log_request['path'],
+ data=log_request.get('body', None),
+ headers=log_request.get('headers', dict()))
+ req.LOG_TOKEN, req.LOG_DATA = self.LOG_TOKEN, self.LOG_DATA
+ req.dump_log()
+ log_response = getattr(self, 'log_response', None)
+ if log_response:
+ self._dump_response(
+ req,
+ status=log_response['status'],
+ message=log_response['message'],
+ data=log_response.get('data', ''))
+ except Exception:
+ pass
+ finally:
+ return r
+
+
+class CachedAstakosClient(Client):
"""Synnefo Astakos cached client wraper"""
+ @_astakos_error
def __init__(self, base_url, token=None):
- super(AstakosClient, self).__init__(base_url, token)
+ super(CachedAstakosClient, self).__init__(base_url, token)
self._astakos = dict()
self._uuids = dict()
self._cache = dict()
self._validate_token(token)
return self._astakos[self._uuids[token]]
+ @_astakos_error
def authenticate(self, token=None):
"""Get authentication information and store it in this client
- As long as the AstakosClient instance is alive, the latest
+ As long as the CachedAstakosClient instance is alive, the latest
authentication information for this token will be available
:param token: (str) custom token to authenticate
"""
token = self._resolve_token(token)
- astakos = SynnefoAstakosClient(
- token, self.base_url, logger=getLogger('astakosclient'))
- r = astakos.get_endpoints()
+ astakos = LoggedAstakosClient(
+ self.base_url, token, logger=getLogger('astakosclient'))
+ astakos.LOG_TOKEN = getattr(self, 'LOG_TOKEN', False)
+ astakos.LOG_DATA = getattr(self, 'LOG_DATA', False)
+ r = astakos.authenticate()
uuid = r['access']['user']['id']
self._uuids[token] = uuid
self._cache[uuid] = r
self._usernames2uuids[uuid] = dict()
return self._cache[uuid]
+ def remove_user(self, uuid):
+ self._uuids.pop(self.get_token(uuid))
+ self._cache.pop(uuid)
+ self._astakos.pop(uuid)
+ self._uuids2usernames.pop(uuid)
+ self._usernames2uuids.pop(uuid)
+
def get_token(self, uuid):
return self._cache[uuid]['access']['token']['id']
:returns: (dict) {uuid1: name1, uuid2: name2, ...} or oposite
"""
return self.uuids2usernames(uuids, token) if (
- uuids) else self.usernnames2uuids(displaynames, token)
+ uuids) else self.usernames2uuids(displaynames, token)
+ @_astakos_error
def uuids2usernames(self, uuids, token=None):
token = self._resolve_token(token)
self._validate_token(token)
uuid = self._uuids[token]
astakos = self._astakos[uuid]
- if set(uuids).difference(self._uuids2usernames[uuid]):
+ if set(uuids or []).difference(self._uuids2usernames[uuid]):
self._uuids2usernames[uuid].update(astakos.get_usernames(uuids))
return self._uuids2usernames[uuid]
+ @_astakos_error
def usernames2uuids(self, usernames, token=None):
token = self._resolve_token(token)
self._validate_token(token)
uuid = self._uuids[token]
astakos = self._astakos[uuid]
- if set(usernames).difference(self._usernames2uuids[uuid]):
+ if set(usernames or []).difference(self._usernames2uuids[uuid]):
self._usernames2uuids[uuid].update(astakos.get_uuids(usernames))
return self._usernames2uuids[uuid]
projects / kamaki / blobdiff