From 965e0297a077795252ca53aecbe59a923105c531 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Mon, 23 Dec 2019 19:43:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20host=E6=94=AF=E6=8C=81=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/apis/compute/api.go | 2 +- pkg/cloudcommon/db/metadata.go | 1 + pkg/compute/models/guests.go | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/apis/compute/api.go b/pkg/apis/compute/api.go index e86b287f4c..fa644da27a 100644 --- a/pkg/apis/compute/api.go +++ b/pkg/apis/compute/api.go @@ -162,7 +162,7 @@ type ServerCreateInput struct { VmemSize int `json:"vmem_size"` VcpuCount int `json:"vcpu_count"` UserData string `json:"user_data"` - Metadata map[string]string `json:"metadata"` + Metadata map[string]string `json:"__meta__"` KeypairId string `json:"keypair_id"` Password string `json:"password"` diff --git a/pkg/cloudcommon/db/metadata.go b/pkg/cloudcommon/db/metadata.go index 936fa14c19..ab6c60f9a2 100644 --- a/pkg/cloudcommon/db/metadata.go +++ b/pkg/cloudcommon/db/metadata.go @@ -80,6 +80,7 @@ func init() { "eip": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "elasticips_tbl", "eip", "eips")}, "snapshot": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "snapshots_tbl", "snpashot", "snpashots")}, "dbinstance": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "dbinstances_tbl", "dbinstance", "dbinstances")}, + "host": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "hosts_tbl", "host", "hosts")}, } } diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index c124974a45..51f6bdbb0c 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -1520,11 +1520,6 @@ func (guest *SGuest) PostCreate(ctx context.Context, userCred mcclient.TokenCred gs.GuestId = guest.Id GuestsecgroupManager.TableSpec().Insert(&gs) } - if data.Contains("metadata") { - metadata := map[string]interface{}{} - data.Unmarshal(&metadata, "metadata") - guest.SetAllMetadata(ctx, metadata, userCred) - } } func (guest *SGuest) setApptags(ctx context.Context, appTags []string, userCred mcclient.TokenCredential) {