opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #757 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-sql-query to release/2.4.0

Browse Source 
* commit '8d5897419a5bb571ccc7464a3f49e267c2019cac':
  fix manger query not filter deleted items
This commit is contained in:
邱剑
2018-12-14 00:01:34 +08:00
parent 664daa15cb 8d5897419a
commit 6b834a930b
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/baremetalagents.go
+2 -2
View File
@@ -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)
}
pkg/compute/models/disks.go
+1 -1
View File
@@ -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 {
pkg/compute/models/hosts.go
+2 -2
View File
@@ -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)
}
pkg/compute/models/isolated_devices.go
+1 -1
View File
@@ -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
pkg/compute/models/netinterfaces.go
+1 -1
View File
@@ -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
}