Revision 5033585e

b/kamaki/cli/commands/astakos.py
35 35
from os.path import abspath
36 36

  
37 37
from kamaki.cli import command
38
from kamaki.clients.astakos import AstakosClient, SynnefoAstakosClient
38
from kamaki.clients.astakos import SynnefoAstakosClient
39 39
from kamaki.cli.commands import (
40 40
    _command_init, errors, _optional_json, addLogSettings)
41 41
from kamaki.cli.command_tree import CommandTree
42
from kamaki.cli.errors import CLIBaseUrlError, CLIError, CLISyntaxError
42
from kamaki.cli.errors import CLIBaseUrlError, CLISyntaxError
43 43
from kamaki.cli.argument import (
44 44
    FlagArgument, ValueArgument, IntArgument, CommaSeparatedListArgument)
45 45
from kamaki.cli.utils import format_size
......
85 85
        else:
86 86
            self.cloud = 'default'
87 87
        if getattr(self, 'auth_base', None):
88
            self.client = SynnefoAstakosClient(
89
                auth_url=self.auth_base.base_url,
90
                token=self.auth_base.token)
88
            self.client = self.auth_base.get_client()
91 89
            return
92 90
        raise CLIBaseUrlError(service='astakos')
93 91

  
......
102 100
    @errors.generic.all
103 101
    @errors.user.authenticate
104 102
    @errors.user.astakosclient
105
    def _run(self, custom_token=None):
106
        token_bu = self.client.token
107
        try:
108
            self.client.token = custom_token or token_bu
109
            self._print(
110
                self.client.get_user_info(), self.print_dict)
111
        finally:
112
            self.client.token = token_bu
103
    @with_temp_token
104
    def _run(self):
105
        self._print(self.client.get_user_info(), self.print_dict)
113 106

  
114 107
    def main(self, token=None):
115 108
        super(self.__class__, self)._run()
116
        self._run(custom_token=token)
109
        self._run(token=token)
117 110

  
118 111

  
119 112
@command(user_commands)
120
class user_uuid2username(_init_synnefo_astakosclient, _optional_json):
121
    """Get username(s) from uuid(s)"""
113
class user_uuid2name(_init_synnefo_astakosclient, _optional_json):
114
    """Get user name(s) from uuid(s)"""
122 115

  
123 116
    @errors.generic.all
124 117
    @errors.user.astakosclient
......
135 128

  
136 129

  
137 130
@command(user_commands)
138
class user_username2uuid(_init_synnefo_astakosclient, _optional_json):
139
    """Get uuid(s) from username(s)"""
131
class user_name2uuid(_init_synnefo_astakosclient, _optional_json):
132
    """Get user uuid(s) from name(s)"""
140 133

  
141 134
    @errors.generic.all
142 135
    @errors.user.astakosclient

Also available in: Unified diff