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

fix: storage details missing capacity fields since 3.1

Browse Source
This commit is contained in:
Qiu Jian
2020-03-14 22:24:37 +08:00
parent bce6ad8e9a
commit e1ad22ec3a
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+9 -5
View File
@@ -1160,11 +1160,15 @@ func (cap *SStorageCapacity) Add(cap2 SStorageCapacity) {
cap.VCapacity += cap2.VCapacity
}
func (cap *SStorageCapacity) ToJson() *jsonutils.JSONDict {
ret := jsonutils.Marshal(cap).(*jsonutils.JSONDict)
ret.Add(jsonutils.NewFloat(cap.GetCommitRate()), "commit_rate")
ret.Add(jsonutils.NewInt(int64(cap.GetFree())), "free_capacity")
return ret
func (cap *SStorageCapacity) toCapacityInfo() api.SStorageCapacityInfo {
info := api.SStorageCapacityInfo{}
info.Capacity = cap.Capacity
info.UsedCapacity = cap.Used
info.WasteCapacity = cap.Wasted
info.VirtualCapacity = cap.VCapacity
info.CommitRate = cap.GetCommitRate()
info.FreeCapacity = cap.GetFree()
return info
}
func (self *SHost) GetAttachedLocalStorageCapacity() SStorageCapacity {
pkg/compute/models/storages.go
+1 -7
View File
@@ -410,13 +410,7 @@ func (self *SStorage) getStorageCapacity() SStorageCapacity {
func (self *SStorage) getMoreDetails(ctx context.Context, out api.StorageDetails) api.StorageDetails {
capa := self.getStorageCapacity()
out.Capacity = capa.Capacity
out.Used = capa.Used
out.Wasted = capa.Wasted
out.VCapacity = capa.VCapacity
out.CommitRate = capa.GetCommitRate()
out.FreeCapacity = capa.GetFree()
out.SStorageCapacityInfo = capa.toCapacityInfo()
out.CommitBound = self.GetOvercommitBound()
out.Schedtags = GetSchedtagsDetailsToResourceV2(self, ctx)