opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): filter sku by zone ids (#25028)

Browse Source
This commit is contained in:
屈轩
2026-06-15 15:50:42 +08:00
committed by GitHub
parent bd236cb965
commit 24caa8dd11
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/server_skus.go
+9 -13
View File
@@ -916,24 +916,20 @@ func (manager *SServerSkuManager) ListItemFilter(
q = q.IsTrue("enabled")
}
zoneStr := query.ZoneId
if len(zoneStr) > 0 {
zoneObj, err := validators.ValidateModel(ctx, userCred, ZoneManager, &zoneStr)
if err != nil {
return nil, err
}
zone := zoneObj.(*SZone)
region, err := zone.GetRegion()
if err != nil {
return nil, errors.Wrapf(err, "GetRegion %s", zone.Name)
}
if len(query.ZoneIds) > 0 {
zones := ZoneManager.Query("id")
zones = zones.Filter(sqlchemy.OR(sqlchemy.In(zones.Field("id"), query.ZoneIds), sqlchemy.In(zones.Field("name"), query.ZoneIds)))
regionIds := ZoneManager.Query("cloudregion_id")
regionIds = regionIds.Filter(sqlchemy.OR(sqlchemy.In(regionIds.Field("id"), query.CloudregionId), sqlchemy.In(regionIds.Field("name"), query.CloudregionId))).Distinct()
q = q.Filter(
sqlchemy.OR(
sqlchemy.AND(
sqlchemy.Equals(q.Field("cloudregion_id"), region.Id),
sqlchemy.In(q.Field("cloudregion_id"), regionIds.SubQuery()),
sqlchemy.IsNullOrEmpty(q.Field("zone_id")),
),
sqlchemy.Equals(q.Field("zone_id"), zone.Id),
sqlchemy.In(q.Field("zone_id"), zones.SubQuery()),
),
)
}