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

Merge pull request #5973 from tb365/bugfix/tb-bugfix-0423

Browse Source 
aliyun create elb listener fix
This commit is contained in:
yunion-ci-robot
2020-04-23 20:23:53 +08:00
committed by GitHub
parent 8cbae70a50 a06f7e7b50
commit 7ff622b740
5 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/regiondrivers/aliyun.go
-1
View File
@@ -618,7 +618,6 @@ func (self *SAliyunRegionDriver) ValidateCreateLoadbalancerListenerData(ctx cont
}
}
data.Set("cloudregion_id", jsonutils.NewString(cloudregion.GetId()))
return self.SManagedVirtualizationRegionDriver.ValidateCreateLoadbalancerListenerData(ctx, userCred, ownerId, data, lb, backendGroup)
}
pkg/compute/regiondrivers/aws.go
-4
View File
@@ -307,8 +307,6 @@ func (self *SAwsRegionDriver) validateCreateApplicationListenerData(ctx context.
}
data.Set("acl_status", jsonutils.NewString(api.LB_BOOL_OFF))
data.Set("manager_id", jsonutils.NewString(lb.GetCloudproviderId()))
data.Set("cloudregion_id", jsonutils.NewString(lb.GetRegionId()))
data.Set("scheduler", jsonutils.NewString(api.LB_SCHEDULER_RR)) // aws 不支持指定调度算法
return data, nil
}
@@ -378,8 +376,6 @@ func (self *SAwsRegionDriver) validateCreateNetworkListenerData(ctx context.Cont
data.Set("health_check_fall", jsonutils.NewInt(healthCheckRise))
data.Set("sticky_session", jsonutils.NewString(api.LB_BOOL_OFF))
data.Set("acl_status", jsonutils.NewString(api.LB_BOOL_OFF))
data.Set("manager_id", jsonutils.NewString(lb.GetCloudproviderId()))
data.Set("cloudregion_id", jsonutils.NewString(lb.GetRegionId()))
data.Set("scheduler", jsonutils.NewString(api.LB_SCHEDULER_RR)) // aws 不支持指定调度算法
return data, nil
}
pkg/compute/regiondrivers/huawei.go
-2
View File
@@ -369,8 +369,6 @@ func (self *SHuaWeiRegionDriver) ValidateCreateLoadbalancerListenerData(ctx cont
return nil, err
}
data.Set("manager_id", jsonutils.NewString(lb.GetCloudproviderId()))
data.Set("cloudregion_id", jsonutils.NewString(lb.GetRegionId()))
return self.SManagedVirtualizationRegionDriver.ValidateCreateLoadbalancerListenerData(ctx, userCred, ownerId, data, lb, backendGroup)
}
pkg/compute/regiondrivers/managedvirtual.go
+1 -6
View File
@@ -117,17 +117,12 @@ func (self *SManagedVirtualizationRegionDriver) ValidateUpdateLoadbalancerListen
}
func (self *SManagedVirtualizationRegionDriver) ValidateCreateLoadbalancerListenerData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, data *jsonutils.JSONDict, lb *models.SLoadbalancer, backendGroup db.IModel) (*jsonutils.JSONDict, error) {
_, err := self.ValidateManagerId(ctx, userCred, data)
if err != nil {
return nil, err
}
if aclStatus, _ := data.GetString("acl_status"); aclStatus == api.LB_BOOL_ON {
aclId, _ := data.GetString("acl_id")
if len(aclId) == 0 {
return nil, httperrors.NewMissingParameterError("acl")
}
_, err = models.LoadbalancerAclManager.FetchById(aclId)
_, err := models.LoadbalancerAclManager.FetchById(aclId)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError("failed to find acl %s", aclId)
pkg/compute/regiondrivers/qcloud.go
-2
View File
@@ -207,8 +207,6 @@ func (self *SQcloudRegionDriver) ValidateCreateLoadbalancerListenerData(ctx cont
}
data.Set("acl_status", jsonutils.NewString(api.LB_BOOL_OFF))
data.Set("manager_id", jsonutils.NewString(lb.GetCloudproviderId()))
data.Set("cloudregion_id", jsonutils.NewString(lb.GetRegionId()))
return self.SManagedVirtualizationRegionDriver.ValidateCreateLoadbalancerListenerData(ctx, userCred, ownerId, data, lb, backendGroup)
}