Skip to content

server: set template type to ROUTING or USER if template type is not specified when upload a template #12768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sureshanaparti merged 7 commits into from
Apr 2, 2026
Merged

server: set template type to ROUTING or USER if template type is not specified when upload a template #12768

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8111b6c
server: set template type to ROUTING or USER if template type is not …
weizhouapache Mar 9, 2026
9dd0695
update PR 12768
weizhouapache Mar 9, 2026
e376b7d
add sql change
weizhouapache Mar 9, 2026
de7290b
Update engine/schema/src/main/resources/META-INF/db/schema-42200to422…
weizhouapache Mar 9, 2026
e01730a
Update server/src/main/java/com/cloud/template/TemplateManagerImpl.java
weizhouapache Mar 9, 2026
567f2b0
Merge branch '4.22' into 4.22-fix-template-type-upload-template
weizhouapache Mar 30, 2026
e5cd7e9
Update schema-42200to42210.sql
weizhouapache Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ UPDATE `cloud`.`alert` SET type = 34 WHERE name = 'ALERT.VR.PRIVATE.IFACE.MTU';

-- Update configuration 'kvm.ssh.to.agent' description and is_dynamic fields
UPDATE `cloud`.`configuration` SET description = 'True if the management server will restart the agent service via SSH into the KVM hosts after or during maintenance operations', is_dynamic = 1 WHERE name = 'kvm.ssh.to.agent';

-- Set default value for vm_template.type to "USER" and update existing records with NULL type to "USER"
Comment thread
weizhouapache marked this conversation as resolved.
Outdated
UPDATE `cloud`.`vm_template` SET `type` = 'USER' WHERE `type` IS NULL;
4 changes: 3 additions & 1 deletion server/src/main/java/com/cloud/template/TemplateManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2416,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);
}
Comment on lines +2419 to 2422
Copy link

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validateTemplateType now handles GetUploadParamsForTemplateCmd and defaults the template type to USER/ROUTING when templateType is omitted. There are existing unit tests for this method in server/src/test/java/com/cloud/template/TemplateManagerImplTest.java, but none cover the GetUploadParamsForTemplateCmd path; please add tests for (1) default USER when neither templateType nor isrouting is provided, (2) default ROUTING when isrouting=true (admin), and (3) rejection for non-admin when the resolved/explicit type is not USER/VNF.

Copilot uses AI. Check for mistakes.
Expand All @@ -2426,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));
Comment thread
sureshanaparti marked this conversation as resolved.
} else if (cmd instanceof GetUploadParamsForTemplateCmd) {
throw new InvalidParameterValueException(String.format("Users can not upload Template to template type %s.", templateType));
Comment thread
weizhouapache marked this conversation as resolved.
Outdated
}
}
return templateType;
Expand Down
Loading