Revert "VMware Import - Support external VMs in any folders/subfolders other than the root folder ('vm') of datacenter (apache#10411)"

This reverts commit b9ebc7b.

Author: DaanHoogland

api/src/main/java/com/cloud/agent/api/to/RemoteInstanceTO.java

@@ -27,7 +27,6 @@ public class RemoteInstanceTO implements Serializable {
 
     private Hypervisor.HypervisorType hypervisorType;
     private String instanceName;
-    private String instancePath;
 
     // VMware Remote Instances parameters (required for exporting OVA through ovftool)
     // TODO: cloud.agent.transport.Request#getCommands() cannot handle gsoc decode for polymorphic classes
@@ -45,10 +44,9 @@ public RemoteInstanceTO(String instanceName) {
         this.instanceName = instanceName;
     }
 
-    public RemoteInstanceTO(String instanceName, String instancePath, String vcenterHost, String vcenterUsername, String vcenterPassword, String datacenterName) {
+    public RemoteInstanceTO(String instanceName, String vcenterHost, String vcenterUsername, String vcenterPassword, String datacenterName) {
         this.hypervisorType = Hypervisor.HypervisorType.VMware;
         this.instanceName = instanceName;
-        this.instancePath = instancePath;
         this.vcenterHost = vcenterHost;
         this.vcenterUsername = vcenterUsername;
         this.vcenterPassword = vcenterPassword;
@@ -63,10 +61,6 @@ public String getInstanceName() {
         return this.instanceName;
     }
 
-    public String getInstancePath() {
-        return this.instancePath;
-    }
-
     public String getVcenterUsername() {
         return vcenterUsername;
     }

api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java

@@ -33,8 +33,6 @@ public enum PowerState {
 
     private String internalCSName;
 
-    private String path;
-
     private PowerState powerState;
 
     private PowerState cloneSourcePowerState;
@@ -77,14 +75,6 @@ public void setInternalCSName(String internalCSName) {
         this.internalCSName = internalCSName;
     }
 
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
     public PowerState getPowerState() {
         return powerState;
     }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java

@@ -57,7 +57,6 @@ public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serve
         RemoteInstanceTO sourceInstance = cmd.getSourceInstance();
         Hypervisor.HypervisorType sourceHypervisorType = sourceInstance.getHypervisorType();
         String sourceInstanceName = sourceInstance.getInstanceName();
-        String sourceInstancePath = sourceInstance.getInstancePath();
         Hypervisor.HypervisorType destinationHypervisorType = cmd.getDestinationHypervisorType();
         DataStoreTO conversionTemporaryLocation = cmd.getConversionTemporaryLocation();
         long timeout = (long) cmd.getWait() * 1000;
@@ -178,15 +177,9 @@ private String getExportOVAUrlFromRemoteInstance(RemoteInstanceTO vmwareInstance
         String password = vmwareInstance.getVcenterPassword();
         String datacenter = vmwareInstance.getDatacenterName();
         String vm = vmwareInstance.getInstanceName();
-        String path = vmwareInstance.getInstancePath();
 
         String encodedUsername = encodeUsername(username);
         String encodedPassword = encodeUsername(password);
-        if (StringUtils.isNotBlank(path)) {
-            s_logger.info("VM path: " + path);
-            return String.format("vi://%s:%s@%s/%s/%s/%s",
-                    encodedUsername, encodedPassword, vcenter, datacenter, path, vm);
-        }
         return String.format("vi://%s:%s@%s/%s/vm/%s",
                 encodedUsername, encodedPassword, vcenter, datacenter, vm);
     }

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -1947,7 +1947,7 @@ private UnmanagedInstanceTO convertVmwareInstanceToKVMAfterExportingOVFToConvert
         LOGGER.debug(String.format("Delegating the conversion of instance %s from VMware to KVM to the host %s (%s) after OVF export through ovftool",
                 sourceVM, convertHost.getId(), convertHost.getName()));
 
-        RemoteInstanceTO remoteInstanceTO = new RemoteInstanceTO(sourceVMwareInstance.getName(), sourceVMwareInstance.getPath(), vcenterHost, vcenterUsername, vcenterPassword, datacenterName);
+        RemoteInstanceTO remoteInstanceTO = new RemoteInstanceTO(sourceVMwareInstance.getName(), vcenterHost, vcenterUsername, vcenterPassword, datacenterName);
         List<String> destinationStoragePools = selectInstanceConversionStoragePools(convertStoragePools, sourceVMwareInstance.getDisks(), serviceOffering, dataDiskOfferingMap);
         ConvertInstanceCommand cmd = new ConvertInstanceCommand(remoteInstanceTO,
                 Hypervisor.HypervisorType.KVM, temporaryConvertLocation, null, false, true);

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

@@ -891,27 +891,6 @@ public VirtualMachineFileLayoutEx getFileLayout() throws Exception {
         return fileLayout;
     }
 
-    public String getPath() throws Exception {
-        List<String> subPaths = new ArrayList<>();
-        ManagedObjectReference mor = _context.getVimClient().getDynamicProperty(_mor, "parent");
-        while (mor != null && mor.getType().equalsIgnoreCase("Folder")) {
-            String subPath = _context.getVimClient().getDynamicProperty(mor, "name");
-            if (StringUtils.isBlank(subPath)) {
-                return null;
-            }
-            subPaths.add(subPath);
-            mor = _context.getVimClient().getDynamicProperty(mor, "parent");
-        }
-
-        if (!subPaths.isEmpty()) {
-            Collections.reverse(subPaths);
-            String path = StringUtils.join(subPaths, "/");
-            return path;
-        }
-
-        return null;
-    }
-
     @Override
     public ManagedObjectReference getParentMor() throws Exception {
         return _context.getVimClient().getDynamicProperty(_mor, "parent");

vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java

@@ -801,7 +801,6 @@ public static UnmanagedInstanceTO getUnmanagedInstance(VmwareHypervisorHost hype
             instance = new UnmanagedInstanceTO();
             instance.setName(vmMo.getVmName());
             instance.setInternalCSName(vmMo.getInternalCSName());
-            instance.setPath((vmMo.getPath()));
             instance.setCpuCoresPerSocket(vmMo.getCoresPerSocket());
             instance.setOperatingSystemId(vmMo.getVmGuestInfo().getGuestId());
             VirtualMachineConfigSummary configSummary = vmMo.getConfigSummary();