opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.4.0 -> release/2.5.0

Browse Source 
* commit '2e3164edecb959287f3e2ac5eb6d6beca53e5d74':
  磁盘详情显示虚机id
This commit is contained in:
邱剑
2019-01-05 17:37:45 +08:00
parent 41748899e1 2e3164edec
commit a3af439e9e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+3 -1
View File
@@ -1353,12 +1353,14 @@ func (self *SDisk) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict
info := storage.getCloudProviderInfo()
extra.Update(jsonutils.Marshal(&info))
}
guestArray := jsonutils.NewArray()
guests, guest_status := []string{}, []string{}
for _, guest := range self.GetGuests() {
guests = append(guests, guest.Name)
guest_status = append(guest_status, guest.Status)
guestArray.Add(jsonutils.Marshal(map[string]string{"name": guest.Name, "id": guest.Id, "status": guest.Status}))
}
extra.Add(guestArray, "guests")
extra.Add(jsonutils.NewString(strings.Join(guests, ",")), "guest")
extra.Add(jsonutils.NewInt(int64(len(guests))), "guest_count")
extra.Add(jsonutils.NewString(strings.Join(guest_status, ",")), "guest_status")