Merge "[Trivial]Remove unused helper get_vm_ref_from_name"

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,

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.