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

feature:

Browse Source 
- postpaid server support expire
- extend distinct tenant filed
- gpu batch perform action
This commit is contained in:
wanyaoqi
2019-10-10 12:04:22 +08:00
parent 7c2aca5ded
commit a59e171bf5
13 changed files with 205 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/secgroups.go
-13
View File
@@ -95,19 +95,6 @@ func (manager *SSecurityGroupManager) ListItemFilter(ctx context.Context, q *sql
return q, nil
}
func (manager *SSecurityGroupManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
switch field {
case "tenant":
tenantCacheQuery := db.TenantCacheManager.Query("name", "id").Distinct().SubQuery()
q.AppendField(tenantCacheQuery.Field("name", "tenant"))
q = q.Join(tenantCacheQuery, sqlchemy.Equals(q.Field("tenant_id"), tenantCacheQuery.Field("id")))
q.GroupBy(tenantCacheQuery.Field("name"))
default:
return nil, httperrors.NewBadRequestError("unsupport field %s", field)
}
return q, nil
}
func (manager *SSecurityGroupManager) OrderByExtraFields(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*sqlchemy.SQuery, error) {
q, err := manager.SVirtualResourceBaseManager.OrderByExtraFields(ctx, q, userCred, query)
if err != nil {