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

Merge pull request #858 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-get-extra-details-interface-change to release/2.5.0

Browse Source 
* commit '05b4aa815f2ce5b2686082e0ab6f97c027fcb621':
  修正：serverskus的GetExtraDetails接口更改
This commit is contained in:
邱剑
2018-12-29 17:26:11 +08:00
parent 9a507b9857 05b4aa815f
commit bb8d0b0a48
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus.go
+6 -3
View File
@@ -170,11 +170,14 @@ func (self *SServerSku) GetCustomizeColumns(ctx context.Context, userCred mcclie
return extra
}
func (self *SServerSku) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict {
extra := self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query)
func (self *SServerSku) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*jsonutils.JSONDict, error) {
extra, err := self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query)
if err != nil {
return nil, err
}
count := skuRelatedGuestCount(self)
extra.Add(jsonutils.NewInt(int64(count)), "total_guest_count")
return extra
return extra, nil
}
func (manager *SServerSkuManager) AllowCreateItem(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {