From 8d5897419a5bb571ccc7464a3f49e267c2019cac Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Thu, 13 Dec 2018 21:15:53 +0800 Subject: [PATCH] fix manger query not filter deleted items --- pkg/compute/models/baremetalagents.go | 4 ++-- pkg/compute/models/disks.go | 2 +- pkg/compute/models/hosts.go | 4 ++-- pkg/compute/models/isolated_devices.go | 2 +- pkg/compute/models/netinterfaces.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/compute/models/baremetalagents.go b/pkg/compute/models/baremetalagents.go index 5a0bd97232..22fb923078 100644 --- a/pkg/compute/models/baremetalagents.go +++ b/pkg/compute/models/baremetalagents.go @@ -85,12 +85,12 @@ func (self *SBaremetalagent) ValidateUpdateData(ctx context.Context, userCred mc func (manager *SBaremetalagentManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerProjId string, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { mangerUri, _ := data.GetString("manager_uri") - count := manager.TableSpec().Query().Equals("manager_uri", mangerUri).Count() + count := manager.Query().Equals("manager_uri", mangerUri).Count() if count > 0 { return nil, httperrors.NewDuplicateResourceError("Duplicate manager_uri %s", mangerUri) } accessIp, _ := data.GetString("access_ip") - count = manager.TableSpec().Query().Equals("access_ip", accessIp).Count() + count = manager.Query().Equals("access_ip", accessIp).Count() if count > 0 { return nil, httperrors.NewDuplicateResourceError("Duplicate access_ip %s", accessIp) } diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index f3f5ff51b4..8c6582bfc1 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -537,7 +537,7 @@ func (self *SDisk) GetDetailsConvertSnapshot(ctx context.Context, userCred mccli // On disk reset, auto delete snapshots after the reset snapshot(reserve manualed snapshot) func (self *SDisk) CleanUpDiskSnapshots(ctx context.Context, userCred mcclient.TokenCredential, snapshot *SSnapshot) error { dest := make([]SSnapshot, 0) - query := SnapshotManager.TableSpec().Query() + query := SnapshotManager.Query() query.Filter(sqlchemy.Equals(query.Field("disk_id"), self.Id)). GT("created_at", snapshot.CreatedAt).Asc("created_at").All(&dest) if len(dest) == 0 { diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 03b657fcd7..ca82cb5e57 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -2258,14 +2258,14 @@ func (manager *SHostManager) ValidateCreateData(ctx context.Context, userCred mc } mangerUri, err := data.GetString("manager_uri") if err == nil { - count := manager.TableSpec().Query().Equals("manager_uri", mangerUri).Count() + count := manager.Query().Equals("manager_uri", mangerUri).Count() if count > 0 { return nil, httperrors.NewConflictError("Conflict manager_uri %s", mangerUri) } } accessIp, err := data.GetString("access_ip") if err == nil { - count := manager.TableSpec().Query().Equals("access_ip", accessIp).Count() + count := manager.Query().Equals("access_ip", accessIp).Count() if count > 0 { return nil, httperrors.NewDuplicateResourceError("Duplicate access_ip %s", accessIp) } diff --git a/pkg/compute/models/isolated_devices.go b/pkg/compute/models/isolated_devices.go index 6958cbc7b0..2db2d7d316 100644 --- a/pkg/compute/models/isolated_devices.go +++ b/pkg/compute/models/isolated_devices.go @@ -554,7 +554,7 @@ func (manager *SIsolatedDeviceManager) FindByHost(id string) []SIsolatedDevice { func (manager *SIsolatedDeviceManager) FindByHosts(ids []string) []SIsolatedDevice { dest := make([]SIsolatedDevice, 0) - err := manager.TableSpec().Query().In("host_id", ids).All(&dest) + err := manager.Query().In("host_id", ids).All(&dest) if err != nil { log.Errorln(err) return nil diff --git a/pkg/compute/models/netinterfaces.go b/pkg/compute/models/netinterfaces.go index 509137ee0a..a61edd6aea 100644 --- a/pkg/compute/models/netinterfaces.go +++ b/pkg/compute/models/netinterfaces.go @@ -50,7 +50,7 @@ func (manager *SNetInterfaceManager) FetchByMac(mac string) (*SNetInterface, err if err != nil { return nil, err } - err = manager.TableSpec().Query().Equals("mac", mac).First(netif) + err = manager.Query().Equals("mac", mac).First(netif) if err != nil { return nil, err }