rename new and use old method

Author: Dahn Highland

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -7209,7 +7209,7 @@ private Answer execute(PrepareUnmanageVMInstanceCommand cmd) {
 
             ManagedObjectReference  dcMor = hyperHost.getHyperHostDatacenter();
             DatacenterMO dataCenterMo = new DatacenterMO(getServiceContext(), dcMor);
-            VirtualMachineMO vm = dataCenterMo.findVm2(instanceName);
+            VirtualMachineMO vm = dataCenterMo.findVm(instanceName);
             if (vm == null) {
                 return new PrepareUnmanageVMInstanceAnswer(cmd, false, String.format("Cannot find VM with name [%s] in datacenter [%s].", instanceName, dataCenterMo.getName()));
             }
@@ -7515,7 +7515,7 @@ public String acquireVirtualMachineVncTicket(String vmInternalCSName) throws Exc
         VmwareContext context = getServiceContext();
         VmwareHypervisorHost hyperHost = getHyperHost(context);
         DatacenterMO dcMo = new DatacenterMO(hyperHost.getContext(), hyperHost.getHyperHostDatacenter());
-        VirtualMachineMO vmMo = dcMo.findVm2(vmInternalCSName);
+        VirtualMachineMO vmMo = dcMo.findVm(vmInternalCSName);
         return vmMo.acquireVncTicket();
     }
 

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java

@@ -73,7 +73,7 @@ public String getName() throws InvalidPropertyFaultMsg, RuntimeFaultFaultMsg, In
         return _context.getVimClient().getDynamicProperty(_mor, "name");
     }
 
-    public VirtualMachineMO findVm(String vmName) throws Exception {
+    public VirtualMachineMO findVmEx(String vmName) throws Exception {
         int key = getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
         if (key == 0) {
             s_logger.warn("Custom field " + CustomFieldConstants.CLOUD_VM_INTERNAL_NAME + " is not registered ?!");
@@ -82,7 +82,7 @@ public VirtualMachineMO findVm(String vmName) throws Exception {
         List<ObjectContent> ocs = getVmProperties(new String[] {"name", instanceNameCustomField});
         return HypervisorHostHelper.findVmFromObjectContent(_context, ocs.toArray(new ObjectContent[0]), vmName, instanceNameCustomField);
     }
-    public VirtualMachineMO findVm2(String vmName) throws Exception {
+    public VirtualMachineMO findVm(String vmName) throws Exception {
         int key = getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
         if (key == 0) {
             logger.warn("Custom field " + CustomFieldConstants.CLOUD_VM_INTERNAL_NAME + " is not registered ?!");