From 36dda2a5b4ac268280c3e660d29666dcc6a68060 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Tue, 13 Nov 2018 18:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=BB=E6=9C=BA=E8=AE=A1?= =?UTF-8?q?=E8=B4=B9=E7=9A=84shortdesc=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/guests.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 0ba76b32c7..8569ff36fc 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -3777,6 +3777,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))