Fix listing service offerings with different host tags by nvazquez · Pull Request #12919 · apache/cloudstack

nvazquez · 2026-03-30T18:31:15Z

Description

This PR introduces the global setting: allow.different.host.tags.offerings.for.vm.scale to fix the listing of service offerings for VMs, including offerings that contain different host tags.

Previously only offerings without any host tag or offerings matching exactly the same VM offering host tags were displayed
By default the setting is set to false, to preserve the previous behavior.
When the setting is enabled, the listing of service offerings for a VM will include offerings containing different host tags than the current offering

Fixes: #11407

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?

Create service offering A with host tag = TAG_A
Create service offering B with host tag = TAG_B
Edit hosts, some using tag TAG_A and some using TAG_B
Deploy VM from service offering A
Stop VM
Click on Scale VM, observe that offering B is available, select offering B
VM is properly scaled to use offering B

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

nvazquez · 2026-03-30T18:32:23Z

@blueorangutan package

blueorangutan · 2026-03-30T18:34:04Z

@nvazquez 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 · 2026-03-30T18:41:17Z

Codecov Report

❌ Patch coverage is 47.22222% with 19 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.60%. Comparing base (59b6c32) to head (d2685ff).
⚠️ Report is 8 commits behind head on 4.22.

Files with missing lines	Patch %	Lines
...ain/java/com/cloud/api/query/QueryManagerImpl.java	50.00%	7 Missing and 4 partials ⚠️
.../main/java/com/cloud/host/dao/HostTagsDaoImpl.java	33.33%	8 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #12919      +/-   ##
============================================
- Coverage     17.60%   17.60%   -0.01%     
+ Complexity    15676    15675       -1     
============================================
  Files          5918     5918              
  Lines        531667   531721      +54     
  Branches      65001    65013      +12     
============================================
+ Hits          93617    93621       +4     
- Misses       427491   427535      +44     
- Partials      10559    10565       +6

Flag	Coverage Δ
uitests	`3.70% <ø> (-0.01%)`	⬇️
unittests	`18.67% <47.22%> (-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.

blueorangutan · 2026-03-30T19:34:21Z

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

Copilot

Pull request overview

This PR updates service offering listing logic (used for VM scaling) so that offerings with different host tags are also shown, by expanding the tag filter to include tags present on hosts in the VM’s current cluster and by loosening host-tag matching to OR semantics.

Changes:

Extend service offering filtering to include host tags from the VM’s current cluster when listing scale-eligible offerings.
Change host-tag matching from requiring all tags (AND) to allowing any matching tag (OR), while still including untagged offerings.
Add unit tests for collecting cluster host tags into the VM’s host tag filter.

Reviewed changes

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

File	Description
`server/src/main/java/com/cloud/api/query/QueryManagerImpl.java`	Expands host-tag filtering for service offering listing and adds helper to include cluster tags.
`engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java`	Adds DAO API to list host tags by cluster ID.
`engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java`	Implements listing tags by cluster via host IDs + custom search.
`server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java`	Adds tests for the new helper that augments host tags with current cluster tags.

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

engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

nvazquez · 2026-03-31T00:05:29Z

@blueorangutan test

blueorangutan · 2026-03-31T00:06:03Z

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

nvazquez · 2026-03-31T10:53:26Z

@blueorangutan package

blueorangutan · 2026-03-31T10:54:04Z

@nvazquez 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 · 2026-03-31T11:58:03Z

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

engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java

DaanHoogland

clgtm

blueorangutan · 2026-03-31T18:02:04Z

@nvazquez 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 · 2026-03-31T19:06:24Z

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

Pearl1594

code lgtm

kiranchavala

@nvazquez the setting is not in effect for custom offerings

Steps to reproduce the issue

Have 2 host tags with hosttags h1 and h2 respectively
Create a custom unconstrained offering c1 with host tag h1
Create another custom unconstrained offering c2 with host tag h2
Make sure dynamic scaling is enabled in the global settings and service offering and the registered template
Deploy a vm with the custom unconstrained offering c1
Make sure the global setting "allow.different.host.tags.offerings.for.vm.scale" is enabled
Scale the running vm
The custom unconstrained offering c2 with host tag h2 is not displayed

If the vm is stopped then all the offerings are displayed

nvazquez · 2026-04-06T13:08:23Z

Hi @kiranchavala this is similar to issue: #6865 and it seems to be by design from PR: #5923. I do see it is planned to be fixed by: #12908

kiranchavala

@nvazquez can you add the host tags and storage tags in the UI

when a user tries to scale the VM, it's handy to see the tags associated with the service offering

https://cloudstack.apache.org/api/apidocs-4.22/apis/listServiceOfferings.html

(local) 🐱 > list serviceofferings id=57d7582f-d854-477c-9690-329eeada8d32  filter=hosttags,storagetags
{
  "count": 1,
  "serviceoffering": [
    {
      "hosttags": "test3",
      "storagetags": "test3"
    }
  ]
}

nvazquez · 2026-04-07T16:38:50Z

@kiranchavala please find the fix pushed, host tags and/or storage tags will only be displayed when available at least in one offering from the list

@blueorangutan package

blueorangutan · 2026-04-07T16:40:04Z

@nvazquez 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 · 2026-04-07T17:43:40Z

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

DaanHoogland · 2026-04-08T09:19:46Z

@blueorangutan test

blueorangutan · 2026-04-08T09:22:04Z

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

blueorangutan · 2026-04-08T23:33:50Z

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

Test	Result	Time (s)	Test File

kiranchavala

LGTM

Tested the issue manually

Tested with both admin and with normal user role

Have 2 host tags with hosttags h1 and h2 respectively

Create a compute offering c1,c2,c3 with host tags h1,h2,h3 respectively

Stop the vm

Scale the vm

Only the compute offering c3 is visible, as it has the same host tag

Make sure the global setting "allow.different.host.tags.offerings.for.vm.scale" is enabled

Scale the vm

Compute offering c2 is also visible, though it having a host tag h2

Also the host tags and storage tags are visible in the ui

Fix listing service offerings with different host tags

7742df2

nvazquez requested review from Damans227, Pearl1594, abh1sar, harikrishna-patnala, kiranchavala, sureshanaparti and weizhouapache March 30, 2026 18:31

nvazquez added component:UI component:tagging labels Mar 30, 2026

nvazquez linked an issue Mar 30, 2026 that may be closed by this pull request

Ability to change compute offering with different host tags #11407

Closed

nvazquez requested review from DaanHoogland and shwstppr March 30, 2026 18:36

weizhouapache requested a review from Copilot March 30, 2026 21:40

Copilot started reviewing on behalf of weizhouapache March 30, 2026 21:40 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

nvazquez added this to the 4.22.1 milestone Mar 31, 2026

Refactor from copilot code review

868b7dd

DaanHoogland reviewed Mar 31, 2026

View reviewed changes

engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java Outdated Show resolved Hide resolved

Use inject instead of autowired

deeac92

DaanHoogland approved these changes Mar 31, 2026

View reviewed changes

Pearl1594 reviewed Mar 31, 2026

View reviewed changes

sureshanaparti added this to Apache CloudStack 4.22.1 Apr 1, 2026

github-project-automation bot moved this to Todo in Apache CloudStack 4.22.1 Apr 1, 2026

sureshanaparti moved this from Todo to In Progress in Apache CloudStack 4.22.1 Apr 1, 2026

DaanHoogland removed request for Damans227, abh1sar, harikrishna-patnala, shwstppr, sureshanaparti and weizhouapache April 1, 2026 12:22

DaanHoogland assigned kiranchavala Apr 1, 2026

kiranchavala reviewed Apr 6, 2026

View reviewed changes

kiranchavala reviewed Apr 7, 2026

View reviewed changes

Display hosttags and storagetags if available

d2685ff

kiranchavala approved these changes Apr 9, 2026

View reviewed changes

kiranchavala added status:ready-for-merge and removed ready-for-testing labels Apr 9, 2026

DaanHoogland merged commit b585802 into apache:4.22 Apr 9, 2026
26 checks passed

github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.22.1 Apr 9, 2026

DaanHoogland mentioned this pull request Apr 9, 2026

Ability to change compute offering with different host tags #11407

Closed

DaanHoogland deleted the 422-change-offering-hosttags branch April 9, 2026 08:56

Conversation

nvazquez commented Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

nvazquez commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

codecov bot commented Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Mar 30, 2026

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!

nvazquez commented Mar 31, 2026

Uh oh!

blueorangutan commented Mar 31, 2026

Uh oh!

nvazquez commented Mar 31, 2026

Uh oh!

blueorangutan commented Mar 31, 2026

Uh oh!

blueorangutan commented Mar 31, 2026

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Mar 31, 2026

Uh oh!

blueorangutan commented Mar 31, 2026

Uh oh!

Pearl1594 left a comment

Choose a reason for hiding this comment

Uh oh!

kiranchavala left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nvazquez commented Apr 6, 2026

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

nvazquez commented Apr 7, 2026

Uh oh!

blueorangutan commented Apr 7, 2026

Uh oh!

blueorangutan commented Apr 7, 2026

Uh oh!

DaanHoogland commented Apr 8, 2026

Uh oh!

blueorangutan commented Apr 8, 2026

Uh oh!

blueorangutan commented Apr 8, 2026

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

nvazquez commented Mar 30, 2026 •

edited

Loading

codecov bot commented Mar 30, 2026 •

edited

Loading

kiranchavala left a comment •

edited

Loading