From bbe38254b93adbcf424e97cbcba8ca2cc3cdc465 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Mon, 6 Aug 2018 19:35:13 +0800 Subject: [PATCH] add region in server details --- pkg/cloudcommon/db/db_dispatcher.go | 12 ++++++------ pkg/compute/models/guests.go | 2 ++ pkg/compute/models/hosts.go | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go index 263908194b..ad5e5cbe17 100644 --- a/pkg/cloudcommon/db/db_dispatcher.go +++ b/pkg/cloudcommon/db/db_dispatcher.go @@ -9,18 +9,18 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/appsrv" "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/onecloud/pkg/httperrors" "github.com/yunionio/pkg/util/filterclause" - "github.com/yunionio/onecloud/pkg/util/httputils" "github.com/yunionio/pkg/utils" "github.com/yunionio/sqlchemy" + "github.com/yunionio/onecloud/pkg/appsrv" "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" + "github.com/yunionio/onecloud/pkg/mcclient/auth" + "github.com/yunionio/onecloud/pkg/mcclient/modules" + "github.com/yunionio/onecloud/pkg/util/httputils" ) type DBModelDispatcher struct { diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index eef94a6eed..89ecdf7638 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -896,6 +896,8 @@ 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") } return extra } diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index a20a462a72..32a4f66295 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -1440,6 +1440,8 @@ func (self *SHost) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict if zone != nil { extra.Add(jsonutils.NewString(zone.Id), "zone_id") extra.Add(jsonutils.NewString(zone.Name), "zone") + extra.Add(jsonutils.NewString(zone.GetRegion().GetName()), "region") + extra.Add(jsonutils.NewString(zone.GetRegion().GetId()), "region_id") } server := self.getBaremetalServer() if server != nil {