Revision b5842eac

b/kamaki/cli/commands/errors.py
124 124
                    ) if token else 'No token provided',
125 125
                    details = [] if token else this._token_details
126 126
                    raiseCLIError(ce, msg, details=details)
127
                raise ce
127 128
            self._raise = foo
128 129
        return _raise
129 130

  
b/kamaki/cli/commands/snf-astakos.py
34 34
from astakosclient import AstakosClient
35 35

  
36 36
from kamaki.cli import command
37
from kamaki.cli.errors import CLISyntaxError
37
from kamaki.cli.errors import CLIBaseUrlError
38 38
from kamaki.cli.commands import _command_init, errors, _optional_json
39 39
from kamaki.cli.command_tree import CommandTree
40 40
from kamaki.cli.utils import print_dict
......
61 61
            or self.config.get('astakos', 'token')\
62 62
            or self.config.get('user', 'token')\
63 63
            or self.config.get('global', 'token')
64
        astakos_endpoints = self.auth_base.get_service_endpoints(
65
            self.config.get('astakos', 'type'),
66
            self.config.get('astakos', 'version'))
67
        base_url = astakos_endpoints['publicURL']
64
        if getattr(self, 'auth_base', False):
65
            astakos_endpoints = self.auth_base.get_service_endpoints(
66
                self.config.get('astakos', 'type'),
67
                self.config.get('astakos', 'version'))
68
            base_url = astakos_endpoints['publicURL']
69
        else:
70
            base_url = self.config.get('astakos', 'url')
71
        if not base_url:
72
            raise CLIBaseUrlError(service='astakos')
68 73
        self.client = AstakosClient(base_url, logger=log)
69 74
        self._set_log_params()
70 75
        self._update_max_threads()
b/kamaki/clients/astakos/__init__.py
54 54
        """
55 55
        self.token = token or self.token
56 56
        body = dict(auth=dict(token=dict(id=self.token)))
57
        self.set_headers('content-type', 'application/json')
58
        self._cache[self.token] = self.post('/tokens', data=body).json
57
        self._cache[self.token] = self.post('/tokens', json=body).json
59 58
        return self._cache[self.token]
60 59

  
61 60
    def get_services(self, token=None):

Also available in: Unified diff