diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-16 14:35:04 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-16 14:35:04 -0500 |
| commit | 85bae497aa803914d329f2872d343a9982dc370e (patch) | |
| tree | 9ed0d1679fac4d2a6a9069e32e8c030326785f2d /nova | |
| parent | 7dbda7ca270ee5109f307be3d0f1fb7c0336ce21 (diff) | |
| download | nova-85bae497aa803914d329f2872d343a9982dc370e.tar.gz nova-85bae497aa803914d329f2872d343a9982dc370e.tar.xz nova-85bae497aa803914d329f2872d343a9982dc370e.zip | |
Changes
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/flavors.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py index f3d040ba3..b9e40371d 100644 --- a/nova/api/openstack/flavors.py +++ b/nova/api/openstack/flavors.py @@ -36,7 +36,7 @@ class Controller(wsgi.Controller): def index(self, req): """Return all flavors in brief.""" - return dict(flavors=[dict(id=flavor['id'], name=flavor['name']) + return dict(flavors=[dict(id=flavor['flavorid'], name=flavor['name']) for flavor in self.detail(req)['flavors']]) def detail(self, req): @@ -48,6 +48,7 @@ class Controller(wsgi.Controller): """Return data about the given flavor id.""" ctxt = req.environ['nova.context'] values = db.instance_type_get_by_flavor_id(ctxt, id) + values.update({'id': values['flavorid']}) return dict(flavor=values) raise faults.Fault(exc.HTTPNotFound()) |