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

fix(region): vm list order by disk size

Browse Source
This commit is contained in:
Qu Xuan
2021-04-20 16:52:54 +08:00
parent 8154628011
commit f0fe752501
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/guests.go
+2 -2
View File
@@ -62,9 +62,9 @@ type ServerListInput struct {
// enum: linux,windows,vmware
OsType []string `json:"os_type"`
// 对列表结果按照磁盘进行排序
// 对列表结果按照磁盘大小进行排序
// enum: asc,desc
// OrderByDisk string `json:"order_by_disk"`
OrderByDisk string `json:"order_by_disk"`
// 根据ip查找机器
IpAddr string `json:"ip_addr"`
pkg/compute/models/guests.go
+14 -9
View File
@@ -590,15 +590,20 @@ func (manager *SGuestManager) OrderByExtraFields(ctx context.Context, q *sqlchem
return nil, errors.Wrap(err, "SNetworkResourceBaseManager.OrderByExtraFields")
}
}
//fields = manager.SDiskResourceBaseManager.GetOrderByFields(query.DiskFilterListInput)
//if db.NeedOrderQuery(fields) {
// diskQ := GuestdiskManager.Query("guest_id", "disk_id").SubQuery()
// q = q.LeftJoin(diskQ, sqlchemy.Equals(q.Field("id"), diskQ.Field("guest_id"))).Distinct()
// q, err = manager.SDiskResourceBaseManager.OrderByExtraFields(ctx, q, userCred, query.DiskFilterListInput)
// if err != nil {
// return nil, errors.Wrap(err, "SDiskResourceBaseManager.OrderByExtraFields")
// }
//}
if db.NeedOrderQuery([]string{query.OrderByDisk}) {
guestdisks := GuestdiskManager.Query().SubQuery()
disks := DiskManager.Query().SubQuery()
guestdiskQ := guestdisks.Query(
guestdisks.Field("guest_id"),
sqlchemy.SUM("disks_size", disks.Field("disk_size")),
)
guestdiskQ = guestdiskQ.LeftJoin(disks, sqlchemy.Equals(guestdiskQ.Field("disk_id"), disks.Field("id")))
guestdiskSQ := guestdiskQ.GroupBy(guestdiskQ.Field("guest_id")).SubQuery()
q = q.LeftJoin(guestdiskSQ, sqlchemy.Equals(q.Field("id"), guestdiskSQ.Field("guest_id")))
db.OrderByFields(q, []string{query.OrderByDisk}, []sqlchemy.IQueryField{guestdiskSQ.Field("disks_size")})
}
return q, nil
}