server: fix scale vm with same disk offering id

[weizhouapache]

Description

This PR fixes #9776 (comment)

steps to reproduce the issue

• create disk offering
• create service offering 1/2 with same disk offering and strictness=true
• create vm with service offering 1
• stop the vm
• scale vm with service offering 2

expected result: success
actual result: fail

see #9776 (comment) for the screenshot.

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?

[DaanHoogland]

clgtm

[codecov]

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 15.15%. Comparing base (a627ab6) to head (96b4e7c).
Report is 6 commits behind head on 4.19.

Files with missing lines	Patch %	Lines
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              4.19   #10235       +/-   ##
============================================
+ Coverage     4.29%   15.15%   +10.86%     
- Complexity       0    11314    +11314     
============================================
  Files          367     5409     +5042     
  Lines        29620   474664   +445044     
  Branches      5194    57904    +52710     
============================================
+ Hits          1272    71936    +70664     
- Misses       28203   394686   +366483     
- Partials       145     8042     +7897     

Flag	Coverage Δ
uitests	4.29% <ø> (ø)
unittests	15.87% <0.00%> (?)

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.

[borisstoyanov]

@blueorangutan package

[borisstoyanov]

LGTM, manually checked user is able to scale to new offering now.

[weizhouapache]

thanks @borisstoyanov

if there is no smoke test failures, let's merge

@blueorangutan test

[weizhouapache]

@blueorangutan test

[blueorangutan]

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

[weizhouapache]

@blueorangutan test

[DaanHoogland]

@blueorangutan package

[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]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12377

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

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

Test	Result	Time (s)	Test File
test_10_attachAndDetach_iso	Error	12.60	test_vm_life_cycle.py