diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-08 13:33:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-08 13:33:13 +0000 |
| commit | 42e63113147e9dc8dccd46a4f6e8b52258963592 (patch) | |
| tree | fc75f39d1877091cf46f0eebafff1da58fdb00ee /nova/compute/flavors.py | |
| parent | a4df88a4eee1b380011fd0f3ed94b317c4347da0 (diff) | |
| parent | 6e36efa195ff9bed3af182fe2b88de92f4861ba7 (diff) | |
| download | nova-42e63113147e9dc8dccd46a4f6e8b52258963592.tar.gz | |
Merge "move dict copy in prep for object-ify flavors"
Diffstat (limited to 'nova/compute/flavors.py')
| -rw-r--r-- | nova/compute/flavors.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py index 34b5224e40..10ae4484c8 100644 --- a/nova/compute/flavors.py +++ b/nova/compute/flavors.py @@ -260,7 +260,8 @@ def get_flavor_by_flavor_id(flavorid, ctxt=None, read_deleted="yes"): if ctxt is None: ctxt = context.get_admin_context(read_deleted=read_deleted) - return db.flavor_get_by_flavor_id(ctxt, flavorid, read_deleted) + # NOTE(melwitt): return a copy temporarily until conversion to object + return dict(db.flavor_get_by_flavor_id(ctxt, flavorid, read_deleted)) def get_flavor_access_by_flavor_id(flavorid, ctxt=None): |