From 0f0698ea7ee830cce4dddde0a2e89884e70631f4 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sat, 26 Jan 2019 10:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E6=97=A7=E7=9A=84?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=B2=A1=E6=9C=89os=5Ftype=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/guests.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index eac688fa09..2d2c285ab3 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -1232,6 +1232,9 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token osName := self.GetOS() if len(osName) > 0 { extra.Add(jsonutils.NewString(osName), "os_name") + if len(self.OsType) == 0 { + extra.Add(jsonutils.NewString(osName), "os_type") + } } if metaData, err := self.GetAllMetadata(userCred); err == nil { extra.Add(jsonutils.Marshal(metaData), "metadata")