apache · nvazquez · Aug 13, 2021 · Jul 26, 2021 · Jul 28, 2021 · Aug 2, 2021
diff --git a/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java b/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java
@@ -29,6 +29,8 @@ public enum PowerState {

    private String name;

+    private String internalCSName;
+
    private PowerState powerState;

    private Integer cpuCores;
@@ -55,6 +57,14 @@ public void setName(String name) {
        this.name = name;
    }

+    public String getInternalCSName() {
+        return internalCSName;
+    }
+
+    public void setInternalCSName(String internalCSName) {
+        this.internalCSName = internalCSName;
+    }
+
    public PowerState getPowerState() {
        return powerState;
    }

diff --git a/...hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/...hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -7269,6 +7269,7 @@ private UnmanagedInstanceTO getUnmanagedInstance(VmwareHypervisorHost hyperHost,
        try {
            instance = new UnmanagedInstanceTO();
            instance.setName(vmMo.getVmName());
+            instance.setInternalCSName(vmMo.getInternalCSName());
            instance.setCpuCores(vmMo.getConfigSummary().getNumCpu());
            instance.setCpuCoresPerSocket(vmMo.getCoresPerSocket());
            instance.setCpuSpeed(vmMo.getConfigSummary().getCpuReservation());

diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -956,6 +956,10 @@ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedI
            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import VM: %s. %s", unmanagedInstance.getName(), Strings.nullToEmpty(e.getMessage())));
        }

+        String internalCSName = unmanagedInstance.getInternalCSName();
+        if(StringUtils.isEmpty(internalCSName)){
+            internalCSName = instanceName;
+        }
        Map<String, String> allDetails = new HashMap<>(details);
        if (validatedServiceOffering.isDynamic()) {
            allDetails.put(VmDetailConstants.CPU_NUMBER, String.valueOf(validatedServiceOffering.getCpu()));
@@ -1002,7 +1006,7 @@ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedI
            powerState = VirtualMachine.PowerState.PowerOn;
        }
        try {
-            userVm = userVmManager.importVM(zone, host, template, instanceName, displayName, owner,
+            userVm = userVmManager.importVM(zone, host, template, internalCSName, displayName, owner,
                    null, caller, true, null, owner.getAccountId(), userId,
                    validatedServiceOffering, null, hostName,
                    cluster.getHypervisorType(), allDetails, powerState);

diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
@@ -579,8 +579,9 @@ private void loadVmCache() throws Exception {

                    if (s_logger.isTraceEnabled())
                        s_logger.trace("put " + vmName + " into host cache");
-
-                    _vmCache.put(vmName, new VirtualMachineMO(_context, oc.getObj()));
+                    VirtualMachineMO virtualMachine = new VirtualMachineMO(_context, oc.getObj());
+                    virtualMachine.setInternalCSName(vmName);
+                    _vmCache.put(vmName, virtualMachine);
                }
            }
        }

diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -130,6 +130,15 @@ public class VirtualMachineMO extends BaseMO {
    public static final String ANSWER_NO = "1";

    private ManagedObjectReference _vmEnvironmentBrowser = null;
+    private String internalCSName;
+
+    public String getInternalCSName() {
+        return internalCSName;
+    }
+
+    public void setInternalCSName(String internalVMName) {
+        this.internalCSName = internalVMName;
+    }

    public VirtualMachineMO(VmwareContext context, ManagedObjectReference morVm) {
        super(context, morVm);