server: fix templatetype during iso upload

Fixes #12104

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

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

@@ -2359,12 +2359,15 @@ 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) && !(cmd instanceof GetUploadParamsForTemplateCmd)) {
+        if (!(cmd instanceof UpdateTemplateCmd) &&
+                !(cmd instanceof RegisterTemplateCmd) &&
+                !(cmd instanceof GetUploadParamsForTemplateCmd) &&
+                !(cmd instanceof GetUploadParamsForIsoCmd)) {
             return null;
         }
         TemplateType templateType = null;
-        String newType = null;
-        Boolean isRoutingType = null;
+        String newType = TemplateType.USER.name();
+        Boolean isRoutingType = false;
         if (cmd instanceof UpdateTemplateCmd) {
             newType = ((UpdateTemplateCmd)cmd).getTemplateType();
             isRoutingType = ((UpdateTemplateCmd)cmd).isRoutingType();

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

@@ -4392,7 +4392,7 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri
                 }
             }
 
-            if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
+            if (TemplateType.SYSTEM.equals(template.getTemplateType()) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
                 throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template));
             }