Revision 5029ff36 snf-cyclades-app/synnefo/api/servers.py
| b/snf-cyclades-app/synnefo/api/servers.py | ||
|---|---|---|
| 139 | 139 |
|
| 140 | 140 |
metadata = dict((m.meta_key, m.meta_value) for m in vm.metadata.all()) |
| 141 | 141 |
if metadata: |
| 142 |
d['metadata'] = {'values': metadata}
|
|
| 142 |
d['metadata'] = metadata
|
|
| 143 | 143 |
|
| 144 | 144 |
vm_nics = vm.nics.filter(state="ACTIVE").order_by("index")
|
| 145 | 145 |
attachments = map(nic_to_dict, vm_nics) |
| 146 |
d['attachments'] = {'values': attachments}
|
|
| 146 |
d['attachments'] = attachments
|
|
| 147 | 147 |
|
| 148 | 148 |
# include the latest vm diagnostic, if set |
| 149 | 149 |
diagnostic = vm.get_last_diagnostic() |
| ... | ... | |
| 238 | 238 |
'servers': servers, |
| 239 | 239 |
'detail': detail}) |
| 240 | 240 |
else: |
| 241 |
data = json.dumps({'servers': {'values': servers}})
|
|
| 241 |
data = json.dumps({'servers': servers})
|
|
| 242 | 242 |
|
| 243 | 243 |
return HttpResponse(data, status=200) |
| 244 | 244 |
|
| ... | ... | |
| 544 | 544 |
if request.serialization == 'xml': |
| 545 | 545 |
data = render_to_string('list_addresses.xml', {'addresses': addresses})
|
| 546 | 546 |
else: |
| 547 |
data = json.dumps({'addresses': {'values': addresses}})
|
|
| 547 |
data = json.dumps({'addresses': addresses})
|
|
| 548 | 548 |
|
| 549 | 549 |
return HttpResponse(data, status=200) |
| 550 | 550 |
|
| ... | ... | |
| 585 | 585 |
log.debug('list_server_metadata %s', server_id)
|
| 586 | 586 |
vm = util.get_vm(server_id, request.user_uniq) |
| 587 | 587 |
metadata = dict((m.meta_key, m.meta_value) for m in vm.metadata.all()) |
| 588 |
return util.render_metadata(request, metadata, use_values=True, status=200) |
|
| 588 |
return util.render_metadata(request, metadata, use_values=False, |
|
| 589 |
status=200) |
|
| 589 | 590 |
|
| 590 | 591 |
|
| 591 | 592 |
@api.api_method(http_method='POST', user_required=True, logger=log) |
Also available in: Unified diff