merge conflict fixes

[DaanHoogland]

Description

This PR fixes some merge conflicts

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?

[Copilot]

Pull request overview

Resolves merge-conflict fallout across VM import and VM snapshot revert code paths.

Changes:

• Adjusts VM import flows in UnmanagedVMsManagerImpl by removing the outer CheckedReservation try-with-resources wrappers.
• Updates snapshot revert validation in VMSnapshotManagerImpl.
• Updates the unmanaged VM manager unit test imports.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java	Import list adjusted (currently introduces an unused import).
server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java	Removes outer reservation wrappers around import flows.
server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java	Adds/adjusts revert validation logic (currently duplicated).

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.68%. Comparing base (be89e6f) to head (d24beb0).
⚠️ Report is 1 commits behind head on 4.22.

Additional details and impacted files

@@ Coverage Diff @@## 4.22 #13046 +/- ##
============================================
- Coverage 17.68% 17.68% -0.01% 
Complexity 15793 15793 ============================================
Files 5922 5922 Lines 533096 533090 -6 Branches 65209 65209 ============================================
- Hits 94275 94269 -6 
Misses 428181 428181 Partials 10640 10640 

Flag	Coverage Δ
uitests	3.69% <ø> (ø)
unittests	18.76% <100.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.

[sureshanaparti]

@blueorangutan package

[blueorangutan]

@sureshanaparti 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 17565

[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 test result (tid-15928)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 64236 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13046-t15928-kvm-ol8.zip
Smoke tests completed. 141 look OK, 8 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestClusterDRS>:setup	Error	0.00	test_cluster_drs.py
test_list_system_vms_metrics_history	Failure	0.26	test_metrics_api.py
test_06_download_detached_volume	Error	303.01	test_volumes.py
ContextSuite context=TestVolumes>:teardown	Error	122.02	test_volumes.py
ContextSuite context=TestIpv6Vpc>:setup	Error	0.00	test_vpc_ipv6.py
ContextSuite context=TestVPCRedundancy>:setup	Error	0.00	test_vpc_redundant.py
ContextSuite context=TestVPCNics>:setup	Error	0.00	test_vpc_router_nics.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	1515.98	test_hostha_kvm.py

[sureshanaparti]

@blueorangutan ui

[blueorangutan]

@sureshanaparti a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

[sureshanaparti]

@blueorangutan package

[blueorangutan]

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

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/13046 (QA-JID-912)

[blueorangutan]

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

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud