From a06f7e7b509fe8c2617de1577759a75cdabe3d22 Mon Sep 17 00:00:00 2001 From: tangbin Date: Thu, 23 Apr 2020 16:00:37 +0800 Subject: [PATCH] aliyun create elb listener fix --- pkg/compute/regiondrivers/aliyun.go | 1 - pkg/compute/regiondrivers/aws.go | 4 ---- pkg/compute/regiondrivers/huawei.go | 2 -- pkg/compute/regiondrivers/managedvirtual.go | 7 +------ pkg/compute/regiondrivers/qcloud.go | 2 -- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pkg/compute/regiondrivers/aliyun.go b/pkg/compute/regiondrivers/aliyun.go index 8a7739103c..a66abbd10c 100644 --- a/pkg/compute/regiondrivers/aliyun.go +++ b/pkg/compute/regiondrivers/aliyun.go @@ -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) } diff --git a/pkg/compute/regiondrivers/aws.go b/pkg/compute/regiondrivers/aws.go index 109c78067b..78703627dc 100644 --- a/pkg/compute/regiondrivers/aws.go +++ b/pkg/compute/regiondrivers/aws.go @@ -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 } diff --git a/pkg/compute/regiondrivers/huawei.go b/pkg/compute/regiondrivers/huawei.go index 1797c2f1b0..4e976152c7 100644 --- a/pkg/compute/regiondrivers/huawei.go +++ b/pkg/compute/regiondrivers/huawei.go @@ -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) } diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index 9c65fb3c39..4b7db155dc 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -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) diff --git a/pkg/compute/regiondrivers/qcloud.go b/pkg/compute/regiondrivers/qcloud.go index 9a24eb15e6..86fc883811 100644 --- a/pkg/compute/regiondrivers/qcloud.go +++ b/pkg/compute/regiondrivers/qcloud.go @@ -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) }