Preserve VM settings on Instance Snapshot revert for Custom Service Offering

[abh1sar]

Description

This PR fixes #11272

On revert to an instance snapshot, VM instance details were fully replaced with only the snapshot-stored details (CPU_NUMBER, CPU_SPEED, MEMORY) for dynamic service offerings, so any other details (e.g. boot/UEFI, keyboard, or other custom settings) were lost. This change updates revert to only restore those three service-offering details via addDetail, leaving all other VM instance details unchanged.

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):

Before fix:

Initial settings

Settings after snapshot revert

How Has This Been Tested?

1. Create a custom service offering
2. Create an instance with the custom service offering
3. Shut down Instance and set UEFI=Secure in Instance settings
4. Start Instance Create Instance snapshot (with or without memory)
5. Stop Instance and Revert to Snapshot
6. Start Instance
7. Verify that none of the VM settings are lost.

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

[abh1sar]

@blueorangutan package

[blueorangutan]

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

Codecov Report

❌ Patch coverage is 77.77778% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.26%. Comparing base (56a39e6) to head (5ce6633).
⚠️ Report is 87 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...a/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java	77.77%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.20   #12555      +/-   ##
============================================
+ Coverage     16.23%   16.26%   +0.02%     
- Complexity    13378    13427      +49     
============================================
  Files          5657     5660       +3     
  Lines        498866   499921    +1055     
  Branches      60545    60699     +154     
============================================
+ Hits          81011    81322     +311     
- Misses       408821   409526     +705     
- Partials       9034     9073      +39     

Flag	Coverage Δ
uitests	4.16% <ø> (+0.15%)	⬆️
unittests	17.11% <77.77%> (+0.02%)	⬆️

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.

[blueorangutan]

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

[abh1sar]

@blueorangutan package

[blueorangutan]

@abh1sar 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 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16651

[sureshanaparti]

clgtm

[sureshanaparti]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

[SF] Trillian Build Failed (tid-15344)

[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-15349)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 53588 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12555-t15349-kvm-ol8.zip
Smoke tests completed. 140 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_redundant_vpc_site2site_vpn	Failure	466.52	test_vpc_vpn.py

[weizhouapache]

lgtm

[RosiKyu]

LGTM

1. Created a custom service offering
2. Create an instance with the custom service offering
3. Started the Instance and created Instance snapshot (with memory)
4. Stopped the Instance and Reverted to Snapshot
5. Started the Instance
6. Verified that none of the VM settings were lost