opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-31 01:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3195 from ioito/hotfix/qx-sku-list-filter-by-memory

Browse Source 
fix: 避免部分套餐无法列出
This commit is contained in:
yunion-ci-robot
2019-10-14 12:05:42 +08:00
committed by GitHub
parent 847c877062 4e910643af
commit 1e4eef7066
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+10
View File
@@ -797,6 +797,16 @@ func (manager *SServerSkuManager) ListItemFilter(ctx context.Context, q *sqlchem
q = q.Join(regionTable, sqlchemy.Equals(regionTable.Field("id"), q.Field("cloudregion_id"))).Filter(sqlchemy.Equals(regionTable.Field("city"), city))
}
// 按区间查询内存, 避免0.75G这样的套餐不好过滤
memSizeMB, _ := query.Int("memory_size_mb")
if memSizeMB > 0 {
s, e := intervalMem(int(memSizeMB))
q.GT("memory_size_mb", s)
q.LE("memory_size_mb", e)
queryDict := query.(*jsonutils.JSONDict)
queryDict.Remove("memory_size_mb")
}
return q, err
}