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 #538 from wanyaoqi/bugfix/wyq/fix-network-split-and-merge

Browse Source 
bugfix: fix query networks not set model manager
This commit is contained in:
yunion-ci-robot
2019-04-23 14:10:12 +08:00
committed by GitHub
parent 9e35d532dd 5aa478a52c
commit 8186cadfdc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+5 -4
View File
@@ -1740,7 +1740,7 @@ func (self *SNetwork) PerformSplit(ctx context.Context, userCred mcclient.TokenC
})
guestnetworks := make([]SGuestnetwork, 0)
err = GuestnetworkManager.Query().Equals("network_id", self.Id).All(&guestnetworks)
err = db.FetchModelObjects(GuestnetworkManager, GuestnetworkManager.Query().Equals("network_id", self.Id), &guestnetworks)
if err != nil {
logclient.AddActionLogWithContext(ctx, self, logclient.ACT_SPLIT, err.Error(), userCred, false)
return nil, err
@@ -1759,7 +1759,7 @@ func (self *SNetwork) PerformSplit(ctx context.Context, userCred mcclient.TokenC
}
hostnetworks := make([]SHostnetwork, 0)
err = HostnetworkManager.Query().Equals("network_id", self.Id).All(&hostnetworks)
err = db.FetchModelObjects(HostnetworkManager, HostnetworkManager.Query().Equals("network_id", self.Id), &hostnetworks)
if err != nil {
logclient.AddActionLogWithContext(ctx, self, logclient.ACT_SPLIT, err.Error(), userCred, false)
return nil, err
@@ -1778,7 +1778,7 @@ func (self *SNetwork) PerformSplit(ctx context.Context, userCred mcclient.TokenC
}
reservedips := make([]SReservedip, 0)
err = ReservedipManager.Query().Equals("network_id", self.Id).All(&reservedips)
err = db.FetchModelObjects(ReservedipManager, ReservedipManager.Query().Equals("network_id", self.Id), &reservedips)
if err != nil {
logclient.AddActionLogWithContext(ctx, self, logclient.ACT_SPLIT, err.Error(), userCred, false)
return nil, err
@@ -1797,7 +1797,8 @@ func (self *SNetwork) PerformSplit(ctx context.Context, userCred mcclient.TokenC
}
groupnetworks := make([]SGroupnetwork, 0)
err = GroupnetworkManager.Query().Equals("network_id", self.Id).All(&groupnetworks)
err = db.FetchModelObjects(
GroupnetworkManager, GroupnetworkManager.Query().Equals("network_id", self.Id), &groupnetworks)
if err != nil {
logclient.AddActionLogWithContext(ctx, self, logclient.ACT_SPLIT, err.Error(), userCred, false)
return nil, err