openstack/nova
Code Issues Proposed changes

VMware: remove _get_vim() from VMwareAPISession

Browse Source 
This method has side-effects which are not needed and brings only
clutter in the driver. The vim object should be accessed as a standard
property of the session object.
This patch is mostly a mechanical replacement and doesn't change any
existing functionality.

This is part of blueprint use-oslo-vmware

Change-Id: I1e86a2e5afc5c0b5921c0248806f434df0cdef2a
This commit is contained in:
Radoslav Gerganov
2014-01-10 07:50:02 -08:00
committed by Gary Kotton
parent 2dea6662cd
commit 2ce49c87a2
12 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/virt/vmwareapi/fake.py
View File

@@ -1060,9 +1060,6 @@ class FakeSession(object):
def __init__(self):
self.vim = FakeVim()
def _get_vim(self):
return self.vim
def _call_method(self, module, method, *args, **kwargs):
raise NotImplementedError()

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

@@ -2529,10 +2529,10 @@ class VMwareAPIVCDriverTestCase(VMwareAPIVMTestCase):
power_on=power_on)
if resize_instance:
fake_vm_resize_spec.assert_called_once_with(
self.conn._session._get_vim().client.factory,
self.conn._session.vim.client.factory,
self.instance)
fake_call_method.assert_any_call(
self.conn._session._get_vim(),
self.conn._session.vim,
"ReconfigVM_Task",
vm_ref,
spec='fake-spec')

26
nova/tests/virt/vmwareapi/test_vm_util.py
View File

@@ -777,7 +777,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
) as (fake_call_method, fake_wait_for_task):
vm_util.power_on_instance(session, fake_instance,
vm_ref='fake-vm-ref')
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOnVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')
@@ -794,7 +794,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
) as (fake_get_vm_ref, fake_call_method, fake_wait_for_task):
vm_util.power_on_instance(session, fake_instance)
fake_get_vm_ref.assert_called_once_with(session, fake_instance)
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOnVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')
@@ -812,7 +812,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
vm_util.power_on_instance,
session, fake_instance,
vm_ref='fake-vm-ref')
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOnVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')
@@ -829,14 +829,14 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
) as (fake_call_method, fake_wait_for_task):
vm_util.power_on_instance(session, fake_instance,
vm_ref='fake-vm-ref')
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOnVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')
def test_create_virtual_disk(self):
session = fake.FakeSession()
dm = session._get_vim().service_content.virtualDiskManager
dm = session.vim.service_content.virtualDiskManager
with contextlib.nested(
mock.patch.object(vm_util, "get_vmdk_create_spec",
return_value='fake-spec'),
@@ -848,11 +848,11 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
'fake-adapter-type', 'fake-disk-type',
'fake-path', 7)
fake_get_spec.assert_called_once_with(
session._get_vim().client.factory, 7,
session.vim.client.factory, 7,
'fake-adapter-type',
'fake-disk-type')
fake_call_method.assert_called_once_with(
session._get_vim(),
session.vim,
"CreateVirtualDisk_Task",
dm,
name='fake-path',
@@ -862,7 +862,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
def test_copy_virtual_disk(self):
session = fake.FakeSession()
dm = session._get_vim().service_content.virtualDiskManager
dm = session.vim.service_content.virtualDiskManager
with contextlib.nested(
mock.patch.object(session, "_call_method",
return_value='fake-task'),
@@ -871,7 +871,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
vm_util.copy_virtual_disk(session, 'fake-dc-ref',
'fake-source', 'fake-dest')
fake_call_method.assert_called_once_with(
session._get_vim(),
session.vim,
"CopyVirtualDisk_Task",
dm,
sourceName='fake-source',
@@ -1011,7 +1011,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
mock.patch.object(session, '_wait_for_task')
) as (fake_call_method, fake_wait_for_task):
vm_util.power_off_instance(session, fake_instance, 'fake-vm-ref')
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOffVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')
@@ -1028,7 +1028,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
) as (fake_call_method, fake_wait_for_task):
vm_util.power_off_instance(session, fake_instance)
fake_get_ref.assert_called_once_with(session, fake_instance)
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOffVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')
@@ -1046,7 +1046,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
self.assertRaises(exception.NovaException,
vm_util.power_off_instance,
session, fake_instance, 'fake-vm-ref')
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOffVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')
@@ -1064,7 +1064,7 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
side_effect=vexc.InvalidPowerStateException)
) as (fake_call_method, fake_wait_for_task):
vm_util.power_off_instance(session, fake_instance, 'fake-vm-ref')
fake_call_method.assert_called_once_with(session._get_vim(),
fake_call_method.assert_called_once_with(session.vim,
"PowerOffVM_Task",
'fake-vm-ref')
fake_wait_for_task.assert_called_once_with('fake-task')

10
nova/tests/virt/vmwareapi/test_vmops.py
View File

@@ -439,10 +439,10 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
power_on=power_on)
if resize_instance:
fake_vm_resize_spec.assert_called_once_with(
self._session._get_vim().client.factory,
self._session.vim.client.factory,
self._instance)
fake_call_method.assert_has_calls(mock.call(
self._session._get_vim(),
self._session.vim,
"ReconfigVM_Task",
'f',
spec='fake-spec'))
@@ -828,7 +828,7 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
if allocations is None:
allocations = {}
mock_get_create_spec.assert_called_once_with(
self._session._get_vim().client.factory,
self._session.vim.client.factory,
self._instance,
'fake_uuid',
'fake_ds',
@@ -842,10 +842,10 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
'fake_create_spec',
'fake_rp_ref')
mock_get_and_set_vnc_config.assert_called_once_with(
self._session._get_vim().client.factory,
self._session.vim.client.factory,
self._instance)
mock_set_machine_id.assert_called_once_with(
self._session._get_vim().client.factory,
self._session.vim.client.factory,
self._instance,
network_info)
if power_on: