summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-10-24 15:45:02 +0000
committerGerrit Code Review <review@openstack.org>2011-10-24 15:45:02 +0000
commitfa2c67d4a6a7eb89218a4bed04741f183b2d5948 (patch)
tree3e3631c5b9d5f60ab4a216aa0556d83c2e9c435d /nova/virt
parentf0dfa6d3dfb09417426ccad717492c9ae417f47e (diff)
parent0162a42970b833c2d5d0802ff4c55f65fa253ee2 (diff)
Merge "Convert instancetype.flavorid to string"
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 e30c0fce1..9a1ceef4e 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