From 5aa478a52c43f49b9dd3503762692cfa076b0b79 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Mon, 22 Apr 2019 16:57:51 +0800 Subject: [PATCH] fix query networks not set model manager --- pkg/compute/models/networks.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index d8193eb493..c2e00a3932 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -1697,7 +1697,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 @@ -1716,7 +1716,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 @@ -1735,7 +1735,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 @@ -1754,7 +1754,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