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 #10208 from rainzm/fix/wire_merge

Browse Source 
fix(region): pull the network correctly
This commit is contained in:
Zexi Li
2021-03-01 11:39:39 +08:00
committed by GitHub
parent 3eeabaa295 b3d876a6c7
commit c0438d45f1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+1 -1
View File
@@ -2352,7 +2352,7 @@ func (self *SNetwork) CheckInvalidToMerge(ctx context.Context, net *SNetwork, al
var wireNets []SNetwork
if allNets == nil {
q := NetworkManager.Query().Equals("wire_id", self.WireId).NotEquals("id", self.Id).NotEquals("id", net.Id)
err := db.FetchModelObjects(NetworkManager, q, &allNets)
err := db.FetchModelObjects(NetworkManager, q, &wireNets)
if err != nil && errors.Cause(err) != sql.ErrNoRows {
return "", "", errors.Wrap(err, "Query nets of same wire")
}