Skip to content
Open
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -9508,6 +9508,16 @@ public UserVm importVM(final DataCenter zone, final Host host, final VirtualMach
if (host == null && hypervisorType == HypervisorType.VMware) {
throw new InvalidParameterValueException("Unable to import virtual machine with invalid host");
}
if (template == null) {
throw new InvalidParameterValueException("Unable to import virtual machine without a template");
}

// Ensure template details are loaded so that commitUserVm can copy them into the VM's details map
VMTemplateVO vmTemplateVO = _templateDao.findById(template.getId());
if (vmTemplateVO == null) {
throw new InvalidParameterValueException("Unable to find template with id " + template.getId() + " for virtual machine import");
}
Comment thread
weizhouapache marked this conversation as resolved.
_templateDao.loadDetails(vmTemplateVO);
Comment on lines +9515 to +9520

final long id = _vmDao.getNextInSequence(Long.class, "id");
String instanceName = StringUtils.isBlank(instanceNameInternal) ?
Expand All @@ -9521,8 +9531,8 @@ public UserVm importVM(final DataCenter zone, final Host host, final VirtualMach

final String uuidName = _uuidMgr.generateUuid(UserVm.class, null);
final Host lastHost = powerState != VirtualMachine.PowerState.PowerOn ? host : null;
final Boolean dynamicScalingEnabled = checkIfDynamicScalingCanBeEnabled(null, serviceOffering, template, zone.getId());
return commitUserVm(true, zone, host, lastHost, template, hostName, displayName, owner,
final Boolean dynamicScalingEnabled = checkIfDynamicScalingCanBeEnabled(null, serviceOffering, vmTemplateVO, zone.getId());
return commitUserVm(true, zone, host, lastHost, vmTemplateVO, hostName, displayName, owner,
null, null, userData, null, null, isDisplayVm, keyboard,
accountId, userId, serviceOffering, template.getFormat().equals(ImageFormat.ISO), sshPublicKeys, networkNicMap,
id, instanceName, uuidName, hypervisorType, customParameters,
Expand Down
Loading