update PR 12768

Author: weizhouapache

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

@@ -2407,8 +2407,6 @@ public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean i
                 throw new InvalidParameterValueException(String.format("Please specify a valid templatetype: %s",
                         org.apache.commons.lang3.StringUtils.join(",", TemplateType.values())));
             }
-        } else if (cmd instanceof GetUploadParamsForTemplateCmd) {
-            templateType = ((GetUploadParamsForTemplateCmd) cmd).isRoutingType() ? TemplateType.ROUTING : TemplateType.USER;
         }
         if (templateType != null) {
             if (isRoutingType != null && (TemplateType.ROUTING.equals(templateType) != isRoutingType)) {
@@ -2418,7 +2416,7 @@ public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean i
             } else if ((cmd instanceof RegisterVnfTemplateCmd || cmd instanceof UpdateVnfTemplateCmd) && !TemplateType.VNF.equals(templateType)) {
                 throw new InvalidParameterValueException("The template type must be VNF for VNF templates, but the actual type is " + templateType);
             }
-        } else if (cmd instanceof RegisterTemplateCmd) {
+        } else if (cmd instanceof RegisterTemplateCmd || cmd instanceof GetUploadParamsForTemplateCmd) {
             boolean isRouting = Boolean.TRUE.equals(isRoutingType);
             templateType = (cmd instanceof RegisterVnfTemplateCmd) ? TemplateType.VNF : (isRouting ? TemplateType.ROUTING : TemplateType.USER);
         }
@@ -2428,6 +2426,8 @@ public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean i
                 throw new InvalidParameterValueException(String.format("Users can not register Template with template type %s.", templateType));
             } else if (cmd instanceof UpdateTemplateCmd) {
                 throw new InvalidParameterValueException(String.format("Users can not update Template to template type %s.", templateType));
+            } else if (cmd instanceof GetUploadParamsForTemplateCmd) {
+                throw new InvalidParameterValueException(String.format("Users can not upload Template to template type %s.", templateType));
             }
         }
         return templateType;