x/python-ganttclient
Code Issues Proposed changes

Merge "Remove unnecessary db call from xenapi/vmops"

Browse Source
This commit is contained in:
Jenkins
2012-11-02 22:59:21 +00:00
committed by Gerrit Code Review
parent 52695e3811 b96ba14622
commit 396144db92
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nova/tests/test_xenapi.py
View File

@@ -1488,6 +1488,11 @@ class XenAPIGenerateLocal(stubs.XenAPITestBase):
instance = db.instance_update(self.context, instance['uuid'], instance = db.instance_update(self.context, instance['uuid'],
{'instance_type_id': 5}) {'instance_type_id': 5})
# NOTE(danms): because we're stubbing out the instance_types from
# the database, our instance['instance_type'] doesn't get properly
# filled out here, so put what we need into it
instance['instance_type']['swap'] = 1024
def fake_generate_swap(*args, **kwargs): def fake_generate_swap(*args, **kwargs):
self.called = True self.called = True
self.stubs.Set(vm_utils, 'generate_swap', fake_generate_swap) self.stubs.Set(vm_utils, 'generate_swap', fake_generate_swap)
@@ -1500,6 +1505,11 @@ class XenAPIGenerateLocal(stubs.XenAPITestBase):
instance = db.instance_update(self.context, instance['uuid'], instance = db.instance_update(self.context, instance['uuid'],
{'instance_type_id': 4}) {'instance_type_id': 4})
# NOTE(danms): because we're stubbing out the instance_types from
# the database, our instance['instance_type'] doesn't get properly
# filled out here, so put what we need into it
instance['instance_type']['ephemeral_gb'] = 160
def fake_generate_ephemeral(*args): def fake_generate_ephemeral(*args):
self.called = True self.called = True
self.stubs.Set(vm_utils, 'generate_ephemeral', fake_generate_ephemeral) self.stubs.Set(vm_utils, 'generate_ephemeral', fake_generate_ephemeral)