Skip to content

Fix VM import & VM delete with custom offering #8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 5 commits into from
Apr 10, 2024
Merged

Fix VM import & VM delete with custom offering #8813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
863f14a
Fix VM import & VM delete with custom offering
vishesh92 Mar 20, 2024
a0a7adf
Fix test failures
vishesh92 Mar 20, 2024
ae79f02
Resolve comments
vishesh92 Mar 26, 2024
74ed272
fixup
vishesh92 Mar 27, 2024
654379a
fixup
vishesh92 Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/com/cloud/vm/VirtualMachineProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -260,7 +259,8 @@ public Map<Param, Object> getParameters() {
return _params;
}

public void setServiceOffering(ServiceOfferingVO offering) {
@Override
public void setServiceOffering(ServiceOffering offering) {
_offering = offering;
}

Expand Down
19 changes: 7 additions & 12 deletions server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.findById(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);
Expand Down Expand Up @@ -2131,11 +2132,6 @@ private UserVm importExternalKvmVirtualMachine(final UnmanagedInstanceTO unmanag
UserVm userVm = null;

Map<String, String> allDetails = new HashMap<>(details);
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()));
}
// Check disks and supplied disk offerings
List<UnmanagedInstanceTO.Disk> unmanagedInstanceDisks = unmanagedInstance.getDisks();

Expand Down Expand Up @@ -2189,6 +2185,8 @@ private UserVm importExternalKvmVirtualMachine(final UnmanagedInstanceTO unmanag
}

final VirtualMachineProfile profile = new VirtualMachineProfileImpl(userVm, template, serviceOffering, owner, null);
ServiceOfferingVO dummyOffering = serviceOfferingDao.findById(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;
Expand Down Expand Up @@ -2240,7 +2238,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;
}

Expand All @@ -2252,11 +2250,6 @@ private UserVm importKvmVirtualMachineFromDisk(final ImportSource importSource,
UserVm userVm = null;

Map<String, String> allDetails = new HashMap<>(details);
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()));
}

VirtualMachine.PowerState powerState = VirtualMachine.PowerState.PowerOff;

Expand Down Expand Up @@ -2323,6 +2316,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.findById(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;
Expand Down Expand Up @@ -2374,7 +2369,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;
}

Expand Down
1 change: 1 addition & 0 deletions server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ public void setUp() throws Exception {
when(serviceOffering.getRamSize()).thenReturn(instance.getMemory());
when(serviceOffering.getSpeed()).thenReturn(instance.getCpuSpeed());
when(serviceOfferingDao.findById(Mockito.anyLong())).thenReturn(serviceOffering);
when(serviceOfferingDao.findById(anyLong(), anyLong())).thenReturn(Mockito.mock(ServiceOfferingVO.class));
DiskOfferingVO diskOfferingVO = Mockito.mock(DiskOfferingVO.class);
when(diskOfferingDao.findById(Mockito.anyLong())).thenReturn(diskOfferingVO);
UserVmVO userVm = Mockito.mock(UserVmVO.class);
Expand Down