openstack/nova
Code Issues Proposed changes

Merge "VMware: remove unused parameter from _wait_for_task"

Browse Source
This commit is contained in:
Jenkins 2014-02-26 10:16:42 +00:00 committed by Gerrit Code Review
commit 321b0a9711
6 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/virt/vmwareapi/test_driver_api.py
View File

@ -333,7 +333,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
self.stubs.Set(vmwareapi_fake.FakeVim, '_login', _fake_login)
def fake_poll_task(instance_uuid, task_ref, done):
def fake_poll_task(task_ref, done):
done.send_exception(exception.NovaException('fake exception'))
def fake_stop_loop(loop):
@ -346,7 +346,7 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
self.stubs.Set(self.conn, "_stop_loop",
fake_stop_loop)
self.assertRaises(exception.NovaException,
self.conn._wait_for_task, 'fake-id', 'fake-ref')
self.conn._wait_for_task, 'fake-ref')
self.assertEqual(self.stop_called, 1)
def _create_instance_in_the_db(self, node=None, set_image_ref=True,
@ -573,13 +573,13 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
tmp_file = '[%s] vmware_base/%s/%s.80-flat.vmdk' % (self.ds,
id, id)
def fake_wait_for_task(instance_uuid, task_ref):
def fake_wait_for_task(task_ref):
if task_ref == self.task_ref:
self.task_ref = None
self.assertTrue(vmwareapi_fake.get_file(cached_image))
self.assertTrue(vmwareapi_fake.get_file(tmp_file))
raise exception.NovaException('No space!')
return self.wait_task(instance_uuid, task_ref)
return self.wait_task(task_ref)
def fake_call_method(module, method, *args, **kwargs):
task_ref = self.call_method(module, method, *args, **kwargs)
@ -616,12 +616,12 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
# self.exception will be checked to see that
# the exception has indeed been raised.
def fake_wait_for_task(instance_uuid, task_ref):
def fake_wait_for_task(task_ref):
if task_ref == self.task_ref:
self.task_ref = None
self.exception = True
raise error_util.FileAlreadyExistsException()
return self.wait_task(instance_uuid, task_ref)
return self.wait_task(task_ref)
def fake_call_method(module, method, *args, **kwargs):
task_ref = self.call_method(module, method, *args, **kwargs)
@ -648,12 +648,12 @@ class VMwareAPIVMTestCase(test.NoDBTestCase):
# will be checked to see that the exception has
# indeed been raised.
def fake_wait_for_task(instance_uuid, task_ref):
def fake_wait_for_task(task_ref):
if task_ref == self.task_ref:
self.task_ref = None
self.exception = True
raise error_util.VMwareDriverException('Exception!')
return self.wait_task(instance_uuid, task_ref)
return self.wait_task(task_ref)
def fake_call_method(module, method, *args, **kwargs):
task_ref = self.call_method(module, method, *args, **kwargs)

2
nova/tests/virt/vmwareapi/test_volumeops.py
View File

@ -60,7 +60,7 @@ class VMwareVolumeOpsTestCase(test.NoDBTestCase):
self._volumeops.detach_disk_from_vm('fake_vm_ref', self.instance,
fake_device, destroy_disk)
_wait_for_task.assert_has_calls([
mock.call(self.instance['uuid'], 'fake_configure_task')])
mock.call('fake_configure_task')])
def test_detach_with_destroy_disk_from_vm(self):
self._test_detach_disk_from_vm(destroy_disk=True)

5
nova/virt/vmwareapi/driver.py
View File

@ -867,14 +867,13 @@ class VMwareAPISession(object):
def _stop_loop(self, loop):
loop.stop()
def _wait_for_task(self, instance_uuid, task_ref):
def _wait_for_task(self, task_ref):
"""
Return a Deferred that will give the result of the given task.
The task is polled until it completes.
"""
done = event.Event()
loop = loopingcall.FixedIntervalLoopingCall(self._poll_task,
instance_uuid,
task_ref, done)
loop.start(CONF.vmware.task_poll_interval)
try:
@ -885,7 +884,7 @@ class VMwareAPISession(object):
self._stop_loop(loop)
return ret_val
def _poll_task(self, instance_uuid, task_ref, done):
def _poll_task(self, task_ref, done):
"""
Poll the given task, and fires the given Deferred if we
get a result.

4
nova/virt/vmwareapi/host.py
View File

@ -54,7 +54,7 @@ class Host(object):
self._session._get_vim(),
"PowerUpHostFromStandBy_Task", host_mor,
timeoutSec=60)
self._session._wait_for_task(host, host_task)
self._session._wait_for_task(host_task)
def host_maintenance_mode(self, host, mode):
"""Start/Stop host maintenance window. On start, it triggers
@ -74,7 +74,7 @@ class Host(object):
self._session._get_vim(),
"ExitMaintenanceMode_Task",
host_mor, timeout=0)
self._session._wait_for_task(host, host_task)
self._session._wait_for_task(host_task)
def set_host_enabled(self, _host, enabled):
"""Sets the specified host's ability to accept new instances."""

55
nova/virt/vmwareapi/vmops.py
View File

@ -142,8 +142,7 @@ class VMwareVMOps(object):
newCapacityKb=requested_size,
eagerZero=False)
try:
self._session._wait_for_task(instance['uuid'],
vmdk_extend_task)
self._session._wait_for_task(vmdk_extend_task)
except Exception as e:
with excutils.save_and_reraise_exception():
LOG.error(_('Extending virtual disk failed with error: %s'),
@ -166,8 +165,7 @@ class VMwareVMOps(object):
name=datastore_path,
datacenter=dc_ref)
try:
self._session._wait_for_task(instance['uuid'],
file_delete_task)
self._session._wait_for_task(file_delete_task)
except (error_util.CannotDeleteFileException,
error_util.FileFaultException,
error_util.FileLockedException,
@ -311,7 +309,7 @@ class VMwareVMOps(object):
self._session._get_vim(),
"CreateVM_Task", dc_info.vmFolder,
config=config_spec, pool=res_pool_ref)
self._session._wait_for_task(instance['uuid'], vm_create_task)
self._session._wait_for_task(vm_create_task)
LOG.debug(_("Created VM on the ESX host"), instance=instance)
@ -368,7 +366,7 @@ class VMwareVMOps(object):
name=virtual_disk_path,
datacenter=dc_info.ref,
spec=vmdk_create_spec)
self._session._wait_for_task(instance['uuid'], vmdk_create_task)
self._session._wait_for_task(vmdk_create_task)
LOG.debug(_("Created Virtual Disk of size %(vmdk_file_size_in_kb)s"
" KB and type %(disk_type)s on "
"the ESX host local store %(data_store_name)s") %
@ -392,7 +390,7 @@ class VMwareVMOps(object):
base_folder),
destinationDatacenter=dc_info.ref)
try:
self._session._wait_for_task(instance['uuid'], vmdk_move_task)
self._session._wait_for_task(vmdk_move_task)
except error_util.FileAlreadyExistsException:
# File move has failed. This may be due to the fact that a
# process or thread has already completed the opertaion.
@ -457,7 +455,7 @@ class VMwareVMOps(object):
sourceDatacenter=dc_info.ref,
destName=dest,
destSpec=vmdk_copy_spec)
self._session._wait_for_task(instance['uuid'], vmdk_copy_task)
self._session._wait_for_task(vmdk_copy_task)
LOG.debug(_("Copied Virtual Disk of size %(vmdk_file_size_in_kb)s"
" KB and type %(disk_type)s on "
"the ESX host local store %(data_store_name)s") %
@ -579,8 +577,7 @@ class VMwareVMOps(object):
destName=root_vmdk_path,
destSpec=copy_spec)
try:
self._session._wait_for_task(instance['uuid'],
vmdk_copy_task)
self._session._wait_for_task(vmdk_copy_task)
except Exception as e:
LOG.warning(_("Root disk file creation "
"failed - %s"), e)
@ -626,7 +623,7 @@ class VMwareVMOps(object):
power_on_task = self._session._call_method(
self._session._get_vim(),
"PowerOnVM_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], power_on_task)
self._session._wait_for_task(power_on_task)
LOG.debug(_("Powered on the VM instance"), instance=instance)
if power_on:
@ -694,7 +691,7 @@ class VMwareVMOps(object):
self._session._get_vim(),
"ReconfigVM_Task", vm_ref,
spec=cdrom_attach_config_spec)
self._session._wait_for_task(instance_uuid, reconfig_task)
self._session._wait_for_task(reconfig_task)
LOG.debug(_("Reconfigured VM instance %(instance_name)s to attach "
"cdrom %(file_path)s"),
{'instance_name': instance_name, 'file_path': file_path})
@ -800,7 +797,7 @@ class VMwareVMOps(object):
description="Taking Snapshot of the VM",
memory=False,
quiesce=True)
self._session._wait_for_task(instance['uuid'], snapshot_task)
self._session._wait_for_task(snapshot_task)
LOG.debug(_("Created Snapshot of the VM instance"),
instance=instance)
@ -858,7 +855,7 @@ class VMwareVMOps(object):
destDatacenter=dc_info.ref,
destSpec=copy_spec,
force=False)
self._session._wait_for_task(instance['uuid'], copy_disk_task)
self._session._wait_for_task(copy_disk_task)
LOG.debug(_("Copied disk data before snapshot of the VM"),
instance=instance)
@ -954,7 +951,7 @@ class VMwareVMOps(object):
LOG.debug(_("Doing hard reboot of VM"), instance=instance)
reset_task = self._session._call_method(self._session._get_vim(),
"ResetVM_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], reset_task)
self._session._wait_for_task(reset_task)
LOG.debug(_("Did hard reboot of VM"), instance=instance)
def _delete(self, instance, network_info):
@ -971,7 +968,7 @@ class VMwareVMOps(object):
destroy_task = self._session._call_method(
self._session._get_vim(),
"Destroy_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], destroy_task)
self._session._wait_for_task(destroy_task)
LOG.debug(_("Destroyed the VM"), instance=instance)
except Exception as excep:
LOG.warn(_("In vmwareapi:vmops:delete, got this exception"
@ -1014,7 +1011,7 @@ class VMwareVMOps(object):
poweroff_task = self._session._call_method(
self._session._get_vim(),
"PowerOffVM_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], poweroff_task)
self._session._wait_for_task(poweroff_task)
LOG.debug(_("Powered off the VM"), instance=instance)
# Un-register the VM
@ -1047,7 +1044,7 @@ class VMwareVMOps(object):
vim.get_service_content().fileManager,
name=dir_ds_compliant_path,
datacenter=dc_info.ref)
self._session._wait_for_task(instance['uuid'], delete_task)
self._session._wait_for_task(delete_task)
LOG.debug(_("Deleted contents of the VM from "
"datastore %(datastore_name)s") %
{'datastore_name': datastore_name},
@ -1081,7 +1078,7 @@ class VMwareVMOps(object):
LOG.debug(_("Suspending the VM"), instance=instance)
suspend_task = self._session._call_method(self._session._get_vim(),
"SuspendVM_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], suspend_task)
self._session._wait_for_task(suspend_task)
LOG.debug(_("Suspended the VM"), instance=instance)
# Raise Exception if VM is poweredOff
elif pwr_state == "poweredOff":
@ -1102,7 +1099,7 @@ class VMwareVMOps(object):
suspend_task = self._session._call_method(
self._session._get_vim(),
"PowerOnVM_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], suspend_task)
self._session._wait_for_task(suspend_task)
LOG.debug(_("Resumed the VM"), instance=instance)
else:
reason = _("instance is not in a suspended state")
@ -1176,7 +1173,7 @@ class VMwareVMOps(object):
poweroff_task = self._session._call_method(
self._session._get_vim(),
"PowerOffVM_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], poweroff_task)
self._session._wait_for_task(poweroff_task)
LOG.debug(_("Powered off the VM"), instance=instance)
# Raise Exception if VM is suspended
elif pwr_state == "suspended":
@ -1203,7 +1200,7 @@ class VMwareVMOps(object):
poweron_task = self._session._call_method(
self._session._get_vim(),
"PowerOnVM_Task", vm_ref)
self._session._wait_for_task(instance['uuid'], poweron_task)
self._session._wait_for_task(poweron_task)
LOG.debug(_("Powered on the VM"), instance=instance)
def power_on(self, context, instance, network_info, block_device_info):
@ -1260,7 +1257,7 @@ class VMwareVMOps(object):
rename_task = self._session._call_method(
self._session._get_vim(),
"Rename_Task", vm_ref, newName=name_label)
self._session._wait_for_task(instance['uuid'], rename_task)
self._session._wait_for_task(rename_task)
LOG.debug(_("Renamed the VM to %s") % name_label,
instance=instance)
self._update_instance_progress(context, instance,
@ -1284,7 +1281,7 @@ class VMwareVMOps(object):
folder=dc_info.vmFolder,
name=instance['uuid'],
spec=clone_spec)
self._session._wait_for_task(instance['uuid'], vm_clone_task)
self._session._wait_for_task(vm_clone_task)
LOG.debug(_("Cloned VM to host %s") % dest, instance=instance)
self._update_instance_progress(context, instance,
step=3,
@ -1305,7 +1302,7 @@ class VMwareVMOps(object):
destroy_task = self._session._call_method(
self._session._get_vim(),
"Destroy_Task", vm_ref)
self._session._wait_for_task(instance_name, destroy_task)
self._session._wait_for_task(destroy_task)
LOG.debug(_("Destroyed the VM"), instance=instance)
except Exception as excep:
LOG.warn(_("In vmwareapi:vmops:confirm_migration, got this "
@ -1326,7 +1323,7 @@ class VMwareVMOps(object):
rename_task = self._session._call_method(
self._session._get_vim(),
"Rename_Task", vm_ref, newName=instance['uuid'])
self._session._wait_for_task(instance['uuid'], rename_task)
self._session._wait_for_task(rename_task)
LOG.debug(_("Renamed the VM from %s") % name_label,
instance=instance)
if power_on:
@ -1369,7 +1366,7 @@ class VMwareVMOps(object):
"MigrateVM_Task", vm_ref,
host=host_ref,
priority="defaultPriority")
self._session._wait_for_task(instance_ref['uuid'], vm_migrate_task)
self._session._wait_for_task(vm_migrate_task)
except Exception:
with excutils.save_and_reraise_exception():
recover_method(context, instance_ref, dest, block_migration)
@ -1522,7 +1519,7 @@ class VMwareVMOps(object):
reconfig_task = self._session._call_method(self._session._get_vim(),
"ReconfigVM_Task", vm_ref,
spec=machine_id_change_spec)
self._session._wait_for_task(instance['uuid'], reconfig_task)
self._session._wait_for_task(reconfig_task)
LOG.debug(_("Reconfigured VM instance to set the machine id"),
instance=instance)
@ -1541,7 +1538,7 @@ class VMwareVMOps(object):
reconfig_task = self._session._call_method(self._session._get_vim(),
"ReconfigVM_Task", vm_ref,
spec=vnc_config_spec)
self._session._wait_for_task(instance['uuid'], reconfig_task)
self._session._wait_for_task(reconfig_task)
LOG.debug(_("Reconfigured VM instance to enable vnc on "
"port - %(port)s") % {'port': port},
instance=instance)

12
nova/virt/vmwareapi/volumeops.py
View File

@ -49,7 +49,6 @@ class VMwareVolumeOps(object):
Attach disk to VM by reconfiguration.
"""
instance_name = instance['name']
instance_uuid = instance['uuid']
client_factory = self._session._get_vim().client.factory
devices = self._session._call_method(vim_util,
"get_dynamic_property", vm_ref,
@ -76,7 +75,7 @@ class VMwareVolumeOps(object):
self._session._get_vim(),
"ReconfigVM_Task", vm_ref,
spec=vmdk_attach_config_spec)
self._session._wait_for_task(instance_uuid, reconfig_task)
self._session._wait_for_task(reconfig_task)
LOG.debug(_("Reconfigured VM instance %(instance_name)s to attach "
"disk %(vmdk_path)s or device %(device_name)s with type "
"%(disk_type)s"),
@ -84,8 +83,6 @@ class VMwareVolumeOps(object):
'device_name': device_name, 'disk_type': disk_type})
def _update_volume_details(self, vm_ref, instance, volume_uuid):
instance_uuid = instance['uuid']
# Store the uuid of the volume_device
hw_devices = self._session._call_method(vim_util,
'get_dynamic_property',
@ -104,7 +101,7 @@ class VMwareVolumeOps(object):
self._session._get_vim(),
"ReconfigVM_Task", vm_ref,
spec=extra_config_specs)
self._session._wait_for_task(instance_uuid, reconfig_task)
self._session._wait_for_task(reconfig_task)
def _get_volume_uuid(self, vm_ref, volume_uuid):
volume_option = 'volume-%s' % volume_uuid
@ -124,7 +121,6 @@ class VMwareVolumeOps(object):
Detach disk from VM by reconfiguration.
"""
instance_name = instance['name']
instance_uuid = instance['uuid']
client_factory = self._session._get_vim().client.factory
vmdk_detach_config_spec = vm_util.get_vmdk_detach_config_spec(
client_factory, device, destroy_disk)
@ -136,7 +132,7 @@ class VMwareVolumeOps(object):
self._session._get_vim(),
"ReconfigVM_Task", vm_ref,
spec=vmdk_detach_config_spec)
self._session._wait_for_task(instance_uuid, reconfig_task)
self._session._wait_for_task(reconfig_task)
LOG.debug(_("Reconfigured VM instance %(instance_name)s to detach "
"disk %(disk_key)s"),
{'instance_name': instance_name, 'disk_key': disk_key})
@ -282,7 +278,7 @@ class VMwareVolumeOps(object):
task = self._session._call_method(self._session._get_vim(),
"RelocateVM_Task", volume_ref,
spec=spec)
self._session._wait_for_task(task.value, task)
self._session._wait_for_task(task)
def _get_res_pool_of_vm(self, vm_ref):
"""Get resource pool to which the VM belongs."""