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

Merge pull request #5868 from tb365/automated-cherry-pick-of-#5865-upstream-release-3.1

Browse Source 
Automated cherry pick of #5865: lblis & lbbg & lbr & lbb create add fetch owner id
This commit is contained in:
Zexi Li
2020-04-20 20:51:23 +08:00
committed by GitHub
parent cfafea78e7 f7b11621a7
commit 5a2d4737f3
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancerbackendgroups.go
+10
View File
@@ -102,6 +102,16 @@ func (man *SLoadbalancerBackendGroupManager) ListItemFilter(ctx context.Context,
return q, nil
}
func (man *SLoadbalancerBackendGroupManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) {
lbV := validators.NewModelIdOrNameValidator("loadbalancer", "loadbalancer", nil)
err := lbV.Validate(data.(*jsonutils.JSONDict))
if err != nil {
return nil, err
}
return lbV.Model.GetOwnerId(), nil
}
func (man *SLoadbalancerBackendGroupManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
lbV := validators.NewModelIdOrNameValidator("loadbalancer", "loadbalancer", ownerId)
err := lbV.Validate(data)
pkg/compute/models/loadbalancerbackends.go
+9
View File
@@ -146,6 +146,15 @@ func (man *SLoadbalancerBackendManager) ValidateBackendVpc(lb *SLoadbalancer, gu
return nil
}
func (man *SLoadbalancerBackendManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) {
backendGroupV := validators.NewModelIdOrNameValidator("backend_group", "loadbalancerbackendgroup", nil)
if err := backendGroupV.Validate(data.(*jsonutils.JSONDict)); err != nil {
return nil, err
}
return backendGroupV.Model.GetOwnerId(), nil
}
func (man *SLoadbalancerBackendManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
backendGroupV := validators.NewModelIdOrNameValidator("backend_group", "loadbalancerbackendgroup", ownerId)
if err := backendGroupV.Validate(data); err != nil {
pkg/compute/models/loadbalancerlistenerrules.go
+9
View File
@@ -397,6 +397,15 @@ func (man *SLoadbalancerListenerRuleManager) ListItemFilter(ctx context.Context,
return q, nil
}
func (man *SLoadbalancerListenerRuleManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) {
listenerV := validators.NewModelIdOrNameValidator("listener", "loadbalancerlistener", nil)
if err := listenerV.Validate(data.(*jsonutils.JSONDict)); err != nil {
return nil, err
}
return listenerV.Model.GetOwnerId(), nil
}
func (man *SLoadbalancerListenerRuleManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
input := apis.VirtualResourceCreateInput{}
err := data.Unmarshal(&input)
pkg/compute/models/loadbalancerlisteners.go
+9
View File
@@ -234,6 +234,15 @@ func (man *SLoadbalancerListenerManager) ListItemFilter(ctx context.Context, q *
return q, nil
}
func (man *SLoadbalancerListenerManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) {
lbV := validators.NewModelIdOrNameValidator("loadbalancer", "loadbalancer", nil)
if err := lbV.Validate(data.(*jsonutils.JSONDict)); err != nil {
return nil, err
}
return lbV.Model.GetOwnerId(), nil
}
func (man *SLoadbalancerListenerManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
lbV := validators.NewModelIdOrNameValidator("loadbalancer", "loadbalancer", ownerId)
if err := lbV.Validate(data); err != nil {