opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/add-region-in-details to release/2.1.0

Browse Source 
* commit 'bbe38254b93adbcf424e97cbcba8ca2cc3cdc465':
  add region in server details
This commit is contained in:
李泽玺
2018-08-06 20:31:43 +08:00
parent d69b098b3b bbe38254b9
commit b40e94592f
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+6 -6
View File
@@ -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 {
pkg/compute/models/guests.go
+2
View File
@@ -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
}
pkg/compute/models/hosts.go
+2
View File
@@ -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 {