opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit 'b59926c46cc37ba664e059f9d08235d2cc594aa8':
  fix: server list and details no is_gpu field
This commit is contained in:
李泽玺
2018-10-22 19:59:48 +08:00
parent dec5b9c1a9 b59926c46c
commit 1ec41ffcc9
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+17
View File
@@ -1018,6 +1018,12 @@ func (self *SGuest) GetCustomizeColumns(ctx context.Context, userCred mcclient.T
extra.Add(jsonutils.NewString(timeutils.FullIsoTime(pendingDeletedAt)), "auto_delete_at")
}
isGpu := jsonutils.JSONFalse
if self.isGpu() {
isGpu = jsonutils.JSONTrue
}
extra.Add(isGpu, "is_gpu")
return self.moreExtraInfo(extra)
}
@@ -1087,6 +1093,13 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token
extra.Add(jsonutils.NewString(eip.IpAddr), "eip")
extra.Add(jsonutils.NewString(eip.Mode), "eip_mode")
}
isGpu := jsonutils.JSONFalse
if self.isGpu() {
isGpu = jsonutils.JSONTrue
}
extra.Add(isGpu, "is_gpu")
return self.moreExtraInfo(extra)
}
@@ -1324,6 +1337,10 @@ func (self *SGuest) getAdminSecurityRules() string {
}
}
func (self *SGuest) isGpu() bool {
return len(self.GetIsolatedDevices()) != 0
}
func (self *SGuest) GetIsolatedDevices() []SIsolatedDevice {
return IsolatedDeviceManager.findAttachedDevicesOfGuest(self)
}