opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10135 from ioito/hotfix/qx-sku-disable

Browse Source 
fix(region,scheduler): filter enabled skus
This commit is contained in:
Zexi Li
2021-02-05 14:55:23 +08:00
committed by GitHub
parent c3f226e34f 4a6474caff
commit 00c597f5dd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+1 -1
View File
@@ -907,7 +907,7 @@ func (manager *SServerSkuManager) GetMatchedSku(regionId string, cpu int64, memM
}
func (manager *SServerSkuManager) FetchSkuByNameAndProvider(name string, provider string, checkConsistency bool) (*SServerSku, error) {
q := manager.Query()
q := manager.Query().IsTrue("enabled")
q = q.Equals("name", name)
if utils.IsInStringArray(provider, []string{api.CLOUD_PROVIDER_ONECLOUD, api.CLOUD_PROVIDER_VMWARE}) {
q = q.Filter(
pkg/scheduler/data_manager/sku/sku.go
+1 -1
View File
@@ -140,7 +140,7 @@ func (m *SSkuManager) syncOnce() {
startTime := time.Now()
skus := make([]ServerSku, 0)
q := models.ServerSkuManager.Query("id", "name", "cloudregion_id", "zone_id")
q := models.ServerSkuManager.Query("id", "name", "cloudregion_id", "zone_id").IsTrue("enabled")
q = q.Filter(
sqlchemy.OR(
sqlchemy.Equals(q.Field("prepaid_status"), computeapi.SkuStatusAvailable),