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

Merge pull request #8155 from tb365/automated-cherry-pick-of-#8154-upstream-release-3.2

Browse Source 
Automated cherry pick of #8154: aliyun public elb brand fix
This commit is contained in:
yunion-ci-robot
2020-09-29 18:18:34 +08:00
committed by GitHub
parent d4900cc6ac 1e7776ba71
commit 1e95a83db0
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/loadbalancer.go
+3
View File
@@ -202,6 +202,9 @@ type LoadbalancerResourceInfo struct {
ZoneId string `json:"zone_id"`
ZoneResourceInfoBase
// cloud provider info
ManagedResourceInfo
}
type LoadbalancerResourceInput struct {
pkg/compute/models/loadbalancerresource.go
+5
View File
@@ -167,23 +167,28 @@ func (manager *SLoadbalancerResourceBaseManager) FetchCustomizeColumns(
vpcList := make([]interface{}, len(rows))
zoneList := make([]interface{}, len(rows))
manList := make([]interface{}, len(rows))
for i := range rows {
rows[i] = api.LoadbalancerResourceInfo{}
if lb, ok := lbs[lbIds[i]]; ok {
rows[i].Loadbalancer = lb.Name
rows[i].VpcId = lb.VpcId
rows[i].ZoneId = lb.ZoneId
rows[i].ManagerId = lb.ManagerId
}
vpcList[i] = &SVpcResourceBase{rows[i].VpcId}
zoneList[i] = &SZoneResourceBase{rows[i].ZoneId}
manList[i] = &SManagedResourceBase{rows[i].ManagerId}
}
vpcRows := manager.SVpcResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, vpcList, fields, isList)
zoneRows := manager.SZoneResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, zoneList, fields, isList)
manRows := manager.SManagedResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, manList, fields, isList)
for i := range rows {
rows[i].VpcResourceInfo = vpcRows[i]
rows[i].ZoneResourceInfoBase = zoneRows[i].ZoneResourceInfoBase
rows[i].ManagedResourceInfo = manRows[i]
}
return rows
}