Merge pull request #891 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-detail to release/2.3.0

* commit 'e141a97b150706e21e0fd6ff6348972d719aa01e':
  磁盘详情显示虚机id
This commit is contained in:
邱剑
2019-01-05 17:08:44 +08:00
+3
View File
@@ -1172,11 +1172,14 @@ func (self *SDisk) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict
}
}
}
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")