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

Automatic merge from release/2.5.0 -> release/2.6.0

Browse Source 
* commit 'a4a55be7fdd4ab52e69b2cab42f0ad22acf675ed':
  lb: 改正health_check_{domain,path}校验
This commit is contained in:
邱剑
2019-01-16 12:35:42 +08:00
parent e4b99b67f5 a4a55be7fd
commit 52483f2384
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancerlisteners.go
+4 -4
View File
@@ -239,8 +239,8 @@ func (man *SLoadbalancerListenerManager) ValidateCreateData(ctx context.Context,
"health_check": validators.NewStringChoicesValidator("health_check", LB_BOOL_VALUES).Default(LB_BOOL_ON),
"health_check_type": checkTypeV,
"health_check_domain": validators.NewDomainNameValidator("domain").AllowEmpty(true).Default(""),
"health_check_path": validators.NewURLPathValidator("path").Default(""),
"health_check_domain": validators.NewDomainNameValidator("health_check_domain").AllowEmpty(true).Default(""),
"health_check_path": validators.NewURLPathValidator("health_check_path").Default(""),
"health_check_http_code": validators.NewStringMultiChoicesValidator("health_check_http_code", LB_HEALTH_CHECK_HTTP_CODES).Sep(",").Default(LB_HEALTH_CHECK_HTTP_CODE_DEFAULT),
"health_check_rise": validators.NewRangeValidator("health_check_rise", 1, 1000).Default(3),
@@ -326,8 +326,8 @@ func (lblis *SLoadbalancerListener) ValidateUpdateData(ctx context.Context, user
"health_check": validators.NewStringChoicesValidator("health_check", LB_BOOL_VALUES),
"health_check_type": LoadbalancerListenerManager.checkTypeV(lblis.ListenerType),
"health_check_domain": validators.NewDomainNameValidator("domain").AllowEmpty(true),
"health_check_path": validators.NewURLPathValidator("path"),
"health_check_domain": validators.NewDomainNameValidator("health_check_domain").AllowEmpty(true),
"health_check_path": validators.NewURLPathValidator("health_check_path"),
"health_check_http_code": validators.NewStringMultiChoicesValidator("health_check_http_code", LB_HEALTH_CHECK_HTTP_CODES).Sep(","),
"health_check_rise": validators.NewRangeValidator("health_check_rise", 1, 1000),