Revision b45834eb
| b/kamaki/cli/commands/cyclades.py | ||
|---|---|---|
| 270 | 270 |
vnc=FlagArgument( |
| 271 | 271 |
'Show VNC connection information (valid for a short period)', |
| 272 | 272 |
'--vnc-credentials'), |
| 273 |
stats=FlagArgument('Get URLs for server statistics', '--stats')
|
|
| 273 |
stats=FlagArgument('Get URLs for server statistics', '--stats'),
|
|
| 274 |
diagnostics=FlagArgument('Diagnostic information', '--diagnostics')
|
|
| 274 | 275 |
) |
| 275 | 276 |
|
| 276 | 277 |
@errors.generic.all |
| ... | ... | |
| 290 | 291 |
elif self['stats']: |
| 291 | 292 |
self._print( |
| 292 | 293 |
self.client.get_server_stats(server_id), self.print_dict) |
| 294 |
elif self['diagnostics']: |
|
| 295 |
self._print(self.client.get_server_diagnostics(server_id)) |
|
| 293 | 296 |
else: |
| 294 | 297 |
uuids = self._uuids2usernames([vm['user_id'], vm['tenant_id']]) |
| 295 | 298 |
vm['user_id'] += ' (%s)' % uuids[vm['user_id']] |
| b/kamaki/clients/cyclades/__init__.py | ||
|---|---|---|
| 121 | 121 |
r = self.servers_stats_get(server_id) |
| 122 | 122 |
return r.json['stats'] |
| 123 | 123 |
|
| 124 |
def get_server_diagnostics(self, server_id): |
|
| 125 |
""" |
|
| 126 |
:param server_id: integer (str or int) |
|
| 127 |
|
|
| 128 |
:returns: (list) |
|
| 129 |
""" |
|
| 130 |
r = self.servers_diagnostics_get(server_id) |
|
| 131 |
return r.json |
|
| 132 |
|
|
| 124 | 133 |
def wait_server( |
| 125 | 134 |
self, server_id, |
| 126 | 135 |
current_status='BUILD', |
| b/kamaki/clients/cyclades/rest_api.py | ||
|---|---|---|
| 42 | 42 |
"""GET base_url/servers/<server_id>/stats""" |
| 43 | 43 |
path = path4url('servers', server_id, 'stats')
|
| 44 | 44 |
return self.get(path, success=200, **kwargs) |
| 45 |
|
|
| 46 |
def servers_diagnostics_get(self, server_id, **kwargs): |
|
| 47 |
"""GET base_url/servers/<server_id>/diagnostics""" |
|
| 48 |
path = path4url('servers', server_id, 'diagnostics')
|
|
| 49 |
return self.get(path, success=200, **kwargs) |
|
| b/kamaki/clients/cyclades/test.py | ||
|---|---|---|
| 106 | 106 |
get.assert_called_once_with( |
| 107 | 107 |
'/servers/%s/stats' % server_id, success=200) |
| 108 | 108 |
|
| 109 |
@patch('kamaki.clients.Client.get', return_value='ret')
|
|
| 110 |
def test_servers_diagnostics_get(self, get): |
|
| 111 |
server_id = 'server id' |
|
| 112 |
self.assertEqual( |
|
| 113 |
self.client.servers_diagnostics_get(server_id), 'ret') |
|
| 114 |
get.assert_called_once_with( |
|
| 115 |
'/servers/%s/diagnostics' % server_id, success=200) |
|
| 116 |
|
|
| 109 | 117 |
|
| 110 | 118 |
class CycladesNetworkClient(TestCase): |
| 111 | 119 |
|
Also available in: Unified diff