User vm manager cleanup by DaanHoogland · Pull Request #12779 · apache/cloudstack

DaanHoogland · 2026-03-10T09:34:45Z

Description

This PR cleans static analysis warnings from UserVmManagerImpl and some in dependencies.

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?

codecov · 2026-03-10T09:45:39Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.62%. Comparing base (71bd26f) to head (229073d).
⚠️ Report is 2 commits behind head on 4.22.

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #12779      +/-   ##
============================================
+ Coverage     17.60%   17.62%   +0.02%     
- Complexity    15671    15742      +71     
============================================
  Files          5917     5918       +1     
  Lines        531647   532040     +393     
  Branches      65000    65132     +132     
============================================
+ Hits          93595    93775     +180     
- Misses       427494   427704     +210     
- Partials      10558    10561       +3

Flag	Coverage Δ
uitests	`3.70% <ø> (ø)`
unittests	`18.69% <ø> (+0.02%)`	⬆️

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.

Copilot

Pull request overview

This PR cleans up static analysis warnings in UserVmManagerImpl and related files, including the service interface and a template interface. The changes address issues like raw types, unnecessary casts, unused variables, inefficient null checks, and missing throw keywords.

Changes:

Removed unused imports, fields (statsCollector, vmScheduleManager), unused constants (MAX_HTTP_GET_LENGTH, etc.), and dead code (unused constructors/methods in VmAndCountDetails, getName(), getRandomPrivateTemplateName())
Simplified conditionals: replaced == null ? false : value with direct Boolean.parseBoolean, replaced !list.stream().anyMatch(...) with list.stream().noneMatch(...), replaced size() > 0 with !isEmpty(), etc.
Fixed multiple bugs: missing throw for InvalidParameterValueException at validation, NPE in error messages using null objects' methods, removed caller parameter from methods where it was unused, improved method signatures to remove unchecked exceptions

Reviewed changes

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

File	Description
`server/src/main/java/com/cloud/vm/UserVmManagerImpl.java`	Major cleanup: remove unused imports/fields/methods, fix bugs (missing throw, null NPE in error messages), simplify conditionals/collections usage
`server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java`	Update test method calls to match new method signatures (removed `caller` parameters, replaced `1l` with `1L`)
`api/src/main/java/com/cloud/vm/UserVmService.java`	Remove `StorageUnavailableException` from method signatures, remove redundant `public` modifier from interface method
`api/src/main/java/com/cloud/template/VirtualMachineTemplate.java`	Add generic type parameter to `getDetails()` return type

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

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

DaanHoogland · 2026-03-10T10:35:13Z

@blueorangutan package

blueorangutan · 2026-03-10T10:36:04Z

@DaanHoogland 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.

blueorangutan · 2026-03-10T11:41:09Z

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

DaanHoogland · 2026-03-10T14:09:13Z

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

        } catch (CloudException e) {
            throw new CloudRuntimeException("Unable to contact the agent to stop the Instance " + vm, e);
        }
        return status;
    }

-    private UserVm rebootVirtualMachine(long userId, long vmId, boolean enterSetup, boolean forced) throws InsufficientCapacityException, ResourceUnavailableException {
+    private UserVm rebootVirtualMachine(long vmId, boolean enterSetup, boolean forced) throws InsufficientCapacityException, ResourceUnavailableException {


planning to implement this sonar advice, but would like to have feedback from @abh1sar and @slavkap first on the extensive changes.

DaanHoogland · 2026-03-10T14:10:21Z

@blueorangutan test

blueorangutan · 2026-03-10T14:12:03Z

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

blueorangutan · 2026-03-11T05:35:45Z

[SF] Trillian test result (tid-15595)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 52484 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12779-t15595-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`	5.02	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	48.06	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	48.06	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:teardown	`Error`	26.72	test_snapshots.py
test_01_snapshot_usage	`Error`	24.82	test_usage.py
test_01_vpn_usage	`Error`	1.10	test_usage.py

DaanHoogland · 2026-03-11T09:09:11Z

@sureshanaparti can you have a look as well, please?

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

Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com> Co-authored-by: dahn <daan.hoogland@gmail.com>

github-actions · 2026-03-26T16:36:19Z

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

Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>

sonarqubecloud · 2026-03-30T11:13:07Z

Quality Gate failed

Failed conditions
7.3% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube Cloud

DaanHoogland · 2026-03-30T11:53:12Z

@blueorangutan package

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

@DaanHoogland 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.

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

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

DaanHoogland · 2026-03-30T13:10:21Z

@blueorangutan test

blueorangutan · 2026-03-30T13:12:03Z

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

blueorangutan · 2026-03-31T05:51:44Z

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

Test	Result	Time (s)	Test File
test_01_extension_vm_lifecycle	`Error`	18.25	test_extension_custom.py
ContextSuite context=TestClusterDRS>:setup	`Error`	0.00	test_cluster_drs.py
test_02_list_cpvm_vm	`Failure`	0.03	test_ssvm.py
test_04_cpvm_internals	`Failure`	0.04	test_ssvm.py
test_11_destroy_ssvm	`Error`	3.17	test_ssvm.py
test_03_reboot_vm	`Error`	1.06	test_vm_life_cycle.py
test_04_reboot_vm_forced	`Failure`	1.06	test_vm_life_cycle.py
test_01_redundant_vpc_site2site_vpn	`Failure`	394.68	test_vpc_vpn.py

Daan Hoogland added 3 commits March 9, 2026 12:48

make sure virtual machine params exist

ffa8928

cleanup

242b743

static analysis warnings in User Vm Manager

f237082

DaanHoogland requested review from abh1sar, Copilot and slavkap March 10, 2026 09:34

boring-cyborg bot added the component:api label Mar 10, 2026

Copilot started reviewing on behalf of DaanHoogland March 10, 2026 09:38 View session

Copilot AI reviewed Mar 10, 2026

View reviewed changes

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java Outdated Show resolved Hide resolved

DaanHoogland commented Mar 10, 2026

View reviewed changes

abh1sar reviewed Mar 12, 2026

View reviewed changes

sureshanaparti added this to Apache CloudStack 4.22.1 Mar 12, 2026

sureshanaparti added this to the 4.22.1 milestone Mar 12, 2026

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

DaanHoogland commented Mar 12, 2026

View reviewed changes

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java Outdated Show resolved Hide resolved

DaanHoogland commented Mar 12, 2026

View reviewed changes

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java Outdated Show resolved Hide resolved

DaanHoogland commented Mar 12, 2026

View reviewed changes

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java Outdated Show resolved Hide resolved

DaanHoogland and others added 2 commits March 12, 2026 14:17

Apply suggestions from code review

a310ee2

Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com> Co-authored-by: dahn <daan.hoogland@gmail.com>

address suggestions and fix double quote

ff826f9

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

Apply suggestion from @abh1sar

2ec18d0

Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>

Merge branch '4.22' into UserVmManagerCleanup

9694fa6

github-actions bot removed the status:has-conflicts label Mar 30, 2026

merge bug fixed

229073d

DaanHoogland requested a review from sureshanaparti March 31, 2026 08:20

Conversation

DaanHoogland commented Mar 10, 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!

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

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

DaanHoogland commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

DaanHoogland Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 11, 2026

Uh oh!

DaanHoogland commented Mar 11, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 26, 2026

Uh oh!

sonarqubecloud bot commented Mar 30, 2026

Quality Gate failed

Uh oh!

DaanHoogland commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

DaanHoogland commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Mar 10, 2026 •

edited

Loading