Skip to content

make sure virtual machine params exist #12771

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

Open
DaanHoogland wants to merge 2 commits into
base: 4.22
Choose a base branch
from
+19 −19
Open

make sure virtual machine params exist #12771

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa8928
make sure virtual machine params exist
Mar 9, 2026
242b743
cleanup
Mar 9, 2026
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
38 changes: 19 additions & 19 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5795,7 +5795,8 @@ public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMach
}

// Set parameters
Map<VirtualMachineProfile.Param, Object> params = null;
Map<VirtualMachineProfile.Param, Object> params = new HashMap<>();
params.putAll(additionalParams);
if (vm.isUpdateParameters()) {
_vmDao.loadDetails(vm);

Expand All @@ -5809,18 +5810,19 @@ public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMach
// use it to encrypt & save the vm password
encryptAndStorePassword(vm, password);

params = createParameterInParameterMap(params, additionalParams, VirtualMachineProfile.Param.VmPassword, password);
// overwrite VmPassword
params = createParameterInParameterMap(params, VirtualMachineProfile.Param.VmPassword, password);
}

if(additionalParams.containsKey(VirtualMachineProfile.Param.BootIntoSetup)) {
if (! HypervisorType.VMware.equals(vm.getHypervisorType())) {
throw new InvalidParameterValueException(ApiConstants.BOOT_INTO_SETUP + " makes no sense for " + vm.getHypervisorType());
}

//overwrite BootIntoSetup
Object paramValue = additionalParams.get(VirtualMachineProfile.Param.BootIntoSetup);
if (logger.isTraceEnabled()) {
logger.trace("It was specified whether to enter setup mode: " + paramValue.toString());
}
params = createParameterInParameterMap(params, additionalParams, VirtualMachineProfile.Param.BootIntoSetup, paramValue);
logger.trace("It was specified whether to enter setup mode: {}", paramValue.toString());
params = createParameterInParameterMap(params, VirtualMachineProfile.Param.BootIntoSetup, paramValue);
}

VirtualMachineEntity vmEntity = _orchSrvc.getVirtualMachine(vm.getUuid());
Expand Down Expand Up @@ -5888,20 +5890,18 @@ protected String getCurrentVmPasswordOrDefineNewPassword(String newPassword, Use
return password;
}

private Map<VirtualMachineProfile.Param, Object> createParameterInParameterMap(Map<VirtualMachineProfile.Param, Object> params, Map<VirtualMachineProfile.Param, Object> parameterMap, VirtualMachineProfile.Param parameter,
/**
* Create or overwrite a parameter in the list
* @param params the list of parameters
* @param parameter the parameter to creat/overwrite
* @param parameterValue the value to give to the parameter
* @return the resulting updated list of parameters
*/
private Map<VirtualMachineProfile.Param, Object> createParameterInParameterMap(
Map<VirtualMachineProfile.Param, Object> params,
VirtualMachineProfile.Param parameter,
Object parameterValue) {
if (logger.isTraceEnabled()) {
logger.trace(String.format("createParameterInParameterMap(%s, %s)", parameter, parameterValue));
}
if (params == null) {
if (logger.isTraceEnabled()) {
logger.trace("creating new Parameter map");
}
params = new HashMap<>();
if (parameterMap != null) {
params.putAll(parameterMap);
}
}
logger.trace("createParameterInParameterMap({}, {})", parameter, parameterValue);
params.put(parameter, parameterValue);
return params;
}
Expand Down
Loading