openstack
/
horizon
Code Issues Proposed changes

Check delay and timeout when editing monitor 

Validate delay and timeout when editing monitor, make sure delay
is greater than or equal to timeout. And add more detail in help
message for delay input.

Change-Id: I5dd16d385e85d282b5baba8b1bc0a6ed7d79ec26
Closes-bug: #1446997
This commit is contained in:
liyingjun 2015-04-22 17:23:37 +08:00
parent a6748c94fd
commit 13cd9c6c22
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openstack_dashboard/dashboards/project/loadbalancers/forms.py
View File

@ -224,12 +224,13 @@ class UpdateMonitor(forms.SelfHandlingForm):
min_value=1,
label=_("Delay"),
help_text=_("The minimum time in seconds between regular checks "
"of a member"))
"of a member. It must be greater than or equal to "
"timeout"))
timeout = forms.IntegerField(
min_value=1,
label=_("Timeout"),
help_text=_("The maximum time in seconds for a monitor to wait "
"for a reply"))
"for a reply. It must be less than or equal to delay"))
max_retries = forms.IntegerField(
max_value=10, min_value=1,
label=_("Max Retries (1~10)"),
@ -244,6 +245,15 @@ class UpdateMonitor(forms.SelfHandlingForm):
def __init__(self, request, *args, **kwargs):
super(UpdateMonitor, self).__init__(request, *args, **kwargs)
def clean(self):
cleaned_data = super(UpdateMonitor, self).clean()
delay = cleaned_data.get('delay')
timeout = cleaned_data.get('timeout')
if not delay >= timeout:
msg = _('Delay must be greater than or equal to timeout')
self._errors['delay'] = self.error_class([msg])
return cleaned_data
def handle(self, request, context):
context['admin_state_up'] = (context['admin_state_up'] == 'True')
try:

5
openstack_dashboard/dashboards/project/loadbalancers/workflows.py
View File

@ -496,12 +496,13 @@ class AddMonitorAction(workflows.Action):
min_value=1,
label=_("Delay"),
help_text=_("The minimum time in seconds between regular checks "
"of a member"))
"of a member. It must be greater than or equal to "
"timeout"))
timeout = forms.IntegerField(
min_value=1,
label=_("Timeout"),
help_text=_("The maximum time in seconds for a monitor to wait "
"for a reply"))
"for a reply. It must be less than or equal to delay"))
max_retries = forms.IntegerField(
max_value=10, min_value=1,
label=_("Max Retries (1~10)"),