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

Automatic merge from release/2.3.0 -> release/2.4.0

Browse Source 
* commit '70e64329e93957a4772b468cfd7ad68c4ddf64e2':
  补充主机计费的shortdesc参数
This commit is contained in:
邱剑
2018-11-13 22:01:03 +08:00
parent c61a4c36c5 70e64329e9
commit 21097e9f96
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+14
View File
@@ -4019,6 +4019,20 @@ func (self *SGuest) GetShortDesc() *jsonutils.JSONDict {
desc := self.SStandaloneResourceBase.GetShortDesc()
desc.Set("mem", jsonutils.NewInt(int64(self.VmemSize)))
desc.Set("cpu", jsonutils.NewInt(int64(self.VcpuCount)))
address := jsonutils.NewString(strings.Join(self.getRealIPs(), ","))
desc.Set("ip_addr", address)
if len(self.OsType) > 0 {
desc.Add(jsonutils.NewString(self.OsType), "os_type")
}
if osDist := self.GetMetadata("os_distribution", nil); len(osDist) > 0 {
desc.Add(jsonutils.NewString(osDist), "os_distribution")
}
if osVer := self.GetMetadata("os_version", nil); len(osVer) > 0 {
desc.Add(jsonutils.NewString(osVer), "os_version")
}
templateId := self.GetTemplateId()
if len(templateId) > 0 {
desc.Set("cpu", jsonutils.NewString(templateId))