opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

loadbalanceragents: fix hb_timeout validation

Browse Source
This commit is contained in:
Yousong Zhou
2018-10-26 06:35:58 +00:00
parent d9821460f7
commit 953513c30c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalanceragents.go
+11 -1
View File
@@ -196,7 +196,7 @@ func (p *SLoadbalancerAgentParams) IsZero() bool {
func (man *SLoadbalancerAgentManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerProjId string, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
{
keyV := map[string]validators.IValidator{
"hb_timeout": validators.NewNonNegativeValidator("nb_timeout").Default(3600),
"hb_timeout": validators.NewNonNegativeValidator("hb_timeout").Default(3600),
"params": validators.NewStructValidator("params", &SLoadbalancerAgentParams{}),
}
for _, v := range keyV {
@@ -314,6 +314,16 @@ func (man *SLoadbalancerAgentManager) AllowCreateItem(ctx context.Context, userC
}
func (lbagent *SLoadbalancerAgent) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
{
keyV := map[string]validators.IValidator{
"hb_timeout": validators.NewNonNegativeValidator("hb_timeout").Optional(true),
}
for _, v := range keyV {
if err := v.Validate(data); err != nil {
return nil, err
}
}
}
keys := map[string]time.Time{
"loadbalancers": lbagent.Loadbalancers,
"loadbalancer_listeners": lbagent.LoadbalancerListeners,