From 6e36efa195ff9bed3af182fe2b88de92f4861ba7 Mon Sep 17 00:00:00 2001 From: melanie witt Date: Thu, 28 Aug 2014 17:39:06 +0000 Subject: move dict copy in prep for object-ify flavors This change is to help split up the patches for object-ifying flavors. It moves a dict copy of instance_type from the tests to get_flavor_by_flavor_id(). Change-Id: I0082a56aa637169fd6e1db3aad56877c9f745bc5 --- nova/compute/flavors.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/compute/flavors.py') diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py index 604defa622..116320d630 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): -- cgit v1.2.1