Revision 1fb0fdda
b/snf-cyclades-app/synnefo/api/management/commands/server-inspect.py | ||
---|---|---|
94 | 94 |
['name', 'owner_uuid', |
95 | 95 |
'owner_name' if displayname else Omit, |
96 | 96 |
'flavor', 'image', 'state', 'backend', 'deleted', |
97 |
'action', 'backendjobid', 'backendopcode',
|
|
98 |
'backendjobstatus', 'backend_time']) |
|
97 |
'action', 'task', 'task_job', 'backendjobid',
|
|
98 |
'backendopcode', 'backendjobstatus', 'backend_time'])
|
|
99 | 99 |
|
100 | 100 |
uuid = vm.userid |
101 | 101 |
if displayname: |
... | ... | |
105 | 105 |
[vm.name, uuid, dname if displayname else Omit, |
106 | 106 |
vm.flavor.name, image, common.format_vm_state(vm), |
107 | 107 |
str(vm.backend), str(vm.deleted), str(vm.action), |
108 |
str(vm.task), str(vm.task_job_id), |
|
108 | 109 |
str(vm.backendjobid), str(vm.backendopcode), |
109 | 110 |
str(vm.backendjobstatus), str(vm.backendtime)]) |
110 | 111 |
|
b/snf-cyclades-app/synnefo/api/management/commands/server-show.py | ||
---|---|---|
61 | 61 |
image_name = "None" |
62 | 62 |
image = '%s (%s)' % (imageid, image_name) |
63 | 63 |
|
64 |
usercache = UserCache(ASTAKOS_BASE_URL, ASTAKOS_TOKEN)
|
|
64 |
usercache = UserCache(ASTAKOS_BASE_URL, ASTAKOS_TOKEN)
|
|
65 | 65 |
kv = { |
66 |
'id': server.id, |
|
67 |
'name': server.name, |
|
68 |
'owner_uuid': userid, |
|
69 |
'owner_name': usercache.get_name(userid), |
|
70 |
'created': utils.format_date(server.created), |
|
71 |
'updated': utils.format_date(server.updated), |
|
72 |
'image': image, |
|
73 |
'host id': server.hostid, |
|
74 |
'flavor': flavor, |
|
75 |
'deleted': utils.format_bool(server.deleted), |
|
76 |
'suspended': utils.format_bool(server.suspended), |
|
77 |
'state': format_vm_state(server), |
|
66 |
'id': server.id, |
|
67 |
'name': server.name, |
|
68 |
'owner_uuid': userid, |
|
69 |
'owner_name': usercache.get_name(userid), |
|
70 |
'created': utils.format_date(server.created), |
|
71 |
'updated': utils.format_date(server.updated), |
|
72 |
'image': image, |
|
73 |
'host id': server.hostid, |
|
74 |
'flavor': flavor, |
|
75 |
'deleted': utils.format_bool(server.deleted), |
|
76 |
'suspended': utils.format_bool(server.suspended), |
|
77 |
'state': format_vm_state(server), |
|
78 |
'task': server.task, |
|
79 |
'task_job_id': server.task_job_id, |
|
78 | 80 |
} |
79 | 81 |
|
80 | 82 |
utils.pprint_table(self.stdout, [kv.values()], kv.keys(), |
Also available in: Unified diff