Skip to content

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

Merged
andrijapanicsb merged 26 commits into
apache:mainfrom
jbampton:fix-spelling-grammar-case-whitespace
Nov 16, 2026
Merged

andrijapanicsb merged 26 commits into
apache:mainfrom
jbampton:fix-spelling-grammar-case-whitespace

Conversation

@jbampton

Copy link
Copy Markdown
Member

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

codecov Bot commented May 28, 2024 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 20.77%. Comparing base (c5bd11a) to head (35e1dd2).

Files with missing lines Patch % Lines
...rk/db/src/main/java/com/cloud/utils/db/EcInfo.java 0.00% 1 Missing ⚠️
...etwork/contrail/management/ServiceManagerImpl.java 0.00% 1 Missing ⚠️
...ain/java/com/cloud/network/NetworkServiceImpl.java 0.00% 1 Missing ⚠️
...n/java/com/cloud/template/TemplateManagerImpl.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##               main    #9132   +/-   ##
=========================================
  Coverage     20.77%   20.77%           
+ Complexity    20855    20853    -2     
=========================================
  Files          6053     6053           
  Lines        548230   548230           
  Branches      73237    73237           
=========================================
+ Hits         113903   113918   +15     
+ Misses       420988   420963   -25     
- Partials      13339    13349   +10     
Flag Coverage Δ
uitests 3.86% <ø> (ø)
unittests 22.21% <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 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.

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@github-actions

Copy link
Copy Markdown

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

jbampton and others added 7 commits July 10, 2024 21:05
…ployVMCmd.java

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

Co-authored-by: dahn <daan.hoogland@gmail.com>
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>
@jbampton
jbampton marked this pull request as draft October 14, 2024 12:46
@jbampton

Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@DaanHoogland

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@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

Copy link
Copy Markdown

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

Comment thread tools/git/git-pr Resolved
@github-actions

Copy link
Copy Markdown

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

@nvazquez

Copy link
Copy Markdown
Contributor

Hi @jbampton can you please fix the conflicts?

@DaanHoogland DaanHoogland moved this from Backlog to conflict/waiting for author in CloudStack Testing Aug 31, 2026
@nvazquez nvazquez modified the milestones: 24.0, 25.0 Oct 27, 2026
Stop talking, do some work...

Co-authored-by: João Jandre <48719461+JoaoJandre@users.noreply.github.com>
@andrijapanicsb
andrijapanicsb marked this pull request as ready for review November 15, 2026 21:53
@apache apache deleted a comment from FelipeM525 Nov 15, 2026
Resolve conflicts by keeping the wording and code from main where both sides changed the same lines.

Re-apply the casing fixes from this PR that main still needed:
- 'id' to 'ID' in six messages in UserVmManagerImpl
- 'Instance Id' to 'Instance ID' in NetworkServiceImpl
- 'Vm ID' to 'VM ID' in TemplateManagerImpl
Copilot AI balanced review requested due to automatic review settings November 15, 2026 22:11

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟡 Changes recommended

The VM-start error message lacks a space after the added period, joining two messages together, and the revised shell comment remains grammatically incorrect.

1 open issue
What changed in this PR

This PR improves wording and terminology consistency across CloudStack’s VM management code, integration tests, and setup scripts without changing control flow.

Changes:

  • Standardizes acronym casing in logs, exception messages, event descriptions, and comments.
  • Corrects spelling, grammar, and whitespace in comments and test messages.
  • Updates a unit-test expectation to match the revised NAT exception message.
File Description
test/​integration/​component/​test_netscaler_lb.py Cleans up test comments and diagnostic messages.
test/​integration/​component/​maint/​test_host_high_availability.py Corrects comment spacing, docstrings, and assertion messages.
systemvm/​debian/​opt/​cloud/​bin/​setup/​common.sh Corrects spelling in setup comments.
server/​src/​test/​java/​com/​cloud/​vm/​UserVmManagerTest.java Standardizes VM ID casing in commented-out code only.
server/​src/​test/​java/​com/​cloud/​vm/​UserVmManagerImplTest.java Aligns the expected exception message with NAT casing.
server/​src/​main/​java/​com/​cloud/​vm/​UserVmManagerImpl.java Standardizes messages, event descriptions, and comments.
server/​src/​main/​java/​com/​cloud/​template/​TemplateManagerImpl.java Standardizes VM casing in ISO-detachment event details.
server/​src/​main/​java/​com/​cloud/​network/​NetworkServiceImpl.java Standardizes ID casing in a log message.
plugins/​network-elements/​stratosphere-ssp/​src/​test/​java/​org/​apache/​cloudstack/​network/​element/​SspElementTest.java Corrects spelling and API casing in comments only.
plugins/​network-elements/​juniper-contrail/​src/​main/​java/​org/​apache/​cloudstack/​network/​contrail/​management/​ServiceManagerImpl.java Standardizes VM ID casing in event details.
framework/​db/​src/​main/​java/​com/​cloud/​utils/​db/​EcInfo.java Corrects spelling in an assertion message.

Review effort: Balanced

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings November 15, 2026 22:15

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 Approval recommended

No active review issues are recorded for the wording and terminology consistency updates.

No open issues 🎉

1 resolved since last review

Review effort: Balanced

@andrijapanicsb

Copy link
Copy Markdown
Contributor

resolved, merging if CI turns green

@andrijapanicsb andrijapanicsb modified the milestones: 25.0, 24.0 Nov 16, 2026
@andrijapanicsb

Copy link
Copy Markdown
Contributor

2 LGTMS, CI passing (the single failure caused by test/integration/component/est_mm_domain_limits.py, which this PR does not touch - as advised by Copilot)

No Marvin tests needed.

@JoaoJandre @FelipeM525 the requested changes were applied: casing is now consistently “VM ID” / “ID” throughout, and conflicts with main are resolved.

Merging on that basis.

@andrijapanicsb
andrijapanicsb merged commit f2ee0b7 into apache:main Nov 16, 2026
41 of 45 checks passed
@github-project-automation github-project-automation Bot moved this from conflict/waiting to Done in CloudStack Testing Nov 16, 2026
@jbampton
jbampton deleted the fix-spelling-grammar-case-whitespace branch November 16, 2026 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Development

Successfully merging this pull request may close these issues.