From 8a51fd02fec87593910746236162facd161797f8 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 18 Sep 2019 12:16:52 +0000 Subject: [PATCH] =?UTF-8?q?lblistener:=20=E6=94=B9=E6=AD=A3=E7=9B=91?= =?UTF-8?q?=E5=90=ACupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes e4ef23515f ("aws elb support") --- pkg/compute/models/loadbalancerlistenerrules.go | 3 ++- pkg/compute/models/loadbalancerlisteners.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/loadbalancerlistenerrules.go b/pkg/compute/models/loadbalancerlistenerrules.go index ae02f34fdd..bab9261419 100644 --- a/pkg/compute/models/loadbalancerlistenerrules.go +++ b/pkg/compute/models/loadbalancerlistenerrules.go @@ -467,7 +467,8 @@ func (lbr *SLoadbalancerListenerRule) AllowPerformStatus(ctx context.Context, us func (lbr *SLoadbalancerListenerRule) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { backendGroupV := validators.NewModelIdOrNameValidator("backend_group", "loadbalancerbackendgroup", lbr.GetOwnerId()) - if err := backendGroupV.Optional(true).Validate(data); err != nil { + backendGroupV.Optional(true) + if err := backendGroupV.Validate(data); err != nil { return nil, err } diff --git a/pkg/compute/models/loadbalancerlisteners.go b/pkg/compute/models/loadbalancerlisteners.go index a2b74a8c40..67118d1e9a 100644 --- a/pkg/compute/models/loadbalancerlisteners.go +++ b/pkg/compute/models/loadbalancerlisteners.go @@ -319,6 +319,7 @@ func (lblis *SLoadbalancerListener) StartLoadBalancerListenerSyncstatusTask(ctx func (lblis *SLoadbalancerListener) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { ownerId := lblis.GetOwnerId() backendGroupV := validators.NewModelIdOrNameValidator("backend_group", "loadbalancerbackendgroup", ownerId) + backendGroupV.Optional(true) if err := backendGroupV.Validate(data); err != nil { return nil, err }