Skip to content
Open
Show file tree
Hide file tree
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
15 changes: 11 additions & 4 deletions server/src/main/java/com/cloud/template/TemplateManagerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -2445,14 +2446,20 @@ void validateDetails(VMTemplateVO template, Map<String, String> details) {
if (MapUtils.isEmpty(details)) {
return;
}
if (template.isDeployAsIs()) {
Map<String, String> existing = template.getDetails() == null ? new HashMap<>() : template.getDetails();
for (Map.Entry<String, String> detail : details.entrySet()) {
if (!Objects.equals(existing.get(detail.getKey()), detail.getValue())) {
String msg = String.format("Deploy-as-is Template %s can not have the %s setting. Settings are read directly from the Template", template, detail.getKey());
throw new InvalidParameterValueException(msg);
}
}
return;
}
String bootMode = details.get(ApiConstants.BootType.UEFI.toString());
if (bootMode == null) {
return;
}
if (template.isDeployAsIs()) {
String msg = String.format("Deploy-as-is Template %s can not have the UEFI setting. Settings are read directly from the Template", template);
throw new InvalidParameterValueException(msg);
}
try {
String mode = bootMode.trim().toUpperCase();
ApiConstants.BootMode.valueOf(mode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
import org.mockito.stubbing.Answer;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -753,6 +755,37 @@ public void testDeleteTemplateWithTemplateType() {
Assert.assertNull(type);
}

@Test(expected = InvalidParameterValueException.class)
public void validateDetailsTestDeployAsIsTemplateRejectsNewNonUefiSetting() {
VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
Mockito.when(template.isDeployAsIs()).thenReturn(true);
Map<String, String> details = new HashMap<>();
details.put("rootDiskController", "scsi");

templateManager.validateDetails(template, details);
}

@Test
public void validateDetailsTestDeployAsIsTemplateAcceptsUnchangedSetting() {
VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
Mockito.when(template.isDeployAsIs()).thenReturn(true);
Mockito.when(template.getDetails()).thenReturn(Map.of("rootDiskController", "scsi"));
Map<String, String> details = new HashMap<>();
details.put("rootDiskController", "scsi");

templateManager.validateDetails(template, details);
}

@Test
public void validateDetailsTestNonDeployAsIsTemplateAcceptsNonUefiSetting() {
VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
Mockito.when(template.isDeployAsIs()).thenReturn(false);
Map<String, String> details = new HashMap<>();
details.put("rootDiskController", "scsi");

templateManager.validateDetails(template, details);
}

@Test
public void verifyHeuristicRulesForZoneTestTemplateIsISOFormatShouldCheckForISOHeuristicType() {
VMTemplateVO vmTemplateVOMock = Mockito.mock(VMTemplateVO.class);
Expand Down