Revision 82e32e50 kamaki/cli/commands/snf-astakos.py
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() |
Also available in: Unified diff