User vm manager cleanup#12779
Draft
DaanHoogland wants to merge 9 commits intomainfrom
Draft
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #12779 +/- ##
=========================================
Coverage 18.08% 18.09%
- Complexity 16706 16717 +11
=========================================
Files 6037 6037
Lines 542437 542389 -48
Branches 66420 66409 -11
=========================================
+ Hits 98088 98120 +32
+ Misses 433333 433251 -82
- Partials 11016 11018 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
There was a problem hiding this comment.
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 inVmAndCountDetails,getName(),getRandomPrivateTemplateName()) - Simplified conditionals: replaced
== null ? false : valuewith directBoolean.parseBoolean, replaced!list.stream().anyMatch(...)withlist.stream().noneMatch(...), replacedsize() > 0with!isEmpty(), etc. - Fixed multiple bugs: missing
throwforInvalidParameterValueExceptionat validation, NPE in error messages using null objects' methods, removedcallerparameter 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.
DaanHoogland
commented
Mar 10, 2026
Contributor
Author
|
@sureshanaparti can you have a look as well, please? |
abh1sar
reviewed
Mar 12, 2026
DaanHoogland
commented
Mar 12, 2026
DaanHoogland
commented
Mar 12, 2026
DaanHoogland
commented
Mar 12, 2026
|
boring-cyborg
Bot
added
component:saml
component:secondary-storage
component:security-group
component:security
component:simulator
component:solidfire
component:ssvm
component:storage
component:UI
component:usage-server
component:virtual-router
component:vmware
component:vpc
component:vxlan
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 4 out of 5 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 4 out of 5 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 4 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+4591
to
+4593
| // Check is hostName is RFC compliant | ||
| checkNameForRFCCompliance(hostName); | ||
|
|
Comment on lines
+1149
to
+1153
| if (vm.getState() != State.Running || vm.getHostId() == null) { | ||
| logger.error("Vm {} is not in Running state, failed to reboot", vm); | ||
| return null; | ||
| } | ||
| if ( null == vm.getHostId() ) { |
Comment on lines
+4245
to
+4261
| @Nullable | ||
| private static HypervisorType getHypervisorTypeFromHypervisorAndTemplate(HypervisorType hypervisor, VMTemplateVO template) { | ||
| HypervisorType hypervisorType = null; | ||
| if (template != null) { | ||
| if (template.getHypervisorType() == null || template.getHypervisorType() == HypervisorType.None) { | ||
| if (hypervisor == null || hypervisor == HypervisorType.None) { | ||
| throw new InvalidParameterValueException("Hypervisor parameter is needed to deploy VM or the hypervisor parameter value passed is invalid"); | ||
| } | ||
| hypervisorType = hypervisor; | ||
| } else { | ||
| if (hypervisor != null && hypervisor != HypervisorType.None && hypervisor != template.getHypervisorType()) { | ||
| throw new InvalidParameterValueException("Hypervisor passed to the deployVm call, is different from the hypervisor type of the Template"); | ||
| } | ||
| hypervisorType = template.getHypervisorType(); | ||
| } | ||
| } | ||
| return hypervisorType; |
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR cleans static analysis warnings from UserVmManagerImpl and some in dependencies.
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?