Fix volume response for service offering with disk offering

vishesh92 commented 1 week ago

Description

This PR fixes the bug introduced in https://github.com/apache/cloudstack/pull/9235 . This resulted in volume response not having diskofferingid in the response for a service offering with a disk offering.

Types of changes

[ ] Breaking change (fix or feature that would cause existing functionality to change)
[ ] New feature (non-breaking change which adds functionality)
[x] 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
[x] Minor

Bug Severity

[ ] BLOCKER
[ ] Critical
[ ] Major
[x] Minor
[ ] Trivial

Screenshots (if appropriate):

How Has This Been Tested?

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

vishesh92 commented 1 week ago

@blueorangutan package

blueorangutan commented 1 week ago

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

codecov[bot] commented 1 week ago

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 15.42%. Comparing base (84b91cc) to head (75e77c7). Report is 1 commits behind head on 4.19.

Files	Patch %	Lines
...ava/com/cloud/api/query/dao/VolumeJoinDaoImpl.java	0.00%	2 Missing :warning:

Additional details and impacted files

```diff @@ Coverage Diff @@ ## 4.19 #9273 +/- ## ============================================ + Coverage 14.95% 15.42% +0.46% - Complexity 11014 11811 +797 ============================================ Files 5382 5469 +87 Lines 470092 478292 +8200 Branches 59650 61056 +1406 ============================================ + Hits 70308 73775 +3467 - Misses 391996 396389 +4393 - Partials 7788 8128 +340 ``` | [Flag](https://app.codecov.io/gh/apache/cloudstack/pull/9273/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Coverage Δ | | |---|---|---| | [uitests](https://app.codecov.io/gh/apache/cloudstack/pull/9273/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `4.18% <ø> (-0.10%)` | :arrow_down: | | [unittests](https://app.codecov.io/gh/apache/cloudstack/pull/9273/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `16.18% <0.00%> (+0.51%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

vishesh92 commented 1 week ago

@blueorangutan package

sureshanaparti commented 1 week ago

@blueorangutan test

blueorangutan commented 1 week ago

@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 commented 1 week ago

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

weizhouapache commented 1 week ago

@blueorangutan test

blueorangutan commented 1 week ago

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

blueorangutan commented 1 week ago

[SF] Trillian Build Failed (tid-10536)

apache / cloudstack