Revision 8c54338a

b/kamaki/cli/commands/errors.py
68 68
                        '  to get current token: /config get [server.]token'])
69 69
                elif ce.status in range(-12, 200) + [302, 401, 403, 500]:
70 70
                    raiseCLIError(ce, importance=3, details=[
71
                        'Check if serviceis up'])
71
                        'Check if service is up'])
72 72
                elif ce.status == 404 and 'kamakihttpresponse' in ce_msg:
73 73
                    client = getattr(self, 'client', None)
74 74
                    if not client:
b/kamaki/cli/commands/image.py
315 315
            if not astakos_url:
316 316
                raise CLIBaseUrlError(service='astakos')
317 317
            user = AstakosClient(astakos_url, atoken)
318
            return user.term('uuid')
318
            return user.term('id')
319 319

  
320 320
    def _get_pithos_client(self, container):
321 321
        if self['no_metafile_upload']:
b/kamaki/cli/commands/pithos.py
180 180

  
181 181
    def _set_account(self):
182 182
        if getattr(self, 'base_url', False):
183
            self.account = self.auth_base.user_term('uuid', self.token)
183
            self.account = self.auth_base.user_term('id', self.token)
184 184
        else:
185 185
            astakos_url = self.config('astakos', 'get')
186 186
            if not astakos_url:
187 187
                raise CLIBaseUrlError(service='astakos')
188 188
            astakos = AstakosClient(astakos_url, self.token)
189
            self.account = astakos.user_term('uuid')
189
            self.account = astakos.user_term('id')
190 190

  
191 191

  
192 192
class _file_account_command(_pithos_init):
b/kamaki/cli/config.py
78 78
    },
79 79
    'pithos': {
80 80
        'type': 'object-store',
81
        'version': 'v2'
81
        'version': 'v1'
82 82
    },
83 83
    'cyclades': {
84 84
        'type': 'compute',
......
86 86
        },
87 87
    'plankton': {
88 88
        'type': 'image',
89
        'version': 'v2.0'
89
        'version': 'v1.0'
90 90
    },
91 91
    'astakos': {
92 92
        'type': 'identity',
b/kamaki/clients/__init__.py
115 115

  
116 116
        :returns: (scheme, netloc)
117 117
        """
118
        url = _encode(url) if url else 'http://127.0.0.1/'
118
        url = _encode(str(url)) if url else 'http://127.0.0.1/'
119 119
        url += '' if url.endswith('/') else '/'
120 120
        if path:
121 121
            url += _encode(path[1:] if path.startswith('/') else path)
b/kamaki/clients/astakos/__init__.py
104 104
        service = self.get_service_details(service_type, token)
105 105
        matches = []
106 106
        for endpoint in service['endpoints']:
107

  
108 107
            if (not version) or (
109 108
                    endpoint['versionId'].lower() == version.lower()):
110 109
                matches.append(endpoint)

Also available in: Unified diff