Switch all xenapi async plugin calls to be sync

Originally all calls were required to be async because of integration
with twisted, but that has long since been changed and just using the
synchronous calls is easier and less code.

Change-Id: Ib86fc721326de34fd71d68bbec42ecd65280aa8a
This commit is contained in:
Johannes Erdfelt
2012-03-09 16:20:01 +00:00
parent 127d35b8b5
commit 81daff1818

View File

@@ -412,7 +412,6 @@ def stub_out_migration_methods(stubs):
stubs.Set(vm_utils.VMHelper, 'scan_sr', fake_sr)
stubs.Set(vmops.VMOps, '_create_snapshot', fake_create_snapshot)
stubs.Set(vm_utils.VMHelper, 'get_vdi_for_vm_safely', fake_get_vdi)
stubs.Set(xenapi_conn.XenAPISession, 'wait_for_task', lambda x, y, z: None)
stubs.Set(vm_utils.VMHelper, 'get_sr_path', fake_get_sr_path)
stubs.Set(vmops.VMOps, 'reset_network', fake_reset_network)
stubs.Set(vmops.VMOps, '_shutdown', fake_shutdown)