Revision f5c28bfa kamaki/cli/commands/pithos.py
| b/kamaki/cli/commands/pithos.py | ||
|---|---|---|
| 160 | 160 |
self.config.get('pithos', 'version'))
|
| 161 | 161 |
self.base_url = pithos_endpoints['publicURL'] |
| 162 | 162 |
else: |
| 163 |
self.base_url = self.config.get('pithos', 'url')
|
|
| 163 |
self.base_url = self.config.get('file', 'url')\
|
|
| 164 |
or self.config.get('store', 'url')\
|
|
| 165 |
or self.config.get('pithos', 'url')
|
|
| 164 | 166 |
if not self.base_url: |
| 165 | 167 |
raise CLIBaseUrlError(service='pithos') |
| 166 | 168 |
|
| 167 | 169 |
self._set_account() |
| 168 | 170 |
self.container = self.config.get('file', 'container')\
|
| 171 |
or self.config.get('store', 'container')\
|
|
| 172 |
or self.config.get('pithos', 'container')\
|
|
| 169 | 173 |
or self.config.get('global', 'container')
|
| 170 | 174 |
self.client = PithosClient( |
| 171 | 175 |
base_url=self.base_url, |
| ... | ... | |
| 179 | 183 |
self._run() |
| 180 | 184 |
|
| 181 | 185 |
def _set_account(self): |
| 182 |
if getattr(self, 'base_url', False):
|
|
| 186 |
if getattr(self, 'auth_base', False):
|
|
| 183 | 187 |
self.account = self.auth_base.user_term('id', self.token)
|
| 184 | 188 |
else: |
| 185 |
astakos_url = self.config('astakos', 'get')
|
|
| 189 |
astakos_url = self.config.get('user', 'url')\
|
|
| 190 |
or self.config.get('astakos', 'url')
|
|
| 186 | 191 |
if not astakos_url: |
| 187 | 192 |
raise CLIBaseUrlError(service='astakos') |
| 188 | 193 |
astakos = AstakosClient(astakos_url, self.token) |
Also available in: Unified diff