Fix grammar, spelling, word casing, whitespace by jbampton · Pull Request #9132 · apache/cloudstack · GitHub

Description

This PR cleans up the code base and standardizes some terms for casing.

Fixes in exception messages, log messages, code comments and more.

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

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

BLOCKER
Critical
Major
Minor
Trivial

Screenshots (if appropriate):

How Has This Been Tested?

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

Codecov Report

❌ Patch coverage is 6.25000% with 30 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.46%. Comparing base (f417c6b) to head (25603ee).
⚠️ Report is 969 commits behind head on main.

Files with missing lines	Patch %	Lines
...stack/engine/orchestration/VolumeOrchestrator.java	0.00%	2 Missing ⚠️
...command/admin/internallb/StartInternalLBVMCmd.java	0.00%	1 Missing ⚠️
.../command/admin/internallb/StopInternalLBVMCmd.java	0.00%	1 Missing ⚠️
...api/command/admin/systemvm/DestroySystemVmCmd.java	0.00%	1 Missing ⚠️
.../api/command/admin/systemvm/RebootSystemVmCmd.java	0.00%	1 Missing ⚠️
...k/api/command/admin/systemvm/ScaleSystemVMCmd.java	0.00%	1 Missing ⚠️
...k/api/command/admin/systemvm/StartSystemVMCmd.java	0.00%	1 Missing ⚠️
...ck/api/command/admin/systemvm/StopSystemVmCmd.java	0.00%	1 Missing ⚠️
...api/command/admin/systemvm/UpgradeSystemVMCmd.java	0.00%	1 Missing ⚠️
.../cloudstack/api/command/admin/vm/ExpungeVMCmd.java	0.00%	1 Missing ⚠️
... and 19 more

Additional details and impacted files

@@            Coverage Diff            @@
##               main    #9132   +/-   ##
=========================================
  Coverage     17.46%   17.46%           
  Complexity    15516    15516           
=========================================
  Files          5913     5913           
  Lines        529385   529385           
  Branches      64679    64679           
=========================================
+ Hits          92448    92450    +2     
+ Misses       426518   426517    -1     
+ Partials      10419    10418    -1

Flag	Coverage Δ
uitests	3.58% <ø> (ø)
unittests	18.52% <6.25%> (+<0.01%)	⬆️

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

☔ View full report in Codecov by Harness.
📢 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.

I immagine I missed a few, and in dutch (intended mistake) these would be considered shouting, but for consistency some sugestions...

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

…ployVMCmd.java Co-authored-by: dahn <daan.hoogland@gmail.com>

Co-authored-by: dahn <daan.hoogland@gmail.com>

…ache/cloudstack/network/contrail/management/ServiceManagerImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com>

…/commands/StopNetScalerVMCmd.java Co-authored-by: dahn <daan.hoogland@gmail.com>

Co-authored-by: dahn <daan.hoogland@gmail.com>

Suggested change

      
                    CallContext.current().setEventDetails("VM ID: " + svm.getId());
          
                    CallContext.current().setEventDetails("VM Id: " + svm.getId());

@FelipeM525 , 'ID' is an acronym for 'identification' according to english rules it should be capatalised. Am I correct @jbampton ?

@DaanHoogland

I agree with capitalizing both letters, but, regardless of what convention we use (both capitalized or not), there should be a convention. Currently, this PR, that has a focus on fixing word casing inconsistencies, is doing the opposite, by changing some instances of Id to ID and leaving others as they are. Either all instances of the word in this PR should be ID or all should be Id.

well, agree to disagree. I am happy to conform to conventions, but these are completely unnecessary and gratuit. I am leaving this with the embedded English speaker(s) ;)

@blueorangutan package

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

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

@blueorangutan package

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

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

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

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

Test	Result	Time (s)	Test File
test_03_deploy_and_scale_kubernetes_cluster	Failure	1.17	test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster	Failure	35.05	test_kubernetes_clusters.py

@daviftorres , you are right, but I think we should merge and create new PRs for any remaining issues. This has been suffering scope creep a lot so far and isn’t functionally crippled.
cc @JoaoJandre @harikrishna-patnala

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

@FelipeM525 @JoaoJandre please have another look

Co-authored-by: Davi Torres <90287660+daviftorres@users.noreply.github.com>

I think we can go through with this now, further improvements can be done in separate PRs

Suggested change

      
                    CallContext.current().setEventDetails("Internal lb VM Id: " + getId());
          
                    CallContext.current().setEventDetails("Internal lb VM ID: " + getId());

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
          
                    CallContext.current().setEventDetails("VM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
          
                    CallContext.current().setEventDetails("VM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

Suggested change

      
                    CallContext.current().setEventDetails("SystemVM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
          
                    CallContext.current().setEventDetails("SystemVM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
          
                    CallContext.current().setEventDetails("VM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + getEntityUuid());
          
                    CallContext.current().setEventDetails("VM ID: " + getEntityUuid());

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Network Id: " + this._uuidMgr.getUuid(Network.class, getNetworkId()));
          
                    CallContext.current().setEventDetails("VM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Network Id: " + this._uuidMgr.getUuid(Network.class, getNetworkId()));

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + getVirtualMachineId() + " ISO ID: " + getId());
          
                    CallContext.current().setEventDetails("VM ID: " + getVirtualMachineId() + " ISO ID: " + getId());

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
          
                    CallContext.current().setEventDetails("VM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

Suggested change

      
                    CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
          
                    CallContext.current().setEventDetails("VM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

@JoaoJandre shall we keep building for another 1.5 years and keep fixing conflicts and adding more commits and doing more reviews with further nits ? We already have 500 open issues and 200 open PRs that are not merged.

Constantly adding more is scope creep. Big PRs are harder to review and test.

@jbampton, the PR description states that: "This PR cleans up the code base and standardizes some terms for casing."

On line 106 of api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java, you changed "Vm Id" to "VM ID". However, on the rest of the changes, you changed "Vm Id" to "VM Id". This inconsistency was brough up over a year ago and still was not changed. I am not scope creeping the PR, I have only asked for a single change, one that keeps the PR consistent.

Furthermore, this PR could have been merged over a year ago, but you waited more than year to comment. The change I am asking is simple, and has been the same from the very start. You have no right to complain about the delay on the PR.

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

Hi @jbampton can you please fix the conflicts?

Fix grammar, spelling, word casing, whitespace

b28eccb

boring-cyborg Bot added component:api component:database component:networking component:orchestration labels May 28, 2024

DaanHoogland reviewed May 28, 2024

View reviewed changes

github-actions Bot added the status:has-conflicts label Jun 14, 2024

jbampton and others added 7 commits July 10, 2024 21:05

Update api/src/main/java/org/apache/cloudstack/api/command/user/vm/De…

3574cdc

…ployVMCmd.java Co-authored-by: dahn <daan.hoogland@gmail.com>

Update api/src/main/java/org/apache/cloudstack/api/command/user/vm/De…

fba6bf5

…ployVMCmd.java Co-authored-by: dahn <daan.hoogland@gmail.com>

Update server/src/main/java/com/cloud/network/NetworkServiceImpl.java

287b40f

Co-authored-by: dahn <daan.hoogland@gmail.com>

Update server/src/test/java/com/cloud/vm/UserVmManagerTest.java

79a8b92

Co-authored-by: dahn <daan.hoogland@gmail.com>

Update plugins/network-elements/juniper-contrail/src/main/java/org/ap…

8ac51b7

…ache/cloudstack/network/contrail/management/ServiceManagerImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com>

Update plugins/network-elements/netscaler/src/main/java/com/cloud/api…

0c81a31

…/commands/StopNetScalerVMCmd.java Co-authored-by: dahn <daan.hoogland@gmail.com>

Update server/src/test/java/com/cloud/vm/UserVmManagerTest.java

177d355

Co-authored-by: dahn <daan.hoogland@gmail.com>

FelipeM525 suggested changes Aug 2, 2024

View reviewed changes

jbampton marked this pull request as draft October 14, 2024 12:46

Merge branch 'main' into fix-spelling-grammar-case-whitespace

f104bd5

github-actions Bot removed the status:has-conflicts label Oct 14, 2024

DaanHoogland reviewed Oct 24, 2024

View reviewed changes

Comment thread tools/git/git-pr Resolved

github-actions Bot added the status:has-conflicts label Dec 20, 2024

Merge branch 'main' into fix-spelling-grammar-case-whitespace

403b87d

daviftorres reviewed Sep 18, 2025

View reviewed changes

Comment thread server/src/main/java/com/cloud/vm/UserVmManagerImpl.java Resolved

github-actions Bot added the status:has-conflicts label Oct 7, 2025

Merge branch 'main' into fix-spelling-grammar-case-whitespace

3e90ab6

github-actions Bot removed the status:has-conflicts label Oct 13, 2025

DaanHoogland requested a review from JoaoJandre October 13, 2025 08:21

jbampton and others added 4 commits October 24, 2025 10:27

Merge branch 'main' into fix-spelling-grammar-case-whitespace

c76a7f4

Merge branch 'main' into fix-spelling-grammar-case-whitespace

b1f1816

Merge branch 'main' into fix-spelling-grammar-case-whitespace

c7b4698

Apply suggestions from code review

25603ee

Co-authored-by: Davi Torres <90287660+daviftorres@users.noreply.github.com>

DaanHoogland added the status:ready-for-merge label Dec 12, 2025

JoaoJandre requested changes Dec 12, 2025

View reviewed changes

DaanHoogland removed the status:ready-for-merge label Dec 16, 2025

github-actions Bot added the status:has-conflicts label Dec 22, 2025

jbampton marked this pull request as draft March 31, 2026 10:06

weizhouapache added this to the 4.24.0 milestone Jun 29, 2026

DaanHoogland added this to CloudStack Testing Aug 31, 2026

github-project-automation Bot moved this to Backlog in CloudStack Testing Aug 31, 2026

DaanHoogland moved this from Backlog to conflict/waiting for author in CloudStack Testing Aug 31, 2026

DaanHoogland assigned RosiKyu Sep 1, 2026

nvazquez modified the milestones: 24.0, 25.0 Oct 27, 2026

                   @Override
                   public void execute() throws ConcurrentOperationException, ResourceUnavailableException {
-                      CallContext.current().setEventDetails("Internal lb vm Id: " + getId());
+                      CallContext.current().setEventDetails("Internal lb VM Id: " + getId());

                   @Override
                   public void execute() {
-                      CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
+                      CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

                   @Override
                   public void execute() {
-                      CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
+                      CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

                   @Override
                   public void execute() {
-                      CallContext.current().setEventDetails("SystemVm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
+                      CallContext.current().setEventDetails("SystemVM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

                   @Override
                   public void execute() {
-                      CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
+                      CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

                           throw new CloudRuntimeException("Insufficient capacity", ex);
                       }
-                      CallContext.current().setEventDetails("Vm Id: " + svm.getId());
+                      CallContext.current().setEventDetails("VM ID: " + svm.getId());

	CallContext.current().setEventDetails("VM ID: " + svm.getId());
	CallContext.current().setEventDetails("VM Id: " + svm.getId());

	CallContext.current().setEventDetails("Internal lb VM Id: " + getId());
	CallContext.current().setEventDetails("Internal lb VM ID: " + getId());

	CallContext.current().setEventDetails("SystemVM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
	CallContext.current().setEventDetails("SystemVM ID: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));

                       UserVm result;
-                      CallContext.current().setEventDetails("Vm Id: " + getEntityUuid());
+                      CallContext.current().setEventDetails("VM Id: " + getEntityUuid());

Fix grammar, spelling, word casing, whitespace by jbampton · Pull Request #9132 · apache/cloudstack · GitHub

Repository navigation

Fix grammar, spelling, word casing, whitespace - #9132

Fix grammar, spelling, word casing, whitespace#9132jbampton wants to merge 23 commits intoapache:mainapache/cloudstack:mainfrom jbampton:fix-spelling-grammar-case-whitespacejbampton/cloudstack:fix-spelling-grammar-case-whitespaceCopy head branch name to clipboard

Conversation

jbampton commented May 28, 2024

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 May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Jun 14, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jbampton commented Oct 14, 2024

Uh oh!

blueorangutan commented Oct 14, 2024

Uh oh!

blueorangutan commented Oct 14, 2024

Uh oh!

DaanHoogland commented Oct 23, 2024

Uh oh!

blueorangutan commented Oct 23, 2024

Uh oh!

blueorangutan commented Oct 23, 2024

Uh oh!

Uh oh!

github-actions Bot commented Dec 20, 2024

Uh oh!

Uh oh!

blueorangutan commented Sep 18, 2025

Uh oh!

DaanHoogland commented Sep 19, 2025

Uh oh!

github-actions Bot commented Oct 7, 2025

Uh oh!

DaanHoogland commented Oct 13, 2025

Uh oh!

DaanHoogland commented Dec 12, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Fix grammar, spelling, word casing, whitespace#9132
jbampton wants to merge 23 commits into
apache:mainfrom
jbampton:fix-spelling-grammar-case-whitespace

codecov Bot commented May 28, 2024 •
edited
Loading