Skip to content

Commit c3d6a8c

Browse files
authored
server: fix templatetype during iso upload (apache#12151)
1 parent 58916eb commit c3d6a8c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,6 +2381,9 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
23812381

23822382
@Override
23832383
public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones, HypervisorType hypervisorType) {
2384+
if (cmd instanceof GetUploadParamsForIsoCmd) {
2385+
return TemplateType.USER;
2386+
}
23842387
if (!(cmd instanceof UpdateTemplateCmd) && !(cmd instanceof RegisterTemplateCmd) && !(cmd instanceof GetUploadParamsForTemplateCmd)) {
23852388
return null;
23862389
}

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4408,7 +4408,7 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri
44084408
}
44094409
}
44104410

4411-
if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
4411+
if (TemplateType.SYSTEM.equals(template.getTemplateType()) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
44124412
throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template));
44134413
}
44144414

0 commit comments

Comments
 (0)