x/gantt
Code Issues Proposed changes

merged trunk

Browse Source
This commit is contained in:
Cory Wright
2011-03-04 17:59:28 +00:00
parent 86a0ca07bb a67a34e25b
commit 038ddde27f
18 changed files with 349 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/test_xenapi.py
View File

@@ -253,7 +253,7 @@ class XenAPIVMTestCase(test.TestCase):
def check_vm_record(self):
# Check that m1.large above turned into the right thing.
instance_type = instance_types.INSTANCE_TYPES['m1.large']
instance_type = db.instance_type_get_by_name(conn, 'm1.large')
mem_kib = long(instance_type['memory_mb']) << 10
mem_bytes = str(mem_kib << 10)
vcpus = instance_type['vcpus']