server: set template type to ROUTING or USER if template type is not specified when upload a template by weizhouapache · Pull Request #12768 · apache/cloudstack

weizhouapache · 2026-03-09T11:18:35Z

Description

This PR fixes #12763

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

…specified when upload a template

weizhouapache · 2026-03-09T11:20:26Z

@DaanHoogland @vishesh92 @vladimirpetrov
do you think we should set the template type to USER in the upgrade sql ?

UPDATE `cloud`.`vm_template` SET `type` = "USER" WHERE `type` IS NULL;

weizhouapache · 2026-03-09T11:25:38Z

@blueorangutan package

blueorangutan · 2026-03-09T11:26:04Z

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

DaanHoogland · 2026-03-09T11:30:49Z

@DaanHoogland @vishesh92 @vladimirpetrov
do you think we should set the template type to USER in the upgrade sql ?
UPDATE `cloud`.`vm_template` SET `type` = "USER" WHERE `type` IS NULL;

Sounds good, is type null leading to NPEs?

codecov · 2026-03-09T11:33:37Z

Codecov Report

❌ Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.60%. Comparing base (59b6c32) to head (e5cd7e9).

Files with missing lines	Patch %	Lines
...n/java/com/cloud/template/TemplateManagerImpl.java	0.00%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #12768      +/-   ##
============================================
- Coverage     17.60%   17.60%   -0.01%     
  Complexity    15676    15676              
============================================
  Files          5918     5918              
  Lines        531667   531669       +2     
  Branches      65001    65002       +1     
============================================
- Hits          93617    93616       -1     
- Misses       427491   427493       +2     
- Partials      10559    10560       +1

Flag	Coverage Δ
uitests	`3.70% <ø> (ø)`
unittests	`18.67% <0.00%> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

weizhouapache · 2026-03-09T11:36:47Z

@DaanHoogland @vishesh92 @vladimirpetrov
do you think we should set the template type to USER in the upgrade sql ?
UPDATE `cloud`.`vm_template` SET `type` = "USER" WHERE `type` IS NULL;
Sounds good, is type null leading to NPEs?

I think it does not lead to NPEs, but template/iso are not usable as the type is NULL.
In several places (UI and source code), cloudstack only lists templates with USER template type.

blueorangutan · 2026-03-09T12:37:08Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 17039

vishesh92

clgtm. didn't test.

vishesh92 · 2026-03-09T12:45:10Z

@blueorangutan package

Copilot

Pull request overview

Updates template upload/registration validation to default the template type to ROUTING or USER when not explicitly provided, and aligns existing DB records by backfilling vm_template.type when it is NULL.

Changes:

Extend template-type defaulting logic to GetUploadParamsForTemplateCmd.
Add permission validation/error for non-admin users requesting upload params for non-USER template types.
Backfill cloud.vm_template.type to USER where it is currently NULL.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
server/src/main/java/com/cloud/template/TemplateManagerImpl.java	Default template type for upload-params requests and restrict non-admin usage for non-`USER` types.
engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql	Data migration to set `vm_template.type` to `USER` for existing `NULL` rows.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql

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

…10.sql Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

weizhouapache · 2026-03-09T13:52:56Z

@blueoranguran package

weizhouapache · 2026-03-09T15:43:34Z

@blueoranguran package

blueorangutan · 2026-03-09T17:23:52Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17049

weizhouapache · 2026-03-09T18:15:51Z

@blueorangutan test

blueorangutan · 2026-03-09T18:18:05Z

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-03-10T10:55:09Z

[SF] Trillian test result (tid-15584)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 56948 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12768-t15584-kvm-ol8.zip
Smoke tests completed. 146 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestListIdsParams>:teardown	`Error`	1.13	test_list_ids_parameter.py
test_01_snapshot_root_disk	`Error`	4.91	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	49.76	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	49.77	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:teardown	`Error`	28.53	test_snapshots.py
test_01_snapshot_usage	`Error`	28.91	test_usage.py
test_01_vpn_usage	`Error`	1.09	test_usage.py

vladimirpetrov

LGTM based on manual testing.

vladimirpetrov · 2026-03-10T16:21:56Z

@blueorangutan test

blueorangutan · 2026-03-10T16:22:04Z

@vladimirpetrov a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-03-11T18:48:52Z

[SF] Trillian test result (tid-15600)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 92391 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12768-t15600-kvm-ol8.zip
Smoke tests completed. 131 look OK, 18 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestListIdsParams>:teardown	`Error`	1.10	test_list_ids_parameter.py
test_CRUD_operations_userdata	`Error`	1519.10	test_register_userdata.py
test_deploy_vm_with_registered_userdata	`Error`	5.41	test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_override_policy_allow	`Error`	5.43	test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_override_policy_append	`Error`	5.39	test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_override_policy_deny	`Error`	5.69	test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_params	`Error`	5.41	test_register_userdata.py
test_link_and_unlink_userdata_to_template	`Error`	5.61	test_register_userdata.py
test_user_userdata_crud	`Error`	5.64	test_register_userdata.py
ContextSuite context=TestResetVmOnReboot>:setup	`Error`	0.00	test_reset_vm_on_reboot.py
ContextSuite context=TestRAMCPUResourceAccounting>:setup	`Error`	0.00	test_resource_accounting.py
test_03_register_template	`Error`	1.08	test_resource_names.py
ContextSuite context=TestRestoreVM>:setup	`Error`	0.00	test_restore_vm.py
ContextSuite context=TestRouterDHCPHosts>:setup	`Error`	0.00	test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup	`Error`	0.00	test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup	`Error`	0.00	test_router_dns.py
test_01_snapshot_usage	`Error`	19.56	test_usage.py
ContextSuite context=TestRouterDnsService>:setup	`Error`	0.00	test_router_dnsservice.py
ContextSuite context=TestRouterIpTablesPolicies>:setup	`Error`	0.00	test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup	`Error`	0.00	test_routers_iptables_default_policy.py
ContextSuite context=TestIsolatedNetworks>:setup	`Error`	0.00	test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup	`Error`	0.00	test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup	`Error`	0.00	test_routers.py
ContextSuite context=TestCpuCapServiceOfferings>:setup	`Error`	0.00	test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup	`Error`	0.23	test_service_offerings.py
ContextSuite context=TestSetSourceNatIp>:setup	`Error`	0.00	test_set_sourcenat.py
ContextSuite context=TestSnapshotRootDisk>:setup	`Error`	0.00	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:setup	`Error`	0.00	test_snapshots.py
ContextSuite context=TestSslOffloading>:setup	`Error`	0.00	test_ssl_offloading.py
test_03_ssvm_internals	`Failure`	2.96	test_ssvm.py
test_05_stop_ssvm	`Failure`	60.60	test_ssvm.py
test_07_reboot_ssvm	`Failure`	124.49	test_ssvm.py
test_09_reboot_ssvm_forced	`Failure`	145.22	test_ssvm.py

weizhouapache · 2026-03-11T18:50:18Z

@blueorangutan test

blueorangutan · 2026-03-11T18:52:04Z

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

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

sureshanaparti

clgtm

blueorangutan · 2026-03-12T10:08:46Z

[SF] Trillian test result (tid-15617)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 51886 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12768-t15617-kvm-ol8.zip
Smoke tests completed. 146 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestListIdsParams>:teardown	`Error`	1.15	test_list_ids_parameter.py
test_01_snapshot_root_disk	`Error`	4.91	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	45.74	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	45.74	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:teardown	`Error`	27.67	test_snapshots.py
test_01_snapshot_usage	`Error`	23.66	test_usage.py
test_01_vpn_usage	`Error`	1.09	test_usage.py

github-actions · 2026-03-24T19:12:01Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

blueorangutan · 2026-03-30T11:04:38Z

[SF] Trillian test result (tid-15757)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 55178 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12768-t15757-kvm-ol8.zip
Smoke tests completed. 146 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestListIdsParams>:teardown	`Error`	1.16	test_list_ids_parameter.py
test_01_snapshot_root_disk	`Error`	4.08	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	46.86	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	46.87	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:teardown	`Error`	26.84	test_snapshots.py
test_01_snapshot_usage	`Error`	19.78	test_usage.py
test_01_vpn_usage	`Error`	1.11	test_usage.py

weizhouapache · 2026-03-30T11:46:45Z

@blueorangutan package

blueorangutan · 2026-03-30T11:48:04Z

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-30T12:41:34Z

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

+        } 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);
        }


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.

blueorangutan · 2026-03-30T12:54:34Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17288

server: set template type to ROUTING or USER if template type is not …

8111b6c

…specified when upload a template

update PR 12768

9dd0695

weizhouapache force-pushed the 4.22-fix-template-type-upload-template branch from e6d952c to 9dd0695 Compare March 9, 2026 11:25

add sql change

e376b7d

vishesh92 requested a review from Copilot March 9, 2026 12:40

vishesh92 approved these changes Mar 9, 2026

View reviewed changes

Copilot AI reviewed Mar 9, 2026

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql Outdated Show resolved Hide resolved

server/src/main/java/com/cloud/template/TemplateManagerImpl.java Outdated Show resolved Hide resolved

weizhouapache and others added 2 commits March 9, 2026 13:48

Update engine/schema/src/main/resources/META-INF/db/schema-42200to422…

de7290b

…10.sql Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

e01730a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot started reviewing on behalf of vishesh92 March 9, 2026 12:55 View session

weizhouapache linked an issue Mar 10, 2026 that may be closed by this pull request

Locally uploaded template is not shown in the deploy instance dialog #12763

Open

weizhouapache marked this pull request as ready for review March 10, 2026 07:45

vishesh92 added this to the 4.22.1 milestone Mar 10, 2026

vishesh92 added status:needs-testing ready-for-testing labels Mar 10, 2026

borisstoyanov self-assigned this Mar 10, 2026

vladimirpetrov approved these changes Mar 10, 2026

View reviewed changes

vladimirpetrov added status:waiting-for-smoketest-results and removed status:needs-testing ready-for-testing labels Mar 10, 2026

sureshanaparti added this to Apache CloudStack 4.22.1 Mar 12, 2026

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.1 Mar 12, 2026

sureshanaparti reviewed Mar 12, 2026

View reviewed changes

server/src/main/java/com/cloud/template/TemplateManagerImpl.java Show resolved Hide resolved

sureshanaparti approved these changes Mar 12, 2026

View reviewed changes

github-actions bot added the status:has-conflicts label Mar 24, 2026

weizhouapache added 2 commits March 30, 2026 13:45

Merge branch '4.22' into 4.22-fix-template-type-upload-template

567f2b0

Update schema-42200to42210.sql

e5cd7e9

weizhouapache requested a review from Copilot March 30, 2026 12:27

weizhouapache removed the status:has-conflicts label Mar 30, 2026

weizhouapache closed this Mar 30, 2026

github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.22.1 Mar 30, 2026

weizhouapache reopened this Mar 30, 2026

github-project-automation bot moved this from Done to In Progress in Apache CloudStack 4.22.1 Mar 30, 2026

Copilot started reviewing on behalf of weizhouapache March 30, 2026 12:37 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

Conversation

weizhouapache commented Mar 9, 2026

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

weizhouapache commented Mar 9, 2026

Uh oh!

weizhouapache commented Mar 9, 2026

Uh oh!

blueorangutan commented Mar 9, 2026

Uh oh!

DaanHoogland commented Mar 9, 2026

Uh oh!

codecov bot commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Mar 9, 2026

Uh oh!

blueorangutan commented Mar 9, 2026

Uh oh!

vishesh92 left a comment

Choose a reason for hiding this comment

Uh oh!

vishesh92 commented Mar 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Mar 9, 2026

Uh oh!

weizhouapache commented Mar 9, 2026

Uh oh!

blueorangutan commented Mar 9, 2026

Uh oh!

weizhouapache commented Mar 9, 2026

Uh oh!

blueorangutan commented Mar 9, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

vladimirpetrov left a comment

Choose a reason for hiding this comment

Uh oh!

vladimirpetrov commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 11, 2026

Uh oh!

weizhouapache commented Mar 11, 2026

Uh oh!

blueorangutan commented Mar 11, 2026

Uh oh!

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Mar 12, 2026

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

weizhouapache commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 9, 2026 •

edited

Loading