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.5.0 -> release/2.6.0

Browse Source 
* commit 'e3ddd6a201e8d98d4718a5aa17f86c11bd7c719c':
  取消重复的region信息
  返回eip账号信息
This commit is contained in:
邱剑
2019-01-18 17:22:26 +08:00
parent b0a0ae12b8 e3ddd6a201
commit 7b0d548651
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticips.go
+2 -8
View File
@@ -737,18 +737,12 @@ func (self *SElasticip) GetCustomizeColumns(ctx context.Context, userCred mcclie
}
func (self *SElasticip) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict {
if cloudprovider := self.GetCloudprovider(); cloudprovider != nil {
extra.Add(jsonutils.NewString(cloudprovider.Provider), "provider")
}
info := self.getCloudProviderInfo()
extra.Update(jsonutils.Marshal(&info))
vm := self.GetAssociateVM()
if vm != nil {
extra.Add(jsonutils.NewString(vm.GetName()), "associate_name")
}
region := self.GetRegion()
if region != nil {
extra.Add(jsonutils.NewString(region.GetName()), "cloudregion")
extra.Add(jsonutils.NewString(region.GetName()), "region")
}
return extra
}