Revision e440e835 snf-cyclades-app/synnefo/api/flavors.py
b/snf-cyclades-app/synnefo/api/flavors.py | ||
---|---|---|
1 |
# Copyright 2011 GRNET S.A. All rights reserved. |
|
2 |
#
|
|
1 |
# Copyright 2011, 2012, 2013 GRNET S.A. All rights reserved.
|
|
2 |
# |
|
3 | 3 |
# Redistribution and use in source and binary forms, with or |
4 | 4 |
# without modification, are permitted provided that the following |
5 | 5 |
# conditions are met: |
6 |
#
|
|
6 |
# |
|
7 | 7 |
# 1. Redistributions of source code must retain the above |
8 | 8 |
# copyright notice, this list of conditions and the following |
9 | 9 |
# disclaimer. |
10 |
#
|
|
10 |
# |
|
11 | 11 |
# 2. Redistributions in binary form must reproduce the above |
12 | 12 |
# copyright notice, this list of conditions and the following |
13 | 13 |
# disclaimer in the documentation and/or other materials |
14 | 14 |
# provided with the distribution. |
15 |
#
|
|
15 |
# |
|
16 | 16 |
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS |
17 | 17 |
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | 18 |
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
... | ... | |
25 | 25 |
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
26 | 26 |
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
27 | 27 |
# POSSIBILITY OF SUCH DAMAGE. |
28 |
#
|
|
28 |
# |
|
29 | 29 |
# The views and conclusions contained in the software and |
30 | 30 |
# documentation are those of the authors and should not be |
31 | 31 |
# interpreted as representing official policies, either expressed |
... | ... | |
45 | 45 |
log = getLogger('synnefo.api') |
46 | 46 |
|
47 | 47 |
|
48 |
urlpatterns = patterns('synnefo.api.flavors', |
|
48 |
urlpatterns = patterns( |
|
49 |
'synnefo.api.flavors', |
|
49 | 50 |
(r'^(?:/|.json|.xml)?$', 'list_flavors'), |
50 | 51 |
(r'^/detail(?:.json|.xml)?$', 'list_flavors', {'detail': True}), |
51 | 52 |
(r'^/(\d+)(?:.json|.xml)?$', 'get_flavor_details'), |
... | ... | |
73 | 74 |
|
74 | 75 |
log.debug('list_flavors detail=%s', detail) |
75 | 76 |
active_flavors = Flavor.objects.exclude(deleted=True) |
76 |
flavors = [flavor_to_dict(flavor, detail)\
|
|
77 |
flavors = [flavor_to_dict(flavor, detail) |
|
77 | 78 |
for flavor in active_flavors.order_by('id')] |
78 | 79 |
|
79 | 80 |
if request.serialization == 'xml': |
Also available in: Unified diff