x/python-ganttclient
Code Issues Proposed changes

Merge "Fix concurrency of XenAPI sessions"

Browse Source
This commit is contained in:
Jenkins
2011-10-25 19:11:41 +00:00
committed by Gerrit Code Review
parent 584b61f723 e8bff4c1d7
commit 0889e1f433
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/test_xenapi.py
View File

@@ -1072,8 +1072,11 @@ class FakeSession(object):
'free-computed': 40} 'free-computed': 40}
return json.dumps({'host_memory': vm}) return json.dumps({'host_memory': vm})
def get_xenapi(self): def call_xenapi(self, method, *args):
return FakeXenApi() f = FakeXenApi()
for m in method.split('.'):
f = getattr(f, m)
return f(*args)
class HostStateTestCase(test.TestCase): class HostStateTestCase(test.TestCase):

4
nova/tests/xenapi/stubs.py
View File

@@ -38,7 +38,7 @@ def stubout_instance_snapshot(stubs):
sr_ref = "fakesr" sr_ref = "fakesr"
vdi_ref = create_vdi(name_label=name_label, read_only=False, vdi_ref = create_vdi(name_label=name_label, read_only=False,
sr_ref=sr_ref, sharable=False) sr_ref=sr_ref, sharable=False)
vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref) vdi_rec = session.call_xenapi("VDI.get_record", vdi_ref)
vdi_uuid = vdi_rec['uuid'] vdi_uuid = vdi_rec['uuid']
return [dict(vdi_type='os', vdi_uuid=vdi_uuid)] return [dict(vdi_type='os', vdi_uuid=vdi_uuid)]
@@ -307,7 +307,7 @@ def stub_out_migration_methods(stubs):
def fake_get_vdi(cls, session, vm_ref): def fake_get_vdi(cls, session, vm_ref):
vdi_ref = fake.create_vdi(name_label='derp', read_only=False, vdi_ref = fake.create_vdi(name_label='derp', read_only=False,
sr_ref='herp', sharable=False) sr_ref='herp', sharable=False)
vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref) vdi_rec = session.call_xenapi("VDI.get_record", vdi_ref)
return vdi_ref, {'uuid': vdi_rec['uuid'], } return vdi_ref, {'uuid': vdi_rec['uuid'], }
def fake_shutdown(self, inst, vm, hard=True): def fake_shutdown(self, inst, vm, hard=True):