From e681012fd0d160f9d567887a12d3351de8f795b7 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 23 Aug 2018 18:22:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=9C=BA=E5=A2=9E=E5=8A=A0re?= =?UTF-8?q?gion=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/guests.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 7b91be0760..142cd8688f 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -910,6 +910,12 @@ func (self *SGuest) GetCustomizeColumns(ctx context.Context, userCred mcclient.T if zone != nil { extra.Add(jsonutils.NewString(zone.Id), "zone_id") extra.Add(jsonutils.NewString(zone.Name), "zone") + + region := zone.GetRegion() + if region != nil { + extra.Add(jsonutils.NewString(region.Id), "region_id") + extra.Add(jsonutils.NewString(region.Name), "region") + } } extra.Add(jsonutils.NewString(self.getSecgroupName()), "secgroup") @@ -951,6 +957,12 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token if zone != nil { extra.Add(jsonutils.NewString(zone.GetId()), "zone_id") extra.Add(jsonutils.NewString(zone.GetName()), "zone") + + region := zone.GetRegion() + if region != nil { + extra.Add(jsonutils.NewString(region.Id), "region_id") + extra.Add(jsonutils.NewString(region.Name), "region") + } } return extra }