Revision f1641e4d
b/api/flavors.py | ||
---|---|---|
23 | 23 |
if detail: |
24 | 24 |
d['ram'] = flavor.ram |
25 | 25 |
d['disk'] = flavor.disk |
26 |
d['cpu'] = flavor.cpu |
|
26 | 27 |
return d |
27 | 28 |
|
28 | 29 |
|
b/api/templates/flavor.xml | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
2 |
<flavor xmlns="http://docs.openstack.org/compute/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" id="{{ flavor.id }}" name="{{ flavor.name }}" ram="{{ flavor.ram }}" disk="{{ flavor.disk }}"> |
|
2 |
<flavor xmlns="http://docs.openstack.org/compute/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" id="{{ flavor.id }}" name="{{ flavor.name }}" ram="{{ flavor.ram }}" cpu="{{ flavor.cpu }}" disk="{{ flavor.disk }}">
|
|
3 | 3 |
</flavor> |
b/api/templates/list_flavors.xml | ||
---|---|---|
2 | 2 |
<?xml version="1.0" encoding="UTF-8"?> |
3 | 3 |
<flavors xmlns="http://docs.openstack.org/compute/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom"> |
4 | 4 |
{% for flavor in flavors %} |
5 |
<flavor id="{{ flavor.id}}" name="{{ flavor.name }}"{% if detail %} ram="{{ flavor.ram }}" disk="{{ flavor.disk }}"{% endif %}> |
|
5 |
<flavor id="{{ flavor.id}}" name="{{ flavor.name }}"{% if detail %} ram="{{ flavor.ram }}" cpu="{{ flavor.cpu }}" disk="{{ flavor.disk }}"{% endif %}>
|
|
6 | 6 |
</flavor> |
7 | 7 |
{% endfor %} |
8 | 8 |
</flavors> |
b/ui/static/synnefo.js | ||
---|---|---|
337 | 337 |
// get and configure flavor selection |
338 | 338 |
function update_flavors() { |
339 | 339 |
$.ajax({ |
340 |
url: '/api/v1.0/flavors/detail',
|
|
340 |
url: API_URL + '/flavors/detail',
|
|
341 | 341 |
type: "GET", |
342 | 342 |
//async: false, |
343 | 343 |
dataType: "json", |
... | ... | |
350 | 350 |
} |
351 | 351 |
}, |
352 | 352 |
success: function(data, textStatus, jqXHR) { |
353 |
flavors = data.flavors; |
|
353 |
flavors = data.flavors.values;
|
|
354 | 354 |
$.each(flavors, function(i, flavor) { |
355 | 355 |
cpus[i] = flavor['cpu']; |
356 | 356 |
disks[i] = flavor['disk']; |
Also available in: Unified diff