Revision 91478081 kamaki/clients/astakos/__init__.py

b/kamaki/clients/astakos/__init__.py
54 54

  
55 55
        :raises AssertionError: if no token exists (either param or member)
56 56
        """
57
        token = token or self.token or self.tokenlist[0]
57
        token = token or self.token
58 58
        assert token, 'No token provided'
59 59
        return token[0] if (
60 60
            isinstance(token, list) or isinstance(token, tuple)) else token
......
68 68
        """
69 69
        token = self._resolve_token(token)
70 70
        astakos = SynnefoAstakosClient(
71
            token, self.base_url, logger=getLogger('_my_.astakosclient'))
71
            token, self.base_url, logger=getLogger('astakosclient'))
72 72
        r = astakos.get_endpoints()
73 73
        uuid = r['access']['user']['id']
74 74
        self._uuids[token] = uuid
75 75
        self._cache[uuid] = r
76 76
        self._astakos[uuid] = astakos
77
        self._uuids2usernames[token] = dict()
78
        self._usernames2uuids[token] = dict()
77
        self._uuids2usernames[uuid] = dict()
78
        self._usernames2uuids[uuid] = dict()
79 79
        return self._cache[uuid]
80 80

  
81 81
    def get_token(self, uuid):
......
180 180
    def uuids2usernames(self, uuids, token=None):
181 181
        token = self._resolve_token(token)
182 182
        self._validate_token(token)
183
        astakos = self._astakos[self._uuids[token]]
184
        if set(uuids).difference(self._uuids2usernames[token]):
185
            self._uuids2usernames[token].update(astakos.get_usernames(uuids))
186
        return self._uuids2usernames[token]
183
        uuid = self._uuids[token]
184
        astakos = self._astakos[uuid]
185
        if set(uuids).difference(self._uuids2usernames[uuid]):
186
            self._uuids2usernames[uuid].update(astakos.get_usernames(uuids))
187
        return self._uuids2usernames[uuid]
187 188

  
188 189
    def usernames2uuids(self, usernames, token=None):
189 190
        token = self._resolve_token(token)
190 191
        self._validate_token(token)
191
        astakos = self._astakos[self._uuids[token]]
192
        if set(usernames).difference(self._usernames2uuids[token]):
193
            self._usernames2uuids[token].update(astakos.get_uuids(usernames))
194
        return self._usernames2uuids
192
        uuid = self._uuids[token]
193
        astakos = self._astakos[uuid]
194
        if set(usernames).difference(self._usernames2uuids[uuid]):
195
            self._usernames2uuids[uuid].update(astakos.get_uuids(usernames))
196
        return self._usernames2uuids[uuid]

Also available in: Unified diff