Copilot/fix issue 5803 domain dedication by DaanHoogland · Pull Request #13529 · apache/cloudstack

DaanHoogland · 2026-07-02T17:12:09Z

Description

This PR...

Fixes: #5803

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

Screenshots (if appropriate):

How Has This Been Tested?

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

…r (issue apache#5803) - Fix findAvoidSetForNonExplicitUserVM to check domain/account dedication before adding pods/clusters/hosts to the avoid list - Domain-dedicated resources are now accessible to users in the same domain - Add 4 unit tests covering same-domain, different-domain, same-account, different-account scenarios - Use mutable ArrayList in test return values to support list.clear() calls in production code

…d tempStorage.clear() - Use Filter without offset/limit to retrieve all dedicated resources (not just the first) - Eliminate tempStorage variable and clear() calls to avoid potential side effects - Code is now cleaner and consistent with correct behavior

…tent

Copilot

Pull request overview

This PR addresses issue #5803 by adjusting how DeploymentPlanningManagerImpl builds the avoid list for non-explicit user VMs when dedicated pods/clusters/hosts exist, and adds unit tests to validate domain/account dedication behavior.

Changes:

Update findAvoidSetForNonExplicitUserVM to account for domain-dedicated resources (in addition to account-dedicated ones) when building the avoid set.
Add new unit tests covering domain-dedicated and account-dedicated pod accessibility scenarios.

Reviewed changes

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

File	Description
server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java	Updates avoid-list construction for non-explicit user VMs to better handle dedicated resource access.
server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java	Adds tests for dedicated-pod access rules across same/different domain and same/different account cases.

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

codecov · 2026-07-02T17:20:23Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 0.00%. Comparing base (a5b6bc3) to head (52ee410).
⚠️ Report is 399 commits behind head on main.

Additional details and impacted files

@@              Coverage Diff              @@
##               main   #13529       +/-   ##
=============================================
- Coverage     17.89%        0   -17.90%     
=============================================
  Files          5936        0     -5936     
  Lines        532734        0   -532734     
  Branches      65165        0    -65165     
=============================================
- Hits          95347        0    -95347     
+ Misses       426711        0   -426711     
+ Partials      10676        0    -10676

Flag	Coverage Δ
uitests	`?`
unittests	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 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.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

DaanHoogland · 2026-07-06T14:06:32Z

@blueorangutan package

blueorangutan · 2026-07-06T14:08:05Z

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

Copilot

Pull request overview

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

+        Mockito.when(_dedicatedDao.searchDedicatedPods(Mockito.isNull(), Mockito.eq(vmDomainId),
+                Mockito.isNull(), Mockito.isNull(), Mockito.any(com.cloud.utils.db.Filter.class)))
+                .thenReturn(new Pair<>(new ArrayList<>(Arrays.asList(dedicatedPod)), 1));


Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: dahn <daan.hoogland@gmail.com>

Copilot

Pull request overview

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

+    @Inject
+    HostDao _hostDao;
+
+    @Inject
+    AffinityGroupDomainMapDao _affinityGroupDomainMapDao;
+


+        // Domain has affinity group mappings (pod dedicated to this domain).
+        // The content of the list entries does not matter; only emptiness is checked.
+        AffinityGroupDomainMapVO domainMap = Mockito.mock(AffinityGroupDomainMapVO.class);
+        Mockito.when(_affinityGroupDomainMapDao.listByDomain(vmDomainId))
+                .thenReturn(Arrays.asList(domainMap));
+
+        // The pod is found when searching by domain (accountId = null)
+        DedicatedResourceVO dedicatedPod = Mockito.mock(DedicatedResourceVO.class);
+        Mockito.when(dedicatedPod.getPodId()).thenReturn(dedicatedPodId);
+        Mockito.when(_dedicatedDao.searchDedicatedPods(Mockito.isNull(), Mockito.eq(vmDomainId),
+                Mockito.isNull(), Mockito.isNull(), Mockito.any(com.cloud.utils.db.Filter.class)))
+                .thenReturn(new Pair<>(new ArrayList<>(Arrays.asList(dedicatedPod)), 1));
+


    private void findAvoidSetForNonExplicitUserVM(ExcludeList avoids, VirtualMachine vm, List<Long> allPodsInDc, List<Long> allClustersInDc, List<Long> allHostsInDc) {
+        long vmAccountId = vm.getAccountId();
+        long vmDomainId = vm.getDomainId();
+
+        List<Long> allPodsFromDedicatedID = new ArrayList<>();
+        List<Long> allClustersFromDedicatedID = new ArrayList<>();
+        List<Long> allHostsFromDedicatedID = new ArrayList<>();
+


blueorangutan · 2026-07-06T14:37:34Z

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

DaanHoogland · 2026-07-20T15:38:11Z

superceded by #13654

@mock

…eturn Restore the type-specific AffinityGroupDao.findDomainLevelGroupByType check (as Copilot's review on PR apache#13529 requested), instead of the looser AffinityGroupDomainMapDao.listByDomain used in the previous fix commit, which matches any domain-level affinity group rather than specifically ExplicitDedication. Add the missing @mock for AffinityGroupDao and update the new tests to stub the type-specific call, so this no longer NPEs the way the last "apply suggestions" commit did. Also add an early return in findAvoidSetForNonExplicitUserVM when nothing in the DC is dedicated, per another unaddressed review comment, to avoid unnecessary DAO calls on the common case. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Copilot AI added 4 commits July 2, 2026 15:04

Initial plan

b26ad39

Address code review: document filter purpose and clarify test mock in…

b6eda5f

…tent

Copilot AI review requested due to automatic review settings July 2, 2026 17:12

Copilot started reviewing on behalf of DaanHoogland July 2, 2026 17:12 View session

Copilot AI reviewed Jul 2, 2026

View reviewed changes

DaanHoogland marked this pull request as draft July 2, 2026 20:01

Apply suggestions from code review

1d81b04

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings July 6, 2026 14:04

Copilot started reviewing on behalf of DaanHoogland July 6, 2026 14:05 View session

Copilot AI reviewed Jul 6, 2026

View reviewed changes

DaanHoogland commented Jul 6, 2026

View reviewed changes

Comment thread server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java

Apply suggestions from code review

52ee410

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: dahn <daan.hoogland@gmail.com>

Copilot AI review requested due to automatic review settings July 6, 2026 14:24

Copilot started reviewing on behalf of DaanHoogland July 6, 2026 14:25 View session

Copilot AI reviewed Jul 6, 2026

View reviewed changes

DaanHoogland closed this Jul 20, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Copilot/fix issue 5803 domain dedication - #13529

Copilot/fix issue 5803 domain dedication#13529
DaanHoogland wants to merge 6 commits into
apache:mainfrom
DaanHoogland:copilot/fix-issue-5803-domain-dedication

DaanHoogland commented Jul 2, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

DaanHoogland commented Jul 6, 2026

Uh oh!

blueorangutan commented Jul 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

blueorangutan commented Jul 6, 2026

Uh oh!

DaanHoogland commented Jul 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

DaanHoogland commented Jul 2, 2026

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DaanHoogland commented Jul 6, 2026

Uh oh!

blueorangutan commented Jul 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

blueorangutan commented Jul 6, 2026

Uh oh!

DaanHoogland commented Jul 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov Bot commented Jul 2, 2026 •

edited

Loading