From 5a8744deab8d53b51739041baea7463fca7f87e2 Mon Sep 17 00:00:00 2001 From: YuMin Kim Date: Mon, 16 Nov 2026 12:08:12 +0900 Subject: [PATCH] template: reject new settings on deploy-as-is templates, not only UEFI --- .../cloud/template/TemplateManagerImpl.java | 15 ++++++--- .../template/TemplateManagerImplTest.java | 33 +++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index d88bbd09bc24..6decbe51c01d 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -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; @@ -2445,14 +2446,20 @@ void validateDetails(VMTemplateVO template, Map details) { if (MapUtils.isEmpty(details)) { return; } + if (template.isDeployAsIs()) { + Map existing = template.getDetails() == null ? new HashMap<>() : template.getDetails(); + for (Map.Entry 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); diff --git a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java index 8ffa031f28f4..1f99b5816cad 100755 --- a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java +++ b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java @@ -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; @@ -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 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 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 details = new HashMap<>(); + details.put("rootDiskController", "scsi"); + + templateManager.validateDetails(template, details); + } + @Test public void verifyHeuristicRulesForZoneTestTemplateIsISOFormatShouldCheckForISOHeuristicType() { VMTemplateVO vmTemplateVOMock = Mockito.mock(VMTemplateVO.class);