Fix VM import & VM delete with custom offering

Author: vishesh92

api/src/main/java/com/cloud/vm/VirtualMachineProfile.java

@@ -60,6 +60,8 @@ public interface VirtualMachineProfile {
 
     void setConfigDriveLocation(NetworkElement.Location location);
 
+    void setServiceOffering(ServiceOffering offering);
+
     public static class Param {
 
         public static final Param VmPassword = new Param("VmPassword");

engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java

@@ -26,7 +26,6 @@
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.element.NetworkElement;
 import com.cloud.offering.ServiceOffering;
-import com.cloud.service.ServiceOfferingVO;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
 import com.cloud.user.Account;
@@ -260,7 +259,8 @@ public Map<Param, Object> getParameters() {
         return _params;
     }
 
-    public void setServiceOffering(ServiceOfferingVO offering) {
+    @Override
+    public void setServiceOffering(ServiceOffering offering) {
         _offering = offering;
     }
 

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -4715,9 +4715,9 @@ public void generateUsageEvent(VirtualMachine vm, boolean isDisplay, String even
         }
         else {
             Map<String, String> customParameters = new HashMap<String, String>();
-            customParameters.put(UsageEventVO.DynamicParameters.cpuNumber.name(), serviceOffering.getCpu().toString());
-            customParameters.put(UsageEventVO.DynamicParameters.cpuSpeed.name(), serviceOffering.getSpeed().toString());
-            customParameters.put(UsageEventVO.DynamicParameters.memory.name(), serviceOffering.getRamSize().toString());
+            customParameters.put(UsageEventVO.DynamicParameters.cpuNumber.name(), String.valueOf(serviceOffering.getCpu()));
+            customParameters.put(UsageEventVO.DynamicParameters.cpuSpeed.name(), String.valueOf(serviceOffering.getSpeed()));
+            customParameters.put(UsageEventVO.DynamicParameters.memory.name(), String.valueOf(serviceOffering.getRamSize()));
             UsageEventUtils.publishUsageEvent(eventType, vm.getAccountId(), vm.getDataCenterId(), vm.getId(),
                     vm.getHostName(), serviceOffering.getId(), vm.getTemplateId(), vm.getHypervisorType().toString(),
                     VirtualMachine.class.getName(), vm.getUuid(), customParameters, isDisplay);

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

@@ -896,6 +896,7 @@ private UserVm migrateImportedVM(HostVO sourceHost, VirtualMachineTemplate templ
         if (!hostSupportsServiceOffering(sourceHost, serviceOffering)) {
             LOGGER.debug(String.format("VM %s needs to be migrated", vm.getUuid()));
             final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, template, serviceOffering, owner, null);
+            profile.setServiceOffering(serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), serviceOffering.getId()));
             DeploymentPlanner.ExcludeList excludeList = new DeploymentPlanner.ExcludeList();
             excludeList.addHost(sourceHost.getId());
             final DataCenterDeployment plan = new DataCenterDeployment(sourceHost.getDataCenterId(), sourceHost.getPodId(), sourceHost.getClusterId(), null, null, null);
@@ -1083,7 +1084,7 @@ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedI
             internalCSName = instanceName;
         }
         Map<String, String> allDetails = new HashMap<>(details);
-        if (validatedServiceOffering.isDynamic()) {
+        if (!validatedServiceOffering.isDynamic()) {
             allDetails.put(VmDetailConstants.CPU_NUMBER, String.valueOf(validatedServiceOffering.getCpu()));
             allDetails.put(VmDetailConstants.MEMORY, String.valueOf(validatedServiceOffering.getRamSize()));
             if (serviceOffering.getSpeed() == null) {
@@ -2131,7 +2132,7 @@ private UserVm importExternalKvmVirtualMachine(final UnmanagedInstanceTO unmanag
         UserVm userVm = null;
 
         Map<String, String> allDetails = new HashMap<>(details);
-        if (serviceOffering.isDynamic()) {
+        if (!serviceOffering.isDynamic()) {
             allDetails.put(VmDetailConstants.CPU_NUMBER, String.valueOf(serviceOffering.getCpu()));
             allDetails.put(VmDetailConstants.MEMORY, String.valueOf(serviceOffering.getRamSize()));
             allDetails.put(VmDetailConstants.CPU_SPEED, String.valueOf(serviceOffering.getSpeed()));
@@ -2189,6 +2190,8 @@ private UserVm importExternalKvmVirtualMachine(final UnmanagedInstanceTO unmanag
         }
 
         final VirtualMachineProfile profile = new VirtualMachineProfileImpl(userVm, template, serviceOffering, owner, null);
+        ServiceOfferingVO dummyOffering = serviceOfferingDao.findByIdIncludingRemoved(userVm.getId(), serviceOffering.getId());
+        profile.setServiceOffering(dummyOffering);
         DeploymentPlanner.ExcludeList excludeList = new DeploymentPlanner.ExcludeList();
         final DataCenterDeployment plan = new DataCenterDeployment(zone.getId(), null, null, null, null, null);
         DeployDestination dest = null;
@@ -2240,7 +2243,7 @@ private UserVm importExternalKvmVirtualMachine(final UnmanagedInstanceTO unmanag
             cleanupFailedImportVM(userVm);
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import NICs while importing vm: %s. %s", instanceName, StringUtils.defaultString(e.getMessage())));
         }
-        publishVMUsageUpdateResourceCount(userVm, serviceOffering);
+        publishVMUsageUpdateResourceCount(userVm, dummyOffering);
         return userVm;
     }
 
@@ -2252,7 +2255,7 @@ private UserVm importKvmVirtualMachineFromDisk(final ImportSource importSource,
         UserVm userVm = null;
 
         Map<String, String> allDetails = new HashMap<>(details);
-        if (serviceOffering.isDynamic()) {
+        if (!serviceOffering.isDynamic()) {
             allDetails.put(VmDetailConstants.CPU_NUMBER, String.valueOf(serviceOffering.getCpu()));
             allDetails.put(VmDetailConstants.MEMORY, String.valueOf(serviceOffering.getRamSize()));
             allDetails.put(VmDetailConstants.CPU_SPEED, String.valueOf(serviceOffering.getSpeed()));
@@ -2323,6 +2326,8 @@ private UserVm importKvmVirtualMachineFromDisk(final ImportSource importSource,
         DiskProfile diskProfile = volumeManager.allocateRawVolume(Volume.Type.ROOT, rootVolumeName, diskOffering, null, null, null, userVm, template, owner, null);
 
         final VirtualMachineProfile profile = new VirtualMachineProfileImpl(userVm, template, serviceOffering, owner, null);
+        ServiceOfferingVO dummyOffering = serviceOfferingDao.findByIdIncludingRemoved(userVm.getId(), serviceOffering.getId());
+        profile.setServiceOffering(dummyOffering);
         DeploymentPlanner.ExcludeList excludeList = new DeploymentPlanner.ExcludeList();
         final DataCenterDeployment plan = new DataCenterDeployment(zone.getId(), null, null, hostId, poolId, null);
         DeployDestination dest = null;
@@ -2374,7 +2379,7 @@ private UserVm importKvmVirtualMachineFromDisk(final ImportSource importSource,
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import volumes while importing vm: %s. %s", instanceName, StringUtils.defaultString(e.getMessage())));
         }
         networkOrchestrationService.importNic(macAddress,0,network, true, userVm, requestedIpPair, zone, true);
-        publishVMUsageUpdateResourceCount(userVm, serviceOffering);
+        publishVMUsageUpdateResourceCount(userVm, dummyOffering);
         return userVm;
     }