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

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit 'f5c95dc358e33a5bbe20929f8638d8c078bfdd7a':
  regionv2 support vnc connect baremetal
This commit is contained in:
邱剑
2018-09-09 19:13:40 +08:00
parent bf28b32156 f5c95dc358
commit a2e07858c3
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+15
View File
@@ -1575,6 +1575,21 @@ func (self *SHost) GetExtraDetails(ctx context.Context, userCred mcclient.TokenC
return self.getMoreDetails(extra)
}
func (self *SHost) AllowGetDetailsVnc(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
return userCred.IsSystemAdmin()
}
func (self *SHost) GetDetailsVnc(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
if utils.IsInStringArray(self.Status, []string{BAREMETAL_READY, BAREMETAL_RUNNING}) {
retval := jsonutils.NewDict()
retval.Set("host_id", jsonutils.NewString(self.Id))
zone := self.GetZone()
retval.Set("zone", jsonutils.NewString(zone.GetName()))
return retval, nil
}
return jsonutils.NewDict(), nil
}
func (manager *SHostManager) GetHostsByManagerAndRegion(managerId string, regionId string) []SHost {
hosts := HostManager.Query().SubQuery()
zones := ZoneManager.Query().SubQuery()