api,server: support templatetype when upload template from local

weizhouapache · weizhouapache · commit a54a1c243609 · 2025-09-18T17:02:47.000+02:00
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
@@ -104,6 +104,11 @@ public class GetUploadParamsForTemplateCmd extends AbstractGetUploadParamsCmd {
             description = "if true, the templates would be available for deploying CKS clusters", since = "4.21.0")
     protected Boolean forCks;
 
+    @Parameter(name = ApiConstants.TEMPLATE_TYPE, type = CommandType.STRING,
+            description = "the type of the template. Valid options are: USER/VNF (for all users) and SYSTEM/ROUTING/BUILTIN (for admins only).",
+            since = "4.22.0")
+    private String templateType;
+
     public String getDisplayText() {
         return StringUtils.isBlank(displayText) ? getName() : displayText;
     }
@@ -181,6 +186,10 @@ public CPU.CPUArch getArch() {
         return CPU.CPUArch.fromType(arch);
     }
 
+    public String getTemplateType() {
+        return templateType;
+    }
+
     @Override
     public void execute() throws ServerApiException {
         validateRequest();
diff --git a/server/src/main/java/com/cloud/storage/upload/params/TemplateUploadParams.java b/server/src/main/java/com/cloud/storage/upload/params/TemplateUploadParams.java
@@ -30,10 +30,11 @@ public TemplateUploadParams(long userId, String name, String displayText, CPU.CP
                                 Long zoneId, Hypervisor.HypervisorType hypervisorType, String chksum,
                                 String templateTag, long templateOwnerId,
                                 Map details, Boolean sshkeyEnabled,
-                                Boolean isDynamicallyScalable, Boolean isRoutingType, boolean deployAsIs, boolean forCks) {
+                                Boolean isDynamicallyScalable, Boolean isRoutingType, boolean deployAsIs,
+                                boolean forCks, String templateType) {
         super(userId, name, displayText, arch, bits, passwordEnabled, requiresHVM, isPublic, featured, isExtractable,
                 format, guestOSId, zoneId, hypervisorType, chksum, templateTag, templateOwnerId, details,
-                sshkeyEnabled, isDynamicallyScalable, isRoutingType, deployAsIs, forCks);
+                sshkeyEnabled, isDynamicallyScalable, isRoutingType, deployAsIs, forCks, templateType);
         setBootable(true);
     }
 }
diff --git a/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java b/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java
@@ -49,4 +49,6 @@ public interface UploadParams {
     boolean isDirectDownload();
     boolean isDeployAsIs();
     CPU.CPUArch getArch();
+    boolean isForCks();
+    String getTemplateType();
 }
diff --git a/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java b/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java
@@ -48,15 +48,17 @@ public abstract class UploadParamsBase implements UploadParams {
     private boolean deployAsIs;
     private boolean forCks;
     private CPU.CPUArch arch;
+    private String templateType;
 
     UploadParamsBase(long userId, String name, String displayText, CPU.CPUArch arch,
-                               Integer bits, boolean passwordEnabled, boolean requiresHVM,
-                               boolean isPublic, boolean featured,
-                               boolean isExtractable, String format, Long guestOSId,
-                               Long zoneId, Hypervisor.HypervisorType hypervisorType, String checksum,
-                               String templateTag, long templateOwnerId,
-                               Map details, boolean sshkeyEnabled,
-                               boolean isDynamicallyScalable, boolean isRoutingType, boolean deployAsIs, boolean forCks) {
+                     Integer bits, boolean passwordEnabled, boolean requiresHVM,
+                     boolean isPublic, boolean featured,
+                     boolean isExtractable, String format, Long guestOSId,
+                     Long zoneId, Hypervisor.HypervisorType hypervisorType, String checksum,
+                     String templateTag, long templateOwnerId,
+                     Map details, boolean sshkeyEnabled,
+                     boolean isDynamicallyScalable, boolean isRoutingType, boolean deployAsIs,
+                     boolean forCks, String templateType) {
         this.userId = userId;
         this.name = name;
         this.displayText = displayText;
@@ -79,6 +81,8 @@ public abstract class UploadParamsBase implements UploadParams {
         this.isDynamicallyScalable = isDynamicallyScalable;
         this.isRoutingType = isRoutingType;
         this.deployAsIs = deployAsIs;
+        this.forCks = forCks;
+        this.templateType = templateType;
     }
 
     UploadParamsBase(long userId, String name, String displayText, boolean isPublic, boolean isFeatured,
@@ -261,4 +265,14 @@ public CPU.CPUArch getArch() {
     public void setArch(CPU.CPUArch arch) {
         this.arch = arch;
     }
+
+    @Override
+    public boolean isForCks() {
+        return forCks;
+    }
+
+    @Override
+    public String getTemplateType() {
+        return templateType;
+    }
 }
diff --git a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
@@ -490,12 +490,25 @@ private TemplateProfile prepareUploadParamsInternal(UploadParams params) throws
                     StringUtils.join(Arrays.stream(HypervisorType.values()).filter(h -> h != HypervisorType.None).map(HypervisorType::name).toArray(), ", ")));
         }
 
+        TemplateType templateType;
+        if (params.getTemplateType() != null) {
+            try {
+                templateType = TemplateType.valueOf(params.getTemplateType().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new InvalidParameterValueException(String.format("Please specify a valid templatetype: %s",
+                        org.apache.commons.lang3.StringUtils.join(",", TemplateType.values())));
+            }
+        } else {
+            templateType = params.isRoutingType() ? TemplateType.ROUTING : TemplateType.USER;
+        }
+
         return prepare(params.isIso(), params.getUserId(), params.getName(), params.getDisplayText(), params.getArch(), params.getBits(),
                 params.isPasswordEnabled(), params.requiresHVM(), params.getUrl(), params.isPublic(), params.isFeatured(),
                 params.isExtractable(), params.getFormat(), params.getGuestOSId(), zoneList,
                 params.getHypervisorType(), params.getChecksum(), params.isBootable(), params.getTemplateTag(), owner,
                 params.getDetails(), params.isSshKeyEnabled(), params.getImageStoreUuid(),
-                params.isDynamicallyScalable(), params.isRoutingType() ? TemplateType.ROUTING : TemplateType.USER, params.isDirectDownload(), params.isDeployAsIs(), false, null);
+                params.isDynamicallyScalable(), templateType, params.isDirectDownload(), params.isDeployAsIs(),
+                params.isForCks(), null);
     }
 
     private Long getDefaultDeployAsIsGuestOsId() {
@@ -516,7 +529,8 @@ public TemplateProfile prepare(GetUploadParamsForTemplateCmd cmd) throws Resourc
                 BooleanUtils.toBoolean(cmd.isFeatured()), BooleanUtils.toBoolean(cmd.isExtractable()), cmd.getFormat(), osTypeId,
                 cmd.getZoneId(), HypervisorType.getType(cmd.getHypervisor()), cmd.getChecksum(),
                 cmd.getTemplateTag(), cmd.getEntityOwnerId(), cmd.getDetails(), BooleanUtils.toBoolean(cmd.isSshKeyEnabled()),
-                BooleanUtils.toBoolean(cmd.isDynamicallyScalable()), BooleanUtils.toBoolean(cmd.isRoutingType()), cmd.isDeployAsIs(), cmd.isForCks());
+                BooleanUtils.toBoolean(cmd.isDynamicallyScalable()), BooleanUtils.toBoolean(cmd.isRoutingType()), cmd.isDeployAsIs(),
+                cmd.isForCks(), cmd.getTemplateType());
         return prepareUploadParamsInternal(params);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,11 @@ public TemplateUploadParams(long userId, String name, String displayText, CPU.CP`
`30`	`30`	`Long zoneId, Hypervisor.HypervisorType hypervisorType, String chksum,`
`31`	`31`	`String templateTag, long templateOwnerId,`
`32`	`32`	`Map details, Boolean sshkeyEnabled,`
`33`		`- Boolean isDynamicallyScalable, Boolean isRoutingType, boolean deployAsIs, boolean forCks) {`
	`33`	`+ Boolean isDynamicallyScalable, Boolean isRoutingType, boolean deployAsIs,`
	`34`	`+ boolean forCks, String templateType) {`
`34`	`35`	`super(userId, name, displayText, arch, bits, passwordEnabled, requiresHVM, isPublic, featured, isExtractable,`
`35`	`36`	`format, guestOSId, zoneId, hypervisorType, chksum, templateTag, templateOwnerId, details,`
`36`		`- sshkeyEnabled, isDynamicallyScalable, isRoutingType, deployAsIs, forCks);`
	`37`	`+ sshkeyEnabled, isDynamicallyScalable, isRoutingType, deployAsIs, forCks, templateType);`
`37`	`38`	`setBootable(true);`
`38`	`39`	`}`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,6 @@ public interface UploadParams {`
`49`	`49`	`boolean isDirectDownload();`
`50`	`50`	`boolean isDeployAsIs();`
`51`	`51`	`CPU.CPUArch getArch();`
	`52`	`+ boolean isForCks();`
	`53`	`+ String getTemplateType();`
`52`	`54`	`}`