Revision d08a5f6f api/handlers.py
b/api/handlers.py | ||
---|---|---|
1 | 1 |
# vim: ts=4 sts=4 et ai sw=4 fileencoding=utf-8 |
2 | 2 |
# |
3 |
# Copyright © 2010 Greek Research and Technology Network |
|
3 |
# Copyright © 2010 Greek Research and Technology Network
|
|
4 | 4 |
# |
5 | 5 |
|
6 | 6 |
from django.conf import settings |
... | ... | |
79 | 79 |
#get the first user, since we don't have any user data yet |
80 | 80 |
virtual_servers_list = [{'status': server.state, 'flavorId': server.flavor, \ |
81 | 81 |
'name': server.name, 'id': server.id, 'imageId': server.imageid, |
82 |
'metadata': {'Server_Label': server.server_label, \ |
|
83 |
'Image_Version': server.image_version}, \ |
|
82 |
'metadata': {'Server_Label': server.description, \ |
|
84 | 83 |
'hostId': '9e107d9d372bb6826bd81d3542a419d6', \ |
85 | 84 |
'addresses': {'public': ['67.23.10.133'], 'private': ['10.176.42.17']}} \ |
86 | 85 |
for server in virtual_servers] |
... | ... | |
99 | 98 |
virtual_servers = VirtualMachine.objects.filter(owner=User.objects.all()[0]) |
100 | 99 |
virtual_servers_list = [{'status': server.state, 'flavorId': server.flavor, \ |
101 | 100 |
'name': server.name, 'id': server.id, 'imageId': server.imageid, |
102 |
'metadata': {'Server_Label': server.server_label, \ |
|
103 |
'Image_Version': server.image_version}, \ |
|
101 |
'metadata': {'Server_Label': server.description, \ |
|
104 | 102 |
'hostId': '9e107d9d372bb6826bd81d3542a419d6', \ |
105 | 103 |
'addresses': {'public': ['67.23.10.133'], 'private': ['10.176.42.17']}} \ |
106 | 104 |
for server in virtual_servers] |
Also available in: Unified diff