fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2057 from swordqiu/hotfix/qj-server-list-add-is-prepaid-cycle-field

Browse Source 
fix: server-list add is_prepaid_recycle field
This commit is contained in:
yunion-ci-robot
2019-08-01 15:20:04 +08:00
committed by GitHub
parent 9e915526cb 6af55f9424
commit 0a56a316e4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/compute/models/guests.go
View File

@@ -1336,6 +1336,12 @@ func (self *SGuest) GetCustomizeColumns(ctx context.Context, userCred mcclient.T
func (self *SGuest) moreExtraInfo(extra *jsonutils.JSONDict, fields stringutils2.SSortedStrings) *jsonutils.JSONDict {
// extra.Add(jsonutils.NewInt(int64(self.getExtBandwidth())), "ext_bw")
if self.IsPrepaidRecycle() {
extra.Add(jsonutils.JSONTrue, "is_prepaid_recycle")
} else {
extra.Add(jsonutils.JSONFalse, "is_prepaid_recycle")
}
if len(self.BackupHostId) > 0 && (len(fields) == 0 || fields.Contains("backup_host_name") || fields.Contains("backup_host_status")) {
backupHost := HostManager.FetchHostById(self.BackupHostId)
if len(fields) == 0 || fields.Contains("backup_host_name") {
@@ -1417,12 +1423,6 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token
extra.Add(jsonutils.NewString(self.getAdminSecurityRules()), "admin_security_rules")
}
if self.IsPrepaidRecycle() {
extra.Add(jsonutils.JSONTrue, "is_prepaid_recycle")
} else {
extra.Add(jsonutils.JSONFalse, "is_prepaid_recycle")
}
return self.moreExtraInfo(extra, nil), nil
}