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.6.0 -> release/2.7.0

Browse Source 
* commit 'a294f7b42d67342a7e7b9787b616892d65bf95dd':
  minor fix
This commit is contained in:
邱剑
2019-02-22 17:54:31 +08:00
parent 516d2566a0 a294f7b42d
commit 9bed859d32
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+5 -5
View File
@@ -1332,6 +1332,11 @@ func (self *SGuest) moreExtraInfo(extra *jsonutils.JSONDict) *jsonutils.JSONDict
extra.Add(self.getDisksInfoDetails(), "disks_info")
extra.Add(jsonutils.NewString(self.getIsolatedDeviceDetails()), "isolated_devices")
if len(self.BackupHostId) > 0 {
backupHost := HostManager.FetchHostById(self.BackupHostId)
extra.Set("backup_host_name", jsonutils.NewString(backupHost.Name))
}
host := self.GetHost()
if host != nil {
info := host.getCloudProviderInfo()
@@ -1400,11 +1405,6 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token
}
extra.Add(isGpu, "is_gpu")
if len(self.BackupHostId) > 0 {
backupHost := HostManager.FetchHostById(self.BackupHostId)
extra.Set("backup_host_name", jsonutils.NewString(backupHost.Name))
}
if self.IsPrepaidRecycle() {
extra.Add(jsonutils.JSONTrue, "is_prepaid_recycle")
} else {