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

Merge pull request #12077 from tb365/bugfix/tb-bugfix-090101

Browse Source 
lb list api support search elastic ip
This commit is contained in:
Zexi Li
2021-09-01 15:16:35 +08:00
committed by GitHub
parent 54bceb9591 1934ea3edc
commit 576eb81e91
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancers.go
+3 -1
View File
@@ -191,7 +191,9 @@ func (man *SLoadbalancerManager) ListItemFilter(
}
if len(query.Address) > 0 {
q = q.In("address", query.Address)
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)