Revision f533f224 api/flavors.py
b/api/flavors.py | ||
---|---|---|
7 | 7 |
from django.template.loader import render_to_string |
8 | 8 |
from django.utils import simplejson as json |
9 | 9 |
|
10 |
from synnefo.api.util import get_flavor, api_method
|
|
10 |
from synnefo.api import util
|
|
11 | 11 |
from synnefo.db.models import Flavor |
12 | 12 |
|
13 | 13 |
|
... | ... | |
27 | 27 |
return d |
28 | 28 |
|
29 | 29 |
|
30 |
@api_method('GET') |
|
30 |
@util.api_method('GET')
|
|
31 | 31 |
def list_flavors(request, detail=False): |
32 | 32 |
# Normal Response Codes: 200, 203 |
33 | 33 |
# Error Response Codes: computeFault (400, 500), |
... | ... | |
40 | 40 |
flavors = [flavor_to_dict(flavor, detail) for flavor in all_flavors] |
41 | 41 |
|
42 | 42 |
if request.serialization == 'xml': |
43 |
data = render_to_string('list_flavors.xml', {'flavors': flavors, 'detail': detail}) |
|
43 |
data = render_to_string('list_flavors.xml', { |
|
44 |
'flavors': flavors, |
|
45 |
'detail': detail}) |
|
44 | 46 |
else: |
45 | 47 |
data = json.dumps({'flavors': {'values': flavors}}) |
46 | 48 |
|
47 | 49 |
return HttpResponse(data, status=200) |
48 | 50 |
|
49 |
@api_method('GET') |
|
51 |
@util.api_method('GET')
|
|
50 | 52 |
def get_flavor_details(request, flavor_id): |
51 | 53 |
# Normal Response Codes: 200, 203 |
52 | 54 |
# Error Response Codes: computeFault (400, 500), |
... | ... | |
56 | 58 |
# itemNotFound (404), |
57 | 59 |
# overLimit (413) |
58 | 60 |
|
59 |
flavor = get_flavor(flavor_id) |
|
61 |
flavor = util.get_flavor(flavor_id)
|
|
60 | 62 |
flavordict = flavor_to_dict(flavor, detail=True) |
61 | 63 |
|
62 | 64 |
if request.serialization == 'xml': |
Also available in: Unified diff