Revision 379c36a8
b/kamaki/cli/commands/network.py | ||
---|---|---|
63 | 63 |
def _run(self, service='network'): |
64 | 64 |
if getattr(self, 'cloud', None): |
65 | 65 |
base_url = self._custom_url(service) or self._custom_url( |
66 |
'compute')
|
|
66 |
'network')
|
|
67 | 67 |
if base_url: |
68 | 68 |
token = self._custom_token(service) or self._custom_token( |
69 |
'compute') or self.config.get_cloud('token')
|
|
69 |
'network') or self.config.get_cloud('token')
|
|
70 | 70 |
self.client = CycladesNetworkClient( |
71 | 71 |
base_url=base_url, token=token) |
72 | 72 |
return |
... | ... | |
74 | 74 |
self.cloud = 'default' |
75 | 75 |
if getattr(self, 'auth_base', False): |
76 | 76 |
cyclades_endpoints = self.auth_base.get_service_endpoints( |
77 |
self._custom_type('compute') or 'compute',
|
|
78 |
self._custom_version('compute') or '')
|
|
77 |
self._custom_type('network') or 'network',
|
|
78 |
self._custom_version('network') or '')
|
|
79 | 79 |
base_url = cyclades_endpoints['publicURL'] |
80 | 80 |
token = self.auth_base.token |
81 | 81 |
self.client = CycladesNetworkClient(base_url=base_url, token=token) |
Also available in: Unified diff