Skip to content

Fix Cross zone templates registration for Edge Zones#12874

Draft
vishesh92 wants to merge 3 commits intoapache:4.22from
shapeblue:edge-zone-fix-cross-zone-template
Draft

Fix Cross zone templates registration for Edge Zones#12874
vishesh92 wants to merge 3 commits intoapache:4.22from
shapeblue:edge-zone-fix-cross-zone-template

Conversation

@vishesh92
Copy link
Member

@vishesh92 vishesh92 commented Mar 23, 2026

Description

This PR fixes the registration of existing Cross Zone templates for Edge Zone.
This PR also offloads the filtering of cross zones to the database.

Details

This pull request refactors how cross-zone VM templates are handled and associated with zones. The main improvement is the introduction of a new DAO method, listAllCrossZoneTemplates(), which streamlines and centralizes the retrieval of cross-zone templates. This change eliminates repeated filtering logic across the codebase and makes the association process more efficient and maintainable. Additionally, the pull request updates the logic for associating these templates with zones, particularly in scenarios involving Edge Zones.

DAO and Data Access Improvements:

  • Added the listAllCrossZoneTemplates() method to the VMTemplateDao interface and its implementation, allowing efficient retrieval of only cross-zone templates without manual filtering. [1] [2] [3]
  • Updated the DAO search builder to include the crossZone property for filtering templates.

Refactoring Template Association Logic:

  • Replaced manual filtering of cross-zone templates in multiple locations (TemplateServiceImpl, SimulatorDiscoverer, SecondaryStorageDiscoverer, and StorageManagerImpl) with calls to the new listAllCrossZoneTemplates() method, simplifying and unifying the logic. [1] [2] [3] [4] [5]

Edge Zone Handling:

  • Modified ConfigurationManagerImpl to associate cross-zone templates with Edge Zones immediately upon creation, since Edge Zones do not have SSVMs to trigger this association later.

Dependency Injection and Imports:

  • Injected the TemplateService into ConfigurationManagerImpl to support the new association logic and added the necessary import. [1] [2]

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
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@codecov
Copy link

codecov bot commented Mar 23, 2026

Codecov Report

❌ Patch coverage is 5.71429% with 33 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.61%. Comparing base (e93ae1a) to head (ca0a3fe).

Files with missing lines Patch % Lines
.../cloudstack/storage/image/TemplateServiceImpl.java 0.00% 7 Missing ⚠️
...ain/java/com/cloud/storage/StorageManagerImpl.java 0.00% 7 Missing ⚠️
.../java/com/cloud/storage/dao/VMTemplateDaoImpl.java 0.00% 6 Missing ⚠️
...n/java/com/cloud/resource/SimulatorDiscoverer.java 0.00% 6 Missing ⚠️
...k/storage/resource/SecondaryStorageDiscoverer.java 0.00% 6 Missing ⚠️
...a/com/cloud/storage/download/DownloadListener.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##               4.22   #12874   +/-   ##
=========================================
  Coverage     17.61%   17.61%           
- Complexity    15661    15662    +1     
=========================================
  Files          5917     5917           
  Lines        531430   531433    +3     
  Branches      64973    64970    -3     
=========================================
+ Hits          93586    93589    +3     
+ Misses       427288   427287    -1     
- Partials      10556    10557    +1     
Flag Coverage Δ
uitests 3.70% <ø> (ø)
unittests 18.68% <5.71%> (+<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.

@vishesh92
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

Copy link
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants