From 8cbd0bb8f86fe22a9013687ed2c7ef8a6c5283cc Mon Sep 17 00:00:00 2001 From: zhufl Date: Mon, 26 Aug 2019 09:52:05 +0800 Subject: [PATCH] [Trivial]Remove unused helper get_vm_ref_from_name get_vm_ref_from_name is no longer used after 86f385b955151d2648aa42c42a8489d36e489286, this is to remove it. Change-Id: I75897b9dcfd27bfc2277856471e4b6809859026b --- nova/tests/unit/virt/vmwareapi/test_driver_api.py | 7 +------ nova/virt/vmwareapi/vm_util.py | 14 -------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/nova/tests/unit/virt/vmwareapi/test_driver_api.py b/nova/tests/unit/virt/vmwareapi/test_driver_api.py index acc2328d4272..7b90bb93dcc1 100644 --- a/nova/tests/unit/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/unit/virt/vmwareapi/test_driver_api.py @@ -1569,18 +1569,13 @@ class VMwareAPIVMTestCase(test.NoDBTestCase, def _destroy_instance_without_vm_ref(self, task_state=None): - def fake_vm_ref_from_name(session, vm_name): - return 'fake-ref' - self._create_instance() with test.nested( - mock.patch.object(vm_util, 'get_vm_ref_from_name', - fake_vm_ref_from_name), mock.patch.object(self.conn._session, '_call_method'), mock.patch.object(self.conn._vmops, '_destroy_instance') - ) as (mock_get, mock_call, mock_destroy): + ) as (mock_call, mock_destroy): self.instance.task_state = task_state self.conn.destroy(self.context, self.instance, self.network_info, diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py index b2dfd7c7f58c..60efbb59764b 100644 --- a/nova/virt/vmwareapi/vm_util.py +++ b/nova/virt/vmwareapi/vm_util.py @@ -138,14 +138,6 @@ def vm_ref_cache_from_instance(func): return wrapper -def vm_ref_cache_from_name(func): - @functools.wraps(func) - def wrapper(session, name): - id = name - return _vm_ref_cache(id, func, session, name) - return wrapper - - # the config key which stores the VNC port VNC_CONFIG_KEY = 'config.extraConfig["RemoteDisplay.vnc.port"]' @@ -1143,12 +1135,6 @@ def _get_vm_ref_from_name(session, vm_name): _get_object_for_value) -@vm_ref_cache_from_name -def get_vm_ref_from_name(session, vm_name): - return (_get_vm_ref_from_vm_uuid(session, vm_name) or - _get_vm_ref_from_name(session, vm_name)) - - def _get_vm_ref_from_vm_uuid(session, instance_uuid): """Get reference to the VM.