diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 698764cdf1..072165c6bb 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -931,6 +931,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") @@ -973,8 +979,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") - extra.Add(jsonutils.NewString(zone.GetRegion().GetName()), "region") - extra.Add(jsonutils.NewString(zone.GetRegion().GetId()), "region_id") + + region := zone.GetRegion() + if region != nil { + extra.Add(jsonutils.NewString(region.Id), "region_id") + extra.Add(jsonutils.NewString(region.Name), "region") + } } return extra }