opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 23:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180823

Browse Source
This commit is contained in:
Qiu Jian
2018-08-23 18:39:09 +08:00
parent 4c07ae8a1e 6177f3bceb
commit 4e1c1cd253
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+12 -2
View File
@@ -931,6 +931,12 @@ func (self *SGuest) GetCustomizeColumns(ctx context.Context, userCred mcclient.T
if zone != nil {
extra.Add(jsonutils.NewString(zone.Id), "zone_id")
extra.Add(jsonutils.NewString(zone.Name), "zone")
region := zone.GetRegion()
if region != nil {
extra.Add(jsonutils.NewString(region.Id), "region_id")
extra.Add(jsonutils.NewString(region.Name), "region")
}
}
extra.Add(jsonutils.NewString(self.GetSecgroupName()), "secgroup")
@@ -973,8 +979,12 @@ 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")
region := zone.GetRegion()
if region != nil {
extra.Add(jsonutils.NewString(region.Id), "region_id")
extra.Add(jsonutils.NewString(region.Name), "region")
}
}
return extra
}