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

fix: 避免匹配到售罄的套餐

Browse Source
This commit is contained in:
Qu Xuan
2019-11-15 17:31:54 +08:00
parent 3ec983dab2
commit df0299bf74
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/dbinstances.go
+16 -5
View File
@@ -283,7 +283,7 @@ func (man *SDBInstanceManager) ValidateCreateData(ctx context.Context, userCred
instance := SDBInstance{}
jsonutils.Update(&instance, input)
skus, err := instance.GetDBInstanceSkus()
skus, err := instance.GetAvailableDBInstanceSkus()
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
@@ -729,9 +729,9 @@ func (self *SDBInstance) PerformChangeConfig(ctx context.Context, userCred mccli
}
if changed {
skus, err := tmp.GetDBInstanceSkus()
skus, err := tmp.GetAvailableDBInstanceSkus()
if err != nil {
return nil, httperrors.NewGeneralError(errors.Wrap(err, "self.GetDBInstanceSkus"))
return nil, httperrors.NewGeneralError(errors.Wrap(err, "self.GetAvailableDBInstanceSkus"))
}
if len(skus) == 0 {
return nil, httperrors.NewInputParameterError("failed to match any skus for change config")
@@ -1164,6 +1164,17 @@ func (self *SDBInstance) GetDBInstanceSkuQuery() *sqlchemy.SQuery {
return q
}
func (self *SDBInstance) GetAvailableDBInstanceSkus() ([]SDBInstanceSku, error) {
skus := []SDBInstanceSku{}
q := self.GetDBInstanceSkuQuery().Equals("status", api.DBINSTANCE_SKU_AVAILABLE)
err := db.FetchModelObjects(DBInstanceSkuManager, q, &skus)
if err != nil {
return nil, err
}
return skus, nil
}
func (self *SDBInstance) GetDBInstanceSkus() ([]SDBInstanceSku, error) {
skus := []SDBInstanceSku{}
q := self.GetDBInstanceSkuQuery()
@@ -1190,9 +1201,9 @@ func (self *SDBInstance) GetAvailableZoneIds() ([]string, error) {
func (self *SDBInstance) GetAvailableInstanceTypes() ([]cloudprovider.SInstanceType, error) {
instanceTypes := map[string]cloudprovider.SInstanceType{}
skus, err := self.GetDBInstanceSkus()
skus, err := self.GetAvailableDBInstanceSkus()
if err != nil {
return nil, errors.Wrap(err, "self.GetDBInstanceSkus")
return nil, errors.Wrap(err, "self.GetAvailableDBInstanceSkus")
}
for _, sku := range skus {