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

lb acl cache add acl filter

Browse Source
This commit is contained in:
tangbin
2020-05-08 17:24:48 +08:00
parent 0c45818c5c
commit 4882a6bb2b
3 changed files with 228 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/cachedloadbalanceracl.go
+22
View File
@@ -28,4 +28,26 @@ type CachedLoadbalancerAclListInput struct {
apis.SharableVirtualResourceListInput
RegionalFilterListInput
ManagedResourceListInput
LoadbalancerAclFilterListInput
}
type LoadbalancerAclResourceInfo struct {
// 负载均衡ACL名称
Acl string `json:"acl"`
}
type LoadbalancerAclResourceInput struct {
// ACL名称或ID
Acl string `json:"acl"`
// swagger:ignore
// Deprecated
AclId string `json:"acl_id" "yunion:deprecated-by":"acl"`
}
type LoadbalancerAclFilterListInput struct {
LoadbalancerAclResourceInput
// 以ACL名称排序
OrderByAcl string `json:"order_by_acl"`
}
pkg/compute/models/loadbalanceraclresource.go
+184
View File
@@ -0,0 +1,184 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package models
import (
"context"
"database/sql"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/reflectutils"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/stringutils2"
)
type SLoadbalancerAclResourceBase struct {
// 本地Acl ID
AclId string `width:"128" charset:"ascii" nullable:"false" create:"required" index:"true" list:"user" json:"acl_id"`
}
type SLoadbalancerAclResourceBaseManager struct{}
func ValidateLoadbalancerAclResourceInput(userCred mcclient.TokenCredential, input api.LoadbalancerAclResourceInput) (*SLoadbalancerAcl, api.LoadbalancerAclResourceInput, error) {
lbaclObj, err := LoadbalancerAclManager.FetchByIdOrName(userCred, input.Acl)
if err != nil {
if errors.Cause(err) == sql.ErrNoRows {
return nil, input, errors.Wrapf(httperrors.ErrResourceNotFound, "%s %s", LoadbalancerAclManager.Keyword(), input.Acl)
} else {
return nil, input, errors.Wrap(err, "LoadbalancerAclManager.FetchByIdOrName")
}
}
input.Acl = lbaclObj.GetId()
return lbaclObj.(*SLoadbalancerAcl), input, nil
}
func (self *SLoadbalancerAclResourceBase) GetAcl() *SLoadbalancerAcl {
acl, err := LoadbalancerAclManager.FetchById(self.AclId)
if err != nil {
log.Errorf("failed to find acl %s error: %v", self.AclId, err)
return nil
}
return acl.(*SLoadbalancerAcl)
}
func (self *SLoadbalancerAclResourceBase) GetExtraDetails(
ctx context.Context,
userCred mcclient.TokenCredential,
query jsonutils.JSONObject,
isList bool,
) api.LoadbalancerAclResourceInfo {
return api.LoadbalancerAclResourceInfo{}
}
func (manager *SLoadbalancerAclResourceBaseManager) FetchCustomizeColumns(
ctx context.Context,
userCred mcclient.TokenCredential,
query jsonutils.JSONObject,
objs []interface{},
fields stringutils2.SSortedStrings,
isList bool,
) []api.LoadbalancerAclResourceInfo {
rows := make([]api.LoadbalancerAclResourceInfo, len(objs))
aclIds := make([]string, len(objs))
for i := range objs {
var base *SLoadbalancerAclResourceBase
err := reflectutils.FindAnonymouStructPointer(objs[i], &base)
if err != nil {
log.Errorf("Cannot find SCloudregionResourceBase in object %s", objs[i])
continue
}
aclIds[i] = base.AclId
}
acls := make(map[string]SLoadbalancerAcl)
err := db.FetchStandaloneObjectsByIds(LoadbalancerAclManager, aclIds, &acls)
if err != nil {
log.Errorf("FetchStandaloneObjectsByIds fail %s", err)
return rows
}
for i := range rows {
rows[i] = api.LoadbalancerAclResourceInfo{}
if acl, ok := acls[aclIds[i]]; ok {
rows[i].Acl = acl.Name
}
}
return rows
}
func (manager *SLoadbalancerAclResourceBaseManager) ListItemFilter(
ctx context.Context,
q *sqlchemy.SQuery,
userCred mcclient.TokenCredential,
query api.LoadbalancerAclFilterListInput,
) (*sqlchemy.SQuery, error) {
if len(query.Acl) > 0 {
aclObj, _, err := ValidateLoadbalancerAclResourceInput(userCred, query.LoadbalancerAclResourceInput)
if err != nil {
return nil, errors.Wrap(err, "ValidateLoadbalancerAclResourceInput")
}
q = q.Equals("acl_id", aclObj.GetId())
}
return q, nil
}
func (manager *SLoadbalancerAclResourceBaseManager) OrderByExtraFields(
ctx context.Context,
q *sqlchemy.SQuery,
userCred mcclient.TokenCredential,
query api.LoadbalancerAclFilterListInput,
) (*sqlchemy.SQuery, error) {
q, orders, fields := manager.GetOrderBySubQuery(q, userCred, query)
if len(orders) > 0 {
q = db.OrderByFields(q, orders, fields)
}
return q, nil
}
func (manager *SLoadbalancerAclResourceBaseManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
if field == "acl" {
aclQuery := LoadbalancerAclManager.Query("name", "id").Distinct().SubQuery()
q.AppendField(aclQuery.Field("name", field))
q = q.Join(aclQuery, sqlchemy.Equals(q.Field("acl_id"), aclQuery.Field("id")))
q.GroupBy(aclQuery.Field("name"))
return q, nil
}
return q, httperrors.ErrNotFound
}
func (manager *SLoadbalancerAclResourceBaseManager) GetOrderBySubQuery(
q *sqlchemy.SQuery,
userCred mcclient.TokenCredential,
query api.LoadbalancerAclFilterListInput,
) (*sqlchemy.SQuery, []string, []sqlchemy.IQueryField) {
aclQ := LoadbalancerAclManager.Query("id", "name")
var orders []string
var fields []sqlchemy.IQueryField
if db.NeedOrderQuery(manager.GetOrderByFields(query)) {
subq := aclQ.SubQuery()
q = q.LeftJoin(subq, sqlchemy.Equals(q.Field("acl_id"), subq.Field("id")))
orders = append(orders, query.OrderByAcl)
fields = append(fields, subq.Field("name"))
}
return q, orders, fields
}
func (manager *SLoadbalancerAclResourceBaseManager) GetOrderByFields(query api.LoadbalancerAclFilterListInput) []string {
return []string{query.OrderByAcl}
}
func (manager *SLoadbalancerAclResourceBaseManager) ListItemExportKeys(ctx context.Context,
q *sqlchemy.SQuery,
userCred mcclient.TokenCredential,
keys stringutils2.SSortedStrings,
) (*sqlchemy.SQuery, error) {
if keys.ContainsAny(manager.GetExportKeys()...) {
subq := LoadbalancerAclManager.Query("id", "name").SubQuery()
q = q.LeftJoin(subq, sqlchemy.Equals(q.Field("acl_id"), subq.Field("id")))
if keys.Contains("acl") {
q = q.AppendField(subq.Field("name", "acl"))
}
}
return q, nil
}
func (manager *SLoadbalancerAclResourceBaseManager) GetExportKeys() []string {
return []string{"acl"}
}
pkg/compute/models/loadbalancercachedacls.go
+22 -2
View File
@@ -42,6 +42,7 @@ type SCachedLoadbalancerAclManager struct {
db.SSharableVirtualResourceBaseManager
SManagedResourceBaseManager
SCloudregionResourceBaseManager
SLoadbalancerAclResourceBaseManager
}
var CachedLoadbalancerAclManager *SCachedLoadbalancerAclManager
@@ -64,8 +65,8 @@ type SCachedLoadbalancerAcl struct {
db.SExternalizedResourceBase
SManagedResourceBase
SCloudregionResourceBase
SLoadbalancerAclResourceBase
AclId string `width:"128" charset:"ascii" nullable:"false" index:"true" list:"user" create:"required"` // 本地ACL ID
ListenerId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"` // huawei only
}
@@ -567,6 +568,11 @@ func (manager *SCachedLoadbalancerAclManager) ListItemFilter(
return nil, errors.Wrap(err, "SCloudregionResourceBaseManager.ListItemFilter")
}
q, err = manager.SLoadbalancerAclResourceBaseManager.ListItemFilter(ctx, q, userCred, query.LoadbalancerAclFilterListInput)
if err != nil {
return nil, errors.Wrap(err, "SLoadbalancerAclResourceBaseManager.ListItemFilter")
}
return q, nil
}
@@ -590,6 +596,10 @@ func (manager *SCachedLoadbalancerAclManager) OrderByExtraFields(
if err != nil {
return nil, errors.Wrap(err, "SCloudregionResourceBaseManager.OrderByExtraFields")
}
q, err = manager.SLoadbalancerAclResourceBaseManager.OrderByExtraFields(ctx, q, userCred, query.LoadbalancerAclFilterListInput)
if err != nil {
return nil, errors.Wrap(err, "SLoadbalancerAclResourceBaseManager.OrderByExtraFields")
}
return q, nil
}
@@ -609,6 +619,10 @@ func (manager *SCachedLoadbalancerAclManager) QueryDistinctExtraField(q *sqlchem
if err == nil {
return q, nil
}
q, err = manager.SLoadbalancerAclResourceBaseManager.QueryDistinctExtraField(q, field)
if err == nil {
return q, nil
}
return q, httperrors.ErrNotFound
}
@@ -636,6 +650,12 @@ func (manager *SCachedLoadbalancerAclManager) ListItemExportKeys(ctx context.Con
return nil, errors.Wrap(err, "SCloudregionResourceBaseManager.ListItemExportKeys")
}
}
if keys.ContainsAny(manager.SLoadbalancerAclResourceBaseManager.GetExportKeys()...) {
q, err = manager.SLoadbalancerAclResourceBaseManager.ListItemExportKeys(ctx, q, userCred, keys)
if err != nil {
return nil, errors.Wrap(err, "SLoadbalancerAclResourceBaseManager.ListItemExportKeys")
}
}
return q, nil
}