Revision 144b3551 kamaki/cli/commands/errors.py

b/kamaki/cli/commands/errors.py
39 39
from kamaki.cli.utils import format_size
40 40

  
41 41
CLOUDNAME = [
42
    'Note: If you use a named cloud remote, use its name',
43
    'instead of "default"']
42
    'Note: If you use a named cloud, use its name instead of "default"']
44 43

  
45 44

  
46 45
class generic(object):
......
71 70
                        'Make sure a valid token is provided:',
72 71
                        '  to check if token is valid: /user authenticate',
73 72
                        '  to set token:',
74
                        '    /config set remote.default.token <token>',
73
                        '    /config set cloud.default.token <token>',
75 74
                        '  to get current token:',
76
                        '    /config get remote.default.token'] + CLOUDNAME)
75
                        '    /config get cloud.default.token'] + CLOUDNAME)
77 76
                elif ce.status in range(-12, 200) + [302, 401, 403, 500]:
78 77
                    raiseCLIError(ce, importance=3, details=[
79 78
                        'Check if service is up'])
......
86 85
                    raiseCLIError(ce, msg, details=[
87 86
                        'Check if authentication url is correct',
88 87
                        '  check current url:',
89
                        '    /config get remote.default.url',
88
                        '    /config get cloud.default.url',
90 89
                        '  set new auth. url:',
91
                        '    /config set remote.default.url'] + CLOUDNAME)
90
                        '    /config set cloud.default.url'] + CLOUDNAME)
92 91
                raise
93 92
        return _raise
94 93

  
......
96 95
class user(object):
97 96

  
98 97
    _token_details = [
99
        'To check default token: /config get remote.default.token',
98
        'To check default token: /config get cloud.default.token',
100 99
        'If set/update a token:',
101
        '*  (permanent):  /config set remote.default.token <token>',
100
        '*  (permanent):  /config set cloud.default.token <token>',
102 101
        '*  (temporary):  re-run with <token> parameter'] + CLOUDNAME
103 102

  
104 103
    @classmethod
......
112 111
            if not getattr(client, 'token', False):
113 112
                kloger.warning(
114 113
                    'No permanent token (try:'
115
                    ' kamaki config set remote.default.token <tkn>)')
114
                    ' kamaki config set cloud.default.token <tkn>)')
116 115
            if not getattr(client, 'base_url', False):
117 116
                msg = 'Missing synnefo authentication URL'
118 117
                raise CLIError(msg, importance=3, details=[
119 118
                    'Check if authentication url is correct',
120 119
                        '  check current url:',
121
                        '    /config get remote.default.url',
120
                        '    /config get cloud.default.url',
122 121
                        '  set new auth. url:',
123
                        '    /config set remote.default.url'] + CLOUDNAME)
122
                        '    /config set cloud.default.url'] + CLOUDNAME)
124 123
            return r
125 124
        return _raise
126 125

  

Also available in: Unified diff