From 6345086c5be9b85831457c5d655fe9e457781cc5 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Fri, 14 Feb 2020 20:38:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0host=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/apis/compute/host.go | 3 +++ pkg/compute/models/hosts.go | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/pkg/apis/compute/host.go b/pkg/apis/compute/host.go index 1a1eaced6b..b1f08aa656 100644 --- a/pkg/apis/compute/host.go +++ b/pkg/apis/compute/host.go @@ -120,4 +120,7 @@ type HostDetails struct { IsPrepaidRecycle bool `json:"is_prepaid_recycle"` CanPrepare bool `json:"can_prepare"` PrepareFailReason string `json:"prepare_fail_reason"` + + // 标签 + Metadata map[string]string `json:"metadata"` } diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index fd82609fb9..09f59c08bc 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -2434,6 +2434,10 @@ func (self *SHost) getMoreDetails(ctx context.Context, out api.HostDetails) api. return out } +func (self *SHost) GetMetadataHideKeys() []string { + return []string{} +} + func (self *SHost) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.HostDetails, error) { var err error out := api.HostDetails{} @@ -2441,6 +2445,10 @@ func (self *SHost) GetExtraDetails(ctx context.Context, userCred mcclient.TokenC if err != nil { return out, err } + out.Metadata, err = db.GetVisiableMetadata(self, nil) + if err != nil { + return out, err + } return self.getMoreDetails(ctx, out), nil }