Revision a333c901
| b/snf-cyclades-app/synnefo/api/flavors.py | ||
|---|---|---|
| 59 | 59 |
if detail: |
| 60 | 60 |
d['ram'] = flavor.ram |
| 61 | 61 |
d['disk'] = flavor.disk |
| 62 |
d['cpu'] = flavor.cpu
|
|
| 62 |
d['vcpus'] = flavor.cpu
|
|
| 63 | 63 |
d['SNF:disk_template'] = flavor.disk_template |
| 64 | 64 |
return d |
| 65 | 65 |
|
| b/snf-cyclades-app/synnefo/api/test/flavors.py | ||
|---|---|---|
| 71 | 71 |
for i in range(0, len(db_flavors)): |
| 72 | 72 |
api_flavor = api_flavors[i] |
| 73 | 73 |
db_flavor = Flavor.objects.get(id=db_flavors[i].id) |
| 74 |
self.assertEqual(api_flavor['cpu'], db_flavor.cpu)
|
|
| 74 |
self.assertEqual(api_flavor['vcpus'], db_flavor.cpu)
|
|
| 75 | 75 |
self.assertEqual(api_flavor['id'], db_flavor.id) |
| 76 | 76 |
self.assertEqual(api_flavor['disk'], db_flavor.disk) |
| 77 | 77 |
self.assertEqual(api_flavor['name'], db_flavor.name) |
| ... | ... | |
| 88 | 88 |
|
| 89 | 89 |
api_flavor = json.loads(response.content)['flavor'] |
| 90 | 90 |
db_flavor = Flavor.objects.get(id=flavor.id) |
| 91 |
self.assertEqual(api_flavor['cpu'], db_flavor.cpu)
|
|
| 91 |
self.assertEqual(api_flavor['vcpus'], db_flavor.cpu)
|
|
| 92 | 92 |
self.assertEqual(api_flavor['id'], db_flavor.id) |
| 93 | 93 |
self.assertEqual(api_flavor['disk'], db_flavor.disk) |
| 94 | 94 |
self.assertEqual(api_flavor['name'], db_flavor.name) |
Also available in: Unified diff