Revision e1c18867 kamaki/cli/commands/snf-astakos.py

b/kamaki/cli/commands/snf-astakos.py
35 35

  
36 36
from kamaki.cli import command
37 37
from kamaki.cli.errors import CLISyntaxError
38
from kamaki.cli.commands import _command_init, errors, _optional_json
38
from kamaki.cli.commands import _command_init, _optional_json
39 39
from kamaki.cli.command_tree import CommandTree
40 40
from kamaki.cli.utils import print_dict
41 41
from kamaki.cli.argument import FlagArgument, ValueArgument
......
54 54
        super(_astakos_init, self).__init__(arguments)
55 55
        self['token'] = ValueArgument('Custom token', '--token')
56 56

  
57
    @errors.generic.all
58
    #@errors.user.load
59 57
    def _run(self):
60 58
        self.token = self['token']\
61 59
            or self.config.get('astakos', 'token')\
......
86 84
        usage=FlagArgument('also return usage information', ('--with-usage'))
87 85
    )
88 86

  
89
    @errors.generic.all
90
    #@errors.user.authenticate
91 87
    def _run(self):
92
        print('KAMAKI LOG: call get_user_info(%s, %s)' % (
93
            self.token, self['usage']))
94 88
        self._print(
95
            self.client.get_user_info(self.token, self['usage']),
96
            print_dict)
89
            self.client.get_user_info(self.token, self['usage']), print_dict)
97 90

  
98 91
    def main(self):
99 92
        super(self.__class__, self)._run()
......
157 150

  
158 151

  
159 152
@command(snfastakos_cmds)
160
class astakos_services_list(_astakos_init):
153
class astakos_services_list(_astakos_init, _optional_json):
161 154
    """List available services"""
162 155

  
163 156
    def _run(self):

Also available in: Unified diff