Skip to content

server: remove extra chars when template status is error string#11329

Merged
weizhouapache merged 1 commit intoapache:4.19from
shapeblue:fix-templatestatus-extrachars
Sep 3, 2025
Merged

server: remove extra chars when template status is error string#11329
weizhouapache merged 1 commit intoapache:4.19from
shapeblue:fix-templatestatus-extrachars

Conversation

@shwstppr
Copy link
Copy Markdown
Contributor

@shwstppr shwstppr commented Jul 29, 2025

Description

Fixes #11324

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

  • 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?

@shwstppr
server: remove extra chars when template status is error string
81a12a6 
Fixes apache#11324

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@shwstppr
Copy link
Copy Markdown
Contributor Author

shwstppr commented Jul 29, 2025

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jul 29, 2025

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

@shwstppr shwstppr linked an issue Jul 29, 2025 that may be closed by this pull request
Handle unexpected leading/trailing spaces in the Template/ISO status field #11324
Closed
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 29, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 15.17%. Comparing base (ca6d2dc) to head (81a12a6).
⚠️ Report is 22 commits behind head on 4.19.

Files with missing lines Patch % Lines
...a/com/cloud/api/query/dao/TemplateJoinDaoImpl.java 0.00% 2 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff            @@
##               4.19   #11329   +/-   ##
=========================================
  Coverage     15.17%   15.17%           
- Complexity    11362    11363    +1     
=========================================
  Files          5415     5415           
  Lines        476030   476043   +13     
  Branches      58115    58116    +1     
=========================================
+ Hits          72246    72249    +3     
- Misses       395701   395710    +9     
- Partials       8083     8084    +1
Flag Coverage Δ
uitests 4.28% <ø> (ø)
unittests 15.90% <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.

DaanHoogland
DaanHoogland approved these changes Jul 29, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

clgtm

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jul 29, 2025

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

@OlegChuev
Copy link
Copy Markdown
Contributor

OlegChuev commented Jul 29, 2025

Hi @shwstppr. Maybe it would be cleaner to return state as failed and include the exact reason in the error_details? Wdyt?

@shwstppr
Copy link
Copy Markdown
Contributor Author

shwstppr commented Jul 29, 2025

@OlegChuev that can be a separate change. Adding a new response param with this behaviour would need change in UI too which relies on status field

@shwstppr
Copy link
Copy Markdown
Contributor Author

shwstppr commented Jul 30, 2025

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jul 30, 2025

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

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Jul 30, 2025

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

Test Result Time (s) Test File
test_12_destroy_cpvm Error 3.29 test_ssvm.py
ContextSuite context=TestRVPCSite2SiteVpn>:setup Error 0.00 test_vpc_vpn.py
ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setup Error 0.00 test_vpc_vpn.py
ContextSuite context=TestVpcRemoteAccessVpn>:setup Error 0.00 test_vpc_vpn.py
ContextSuite context=TestVpcSite2SiteVpn>:setup Error 0.00 test_vpc_vpn.py
test_disable_oobm_ha_state_ineligible Error 1519.30 test_hostha_kvm.py

@DaanHoogland DaanHoogland added this to the 4.19.4 milestone Jul 31, 2025
weizhouapache
weizhouapache approved these changes Aug 18, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

code lgtm

@weizhouapache weizhouapache modified the milestones: 4.19.4, 4.20.2 Sep 2, 2025
weizhouapache
weizhouapache approved these changes Sep 3, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

tested ok

@weizhouapache weizhouapache merged commit a4cf47a into apache:4.19 Sep 3, 2025
23 of 25 checks passed
@weizhouapache weizhouapache mentioned this pull request Sep 3, 2025
Closed
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Sep 15, 2025
@shwstppr @dhslove
server: remove extra chars when template status is error string (apac…
a90422a 
…he#11329)

Fixes apache#11324

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvr yadvr yadvr approved these changes

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@weizhouapache weizhouapache weizhouapache approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

4.20.2

Development

Successfully merging this pull request may close these issues.

Handle unexpected leading/trailing spaces in the Template/ISO status field

6 participants

@shwstppr @blueorangutan @OlegChuev @yadvr @DaanHoogland @weizhouapache