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

fix(compute): return InputParameterError while ValidateCreateData

Browse Source
This commit is contained in:
rainzm
2020-09-03 15:20:20 +08:00
parent 7a0eb06df9
commit f11a1df3a5
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/scaling_trigger.go
+6 -3
View File
@@ -171,10 +171,13 @@ func (st *SScalingTimer) ValidateCreateData(input api.ScalingPolicyCreateInput)
var err error
if input.TriggerType == api.TRIGGER_TIMING {
input.Timer, err = checkTimerCreateInput(input.Timer)
return input, err
} else {
input.CycleTimer, err = checkCycleTimerCreateInput(input.CycleTimer)
}
input.CycleTimer, err = checkCycleTimerCreateInput(input.CycleTimer)
return input, err
if err != nil {
return input, httperrors.NewInputParameterError(err.Error())
}
return input, nil
}
func (st *SScalingTimer) Register(ctx context.Context, userCred mcclient.TokenCredential) error {
pkg/compute/models/scheduled_tasks.go
+4 -1
View File
@@ -178,7 +178,10 @@ func (stm *SScheduledTaskManager) ValidateCreateData(ctx context.Context, userCr
} else {
input.CycleTimer, err = checkCycleTimerCreateInput(input.CycleTimer)
}
return input, err
if err != nil {
return input, httperrors.NewInputParameterError(err.Error())
}
return input, nil
}
var wdsCN = []string{"", "一", "二", "三", "四", "五", "六", "日"}