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

Merge pull request #12095 from tb365/automated-cherry-pick-of-#12094-upstream-release-3.7

Browse Source 
Automated cherry pick of #12094: fix(region): lb list search address fix
This commit is contained in:
Zexi Li
2021-09-02 18:32:29 +08:00
committed by GitHub
parent 52dd82a46d 7416d71d7c
commit 39dd4b116e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancers.go
+6 -1
View File
@@ -190,11 +190,16 @@ func (man *SLoadbalancerManager) ListItemFilter(
return nil, err
}
if len(query.Address) > 0 {
if len(query.Address) == 1 {
c1 := sqlchemy.In(q.Field("id"), ElasticipManager.Query("associate_id").Contains("ip_addr", query.Address[0]))
c2 := sqlchemy.Contains(q.Field("address"), query.Address[0])
q = q.Filter(sqlchemy.OR(c1, c2))
} else if len(query.Address) > 1 {
c1 := sqlchemy.In(q.Field("id"), ElasticipManager.Query("associate_id").In("ip_addr", query.Address))
c2 := sqlchemy.In(q.Field("address"), query.Address)
q = q.Filter(sqlchemy.OR(c1, c2))
}
if len(query.AddressType) > 0 {
q = q.In("address_type", query.AddressType)
}