From 02a10173a77d585cd35bbab92a5c76628b803570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 10 Dec 2018 14:58:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=85=BE=E8=AE=AF=E4=BA=91?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/qcloud/instance.go | 3 +++ pkg/util/qcloud/zone.go | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/util/qcloud/instance.go b/pkg/util/qcloud/instance.go index 21f1a20f8b..4adf5a1c7a 100644 --- a/pkg/util/qcloud/instance.go +++ b/pkg/util/qcloud/instance.go @@ -147,6 +147,9 @@ func (self *SInstance) GetMetadata() *jsonutils.JSONDict { data.Add(jsonutils.NewString(self.image.OsName), "os_distribution") } + priceKey := fmt.Sprintf("%s::%s", self.host.zone.Zone, self.InstanceType) + data.Add(jsonutils.NewString(priceKey), "price_key") + secgroupIds := jsonutils.NewArray() for _, secgroupId := range self.SecurityGroupIds { data.Add(jsonutils.NewString(secgroupId), "secgroupId") diff --git a/pkg/util/qcloud/zone.go b/pkg/util/qcloud/zone.go index 316b9d1f23..6f3f2f9f7d 100644 --- a/pkg/util/qcloud/zone.go +++ b/pkg/util/qcloud/zone.go @@ -34,7 +34,6 @@ type SZone struct { refreshTime time.Time Zone string - ZoneId string ZoneName string ZoneState string }