Merge pull request #11939 from ioito/hotfix/qx-lb-resource-count

fix(region): lb resource count
This commit is contained in:
Zexi Li
2021-08-18 20:47:14 +08:00
committed by GitHub
9 changed files with 45 additions and 0 deletions
@@ -61,6 +61,11 @@ type SAwsCachedLb struct {
CachedBackendGroupId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"`
}
func (manager *SAwsCachedLbManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (man *SAwsCachedLbManager) GetBackendsByLocalBackendId(backendId string) ([]SAwsCachedLb, error) {
loadbalancerBackends := []SAwsCachedLb{}
q := man.Query().Equals("backend_id", backendId)
@@ -72,6 +72,11 @@ type SCachedLoadbalancerAcl struct {
ListenerId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"` // huawei only
}
func (manager *SCachedLoadbalancerAclManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (lbacl *SCachedLoadbalancerAcl) AllowPerformStatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
return false
}
@@ -71,6 +71,11 @@ type SCachedLoadbalancerCertificate struct {
// CertificateId string `width:"128" charset:"ascii" nullable:"false" create:"required" index:"true" list:"user" json:"certificate_id"` // 本地证书ID
}
func (manager *SCachedLoadbalancerCertificateManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (self *SCachedLoadbalancerCertificate) AllowPerformStatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
return false
}
@@ -64,6 +64,11 @@ type SHuaweiCachedLb struct {
CachedBackendGroupId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"`
}
func (manager *SHuaweiCachedLbManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (man *SHuaweiCachedLbManager) GetBackendsByLocalBackendId(backendId string) ([]SHuaweiCachedLb, error) {
loadbalancerBackends := []SHuaweiCachedLb{}
q := man.Query().IsFalse("pending_deleted").Equals("backend_id", backendId)
@@ -66,6 +66,11 @@ type SHuaweiCachedLbbg struct {
ProtocolType string `width:"16" charset:"ascii" nullable:"false" list:"user" create:"required"` // 监听协议类型
}
func (manager *SHuaweiCachedLbbgManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (lbbg *SHuaweiCachedLbbg) GetLocalBackendGroup(ctx context.Context, userCred mcclient.TokenCredential) (*SLoadbalancerBackendGroup, error) {
if len(lbbg.BackendGroupId) == 0 {
return nil, fmt.Errorf("GetLocalBackendGroup no related local backendgroup")
@@ -60,6 +60,11 @@ type SOpenstackCachedLb struct {
CachedBackendGroupId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"`
}
func (manager *SOpenstackCachedLbManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (man *SOpenstackCachedLbManager) GetBackendsByLocalBackendId(backendId string) ([]SOpenstackCachedLb, error) {
loadbalancerBackends := []SOpenstackCachedLb{}
q := man.Query().IsFalse("pending_deleted").Equals("backend_id", backendId)
@@ -66,6 +66,11 @@ type SOpenstackCachedLbbg struct {
ProtocolType string `width:"16" charset:"ascii" nullable:"false" list:"user" create:"required"` // 监听协议类型
}
func (manager *SOpenstackCachedLbbgManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (lbbg *SOpenstackCachedLbbg) GetLocalBackendGroup(ctx context.Context, userCred mcclient.TokenCredential) (*SLoadbalancerBackendGroup, error) {
if len(lbbg.BackendGroupId) == 0 {
return nil, fmt.Errorf("GetLocalBackendGroup no related local backendgroup")
@@ -62,6 +62,11 @@ type SQcloudCachedLb struct {
CachedBackendGroupId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"`
}
func (manager *SQcloudCachedLbManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (lbb *SQcloudCachedLb) GetCustomizeColumns(context.Context, mcclient.TokenCredential, jsonutils.JSONObject) *jsonutils.JSONDict {
return nil
}
@@ -66,6 +66,11 @@ type SQcloudCachedLbbg struct {
AssociatedType string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"` // 关联类型, listener || rule
}
func (manager *SQcloudCachedLbbgManager) GetResourceCount() ([]db.SScopeResourceCount, error) {
virts := manager.Query().IsFalse("pending_deleted")
return db.CalculateResourceCount(virts, "tenant_id")
}
func (lbb *SQcloudCachedLbbg) GetCustomizeColumns(context.Context, mcclient.TokenCredential, jsonutils.JSONObject) *jsonutils.JSONDict {
return nil
}