summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-10-12 16:28:24 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-10-22 12:57:35 -0400
commit0162a42970b833c2d5d0802ff4c55f65fa253ee2 (patch)
tree827ca221db7a7cc26b6197987138d710c6232018 /nova/virt
parent75a3fbb21eebd4de8775b63c327d9d57859d090c (diff)
Convert instancetype.flavorid to string
Fixes bug 861666. This also removes some direct database access in favor of using nova.compute.instance_types throughout the code. Change-Id: I572cc19454fa76f435f5672d3d6e7ed55c8817da
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/xenapi/vm_utils.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 9dbc33ba6..e3591c1df 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -633,8 +633,7 @@ w
# FIXME(jk0): this was copied directly from compute.manager.py, let's
# refactor this to a common area
instance_type_id = instance['instance_type_id']
- instance_type = db.instance_type_get(context,
- instance_type_id)
+ instance_type = instance_types.get_instance_type(instance_type_id)
allowed_size_gb = instance_type['local_gb']
allowed_size_bytes = allowed_size_gb * 1024 * 1024 * 1024