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

fix(region): allocate server eip without hostwire restrict

Browse Source
This commit is contained in:
Qu Xuan
2021-07-12 11:52:03 +08:00
parent 89d86f6ac5
commit 04872867c3
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticips.go
+2 -5
View File
@@ -1298,15 +1298,12 @@ func (manager *SElasticipManager) NewEipForVMOnHost(ctx context.Context, userCre
if host != nil && host.ManagerId == "" { // kvm
hostq := HostManager.Query().SubQuery()
wireq := WireManager.Query().SubQuery()
hostwireq := HostwireManager.Query().SubQuery()
scope := policy.PolicyManager.AllowScope(userCred, consts.GetServiceType(), NetworkManager.KeywordPlural(), policy.PolicyActionList)
q := NetworkManager.Query()
q = NetworkManager.FilterByOwner(q, userCred, scope)
q = q.Join(wireq, sqlchemy.Equals(wireq.Field("id"), q.Field("wire_id")))
q = q.Join(hostwireq, sqlchemy.Equals(hostwireq.Field("wire_id"), wireq.Field("id")))
q = q.Join(hostq, sqlchemy.Equals(hostq.Field("id"), host.Id))
q = q.Join(wireq, sqlchemy.Equals(wireq.Field("id"), q.Field("wire_id"))).
Filter(sqlchemy.Equals(wireq.Field("zone_id"), host.ZoneId))
q = q.Equals("server_type", api.NETWORK_TYPE_EIP)
q = q.Equals("bgp_type", bgpType)
var nets []SNetwork