Update 11682: check templatetype

Author: weizhouapache

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

@@ -29,6 +29,7 @@
 import javax.inject.Inject;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
 import org.apache.cloudstack.api.command.user.iso.GetUploadParamsForIsoCmd;
 import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
@@ -469,7 +470,7 @@ public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocatio
     /**
      * Prepare upload parameters internal method for templates and ISOs local upload
      */
-    private TemplateProfile prepareUploadParamsInternal(UploadParams params) throws ResourceAllocationException {
+    private TemplateProfile prepareUploadParamsInternal(BaseCmd cmd, UploadParams params) throws ResourceAllocationException {
         //check if the caller can operate with the template owner
         Account caller = CallContext.current().getCallingAccount();
         Account owner = _accountMgr.getAccount(params.getTemplateOwnerId());
@@ -490,17 +491,8 @@ 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;
-        }
+        TemplateType templateType = templateMgr.validateTemplateType(cmd, _accountMgr.isAdmin(caller.getAccountId()),
+                false, params.getHypervisorType());
 
         return prepare(params.isIso(), params.getUserId(), params.getName(), params.getDisplayText(), params.getArch(), params.getBits(),
                 params.isPasswordEnabled(), params.requiresHVM(), params.getUrl(), params.isPublic(), params.isFeatured(),
@@ -531,7 +523,7 @@ public TemplateProfile prepare(GetUploadParamsForTemplateCmd cmd) throws Resourc
                 cmd.getTemplateTag(), cmd.getEntityOwnerId(), cmd.getDetails(), BooleanUtils.toBoolean(cmd.isSshKeyEnabled()),
                 BooleanUtils.toBoolean(cmd.isDynamicallyScalable()), BooleanUtils.toBoolean(cmd.isRoutingType()), cmd.isDeployAsIs(),
                 cmd.isForCks(), cmd.getTemplateType());
-        return prepareUploadParamsInternal(params);
+        return prepareUploadParamsInternal(cmd, params);
     }
 
     @Override
@@ -540,7 +532,7 @@ public TemplateProfile prepare(GetUploadParamsForIsoCmd cmd) throws ResourceAllo
                 cmd.getDisplayText(), BooleanUtils.toBoolean(cmd.isPublic()), BooleanUtils.toBoolean(cmd.isFeatured()),
                 BooleanUtils.toBoolean(cmd.isExtractable()), cmd.getOsTypeId(),
                 cmd.getZoneId(), BooleanUtils.toBoolean(cmd.isBootable()), cmd.getEntityOwnerId());
-        return prepareUploadParamsInternal(params);
+        return prepareUploadParamsInternal(cmd, params);
     }
 
     @Override

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

@@ -2339,7 +2339,7 @@ else if (details != null && !details.isEmpty()) {
 
     @Override
     public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones, HypervisorType hypervisorType) {
-        if (!(cmd instanceof UpdateTemplateCmd) && !(cmd instanceof RegisterTemplateCmd)) {
+        if (!(cmd instanceof UpdateTemplateCmd) && !(cmd instanceof RegisterTemplateCmd) && !(cmd instanceof GetUploadParamsForTemplateCmd)) {
             return null;
         }
         TemplateType templateType = null;
@@ -2351,6 +2351,9 @@ public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean i
         } else if (cmd instanceof RegisterTemplateCmd) {
             newType = ((RegisterTemplateCmd)cmd).getTemplateType();
             isRoutingType = ((RegisterTemplateCmd)cmd).isRoutingType();
+        } else if (cmd instanceof GetUploadParamsForTemplateCmd) {
+            newType = ((GetUploadParamsForTemplateCmd)cmd).getTemplateType();
+            isRoutingType = ((GetUploadParamsForTemplateCmd)cmd).isRoutingType();
         }
         if (newType != null) {
             try {