Fix volume response for service offering with disk offering

[vishesh92]

Description

This PR fixes the bug introduced in #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)
• 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?

[vishesh92]

@blueorangutan package

[blueorangutan]

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

[DaanHoogland]

clgtm

[sureshanaparti]

lgtm

[codecov]

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 ⚠️

Additional details and impacted files

@@             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	Coverage Δ
uitests	4.18% <ø> (-0.10%)	⬇️
unittests	16.18% <0.00%> (+0.51%)	⬆️

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.

[vishesh92]

@blueorangutan package

[weizhouapache]

code lgtm

[sureshanaparti]

@blueorangutan test

[blueorangutan]

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

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

[weizhouapache]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

[SF] Trillian Build Failed (tid-10536)

[yadvr]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File