Revision a23d59a4

b/snf-cyclades-app/synnefo/api/servers.py
341 341
    log.debug('list_servers detail=%s', detail)
342 342
    user_vms = VirtualMachine.objects.filter(userid=request.user_uniq)
343 343
    if detail:
344
        user_vms = user_vms.prefetch_related("nics__ips")
344
        user_vms = user_vms.prefetch_related("nics__ips", "metadata")
345 345

  
346 346
    user_vms = utils.filter_modified_since(request, objects=user_vms)
347 347

  
......
426 426

  
427 427
    log.debug('get_server_details %s', server_id)
428 428
    vm = util.get_vm(server_id, request.user_uniq,
429
                     prefetch_related="nics__ips")
429
                     prefetch_related=["nics__ips", "metadata"])
430 430
    server = vm_to_dict(vm, detail=True)
431 431
    return render_server(request, server)
432 432

  
b/snf-cyclades-app/synnefo/api/util.py
138 138
        if for_update:
139 139
            servers = servers.select_for_update()
140 140
        if prefetch_related is not None:
141
            servers = servers.prefetch_related(prefetch_related)
141
            if isinstance(prefetch_related, list):
142
                servers = servers.prefetch_related(*prefetch_related)
143
            else:
144
                servers = servers.prefetch_related(prefetch_related)
142 145
        vm = servers.get(id=server_id, userid=user_id)
143 146
        if non_deleted and vm.deleted:
144 147
            raise faults.BadRequest("Server has been deleted.")

Also available in: Unified diff