openstack/horizon
Code Issues Proposed changes

Ensure an error message in LBaaS is displayed once.

Browse Source 
Fixes bug 1160920

This commit also changes the following:
- Fixes wrong messages like 'Added Monitor "Add Monitor".'
  in AddMonitor and AddMember.
- Moves validation for cookie_name in handle() in AddVip class
  to clean() method.
- Improves an error message for member check in AddMember action
  and removes an unused member check in handle().
- Make LBaaS forms modal.
- Changes all lowercase and capitalized "vip" to "VIP".

Change-Id: I96f76d2f2177c0789ae4e939484f3965ba93d86c
This commit is contained in:
Akihiro MOTOKI 2013-03-27 23:04:46 +09:00
parent aedc25c717
commit 5ef26ff6b2
5 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,13 +31,13 @@ class AddPoolLink(tables.LinkAction):
name = "addpool"
verbose_name = _("Add Pool")
url = "horizon:project:loadbalancers:addpool"
classes = ("btn-addpool",)
classes = ("ajax-modal", "btn-addpool",)
class AddVipLink(tables.LinkAction):
name = "addvip"
verbose_name = _("Add Vip")
classes = ("btn-addvip",)
verbose_name = _("Add VIP")
classes = ("ajax-modal", "btn-addvip",)
def get_link_url(self, pool):
base_url = reverse("horizon:project:loadbalancers:addvip",
@ -54,22 +54,22 @@ class AddMemberLink(tables.LinkAction):
name = "addmember"
verbose_name = _("Add Member")
url = "horizon:project:loadbalancers:addmember"
classes = ("btn-addmember",)
classes = ("ajax-modal", "btn-addmember",)
class AddMonitorLink(tables.LinkAction):
name = "addmonitor"
verbose_name = _("Add Monitor")
url = "horizon:project:loadbalancers:addmonitor"
classes = ("btn-addmonitor",)
classes = ("ajax-modal", "btn-addmonitor",)
class DeleteVipLink(tables.DeleteAction):
name = "deletevip"
action_present = _("Delete")
action_past = _("Scheduled deletion of")
data_type_singular = _("Vip")
data_type_plural = _("Vips")
data_type_singular = _("VIP")
data_type_plural = _("VIPs")
def allowed(self, request, datum=None):
if datum and not datum.vip_id:

4
openstack_dashboard/dashboards/project/loadbalancers/tabs.py
View File

@ -103,7 +103,7 @@ class PoolDetailsTab(tabs.Tab):
class VipDetailsTab(tabs.Tab):
name = _("Vip Details")
name = _("VIP Details")
slug = "vipdetails"
template_name = "project/loadbalancers/_vip_details.html"
@ -114,7 +114,7 @@ class VipDetailsTab(tabs.Tab):
except:
vip = []
exceptions.handle(self.tab_group.request,
_('Unable to retrieve vip details.'))
_('Unable to retrieve VIP details.'))
return {'vip': vip}

4
openstack_dashboard/dashboards/project/loadbalancers/templates/loadbalancers/addvip.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Specify Vip" %}{% endblock %}
{% block title %}{% trans "Specify VIP" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Specify Vip") %}
{% include "horizon/common/_page_header.html" with title=_("Specify VIP") %}
{% endblock page_header %}
{% block main %}

6
openstack_dashboard/dashboards/project/loadbalancers/views.py
View File

@ -59,7 +59,7 @@ class IndexView(tabs.TabView):
api.lbaas.pool_delete(request, obj_id)
except:
exceptions.handle(request,
_('Must delete Vip first.'))
_('Must delete VIP first.'))
if m == 'member':
for obj_id in obj_ids:
try:
@ -73,13 +73,13 @@ class IndexView(tabs.TabView):
vip_id = api.lbaas.pool_get(request, obj_id).vip_id
except:
exceptions.handle(request,
_('Unable to locate vip to delete.'))
_('Unable to locate VIP to delete.'))
if vip_id is not None:
try:
api.lbaas.vip_delete(request, vip_id)
except:
exceptions.handle(request,
_('Unable to delete vip.'))
_('Unable to delete VIP.'))
return self.get(request, *args, **kwargs)

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

@ -97,8 +97,8 @@ class AddPool(workflows.Workflow):
slug = "addpool"
name = _("Add Pool")
finalize_button_name = _("Add")
success_message = _('Added Pool "%s".')
failure_message = _('Unable to add Pool "%s".')
success_message = _('Added pool "%s".')
failure_message = _('Unable to add pool "%s".')
success_url = "horizon:project:loadbalancers:index"
default_steps = (AddPoolStep,)
@ -111,8 +111,6 @@ class AddPool(workflows.Workflow):
pool = api.lbaas.pool_create(request, **context)
return True
except:
msg = self.format_status_message(self.failure_message)
exceptions.handle(request, msg)
return False
@ -122,7 +120,7 @@ class AddVipAction(workflows.Action):
initial="", required=False,
max_length=80, label=_("Description"))
floatip_address = forms.ChoiceField(
label=_("Vip Address from Floating IPs"),
label=_("VIP Address from Floating IPs"),
widget=forms.Select(attrs={'disabled': 'disabled'}),
required=False)
other_address = fields.IPField(required=False,
@ -144,7 +142,7 @@ class AddVipAction(workflows.Action):
connection_limit = forms.IntegerField(
min_value=-1, label=_("Connection Limit"),
help_text=_("Maximum number of connections allowed "
"for the vip or '-1' if the limit is not set"))
"for the VIP or '-1' if the limit is not set"))
admin_state_up = forms.BooleanField(
label=_("Admin State"), initial=True, required=False)
@ -169,14 +167,22 @@ class AddVipAction(workflows.Action):
floatip_address_choices = [('', _("Currently Not Supported"))]
self.fields['floatip_address'].choices = floatip_address_choices
def clean(self):
cleaned_data = super(AddVipAction, self).clean()
if (cleaned_data.get('session_persistence') == 'APP_COOKIE' and
not cleaned_data.get('cookie_name')):
msg = _('Cookie name is required for APP_COOKIE persistence.')
self._errors['cookie_name'] = self.error_class([msg])
return cleaned_data
class Meta:
name = _("AddVip")
permissions = ('openstack.services.network',)
help_text = _("Create a vip (virtual IP) for this pool. "
"Assign a name and description for the vip. "
"Specify an IP address and port for the vip. "
help_text = _("Create a VIP for this pool. "
"Assign a name and description for the VIP. "
"Specify an IP address and port for the VIP. "
"Choose the protocol and session persistence "
"method for the vip."
"method for the VIP."
"Specify the max connections allowed. "
"Admin State is UP (checked) by default.")
@ -196,10 +202,10 @@ class AddVipStep(workflows.Step):
class AddVip(workflows.Workflow):
slug = "addvip"
name = _("Add Vip")
name = _("Add VIP")
finalize_button_name = _("Add")
success_message = _('Added Vip "%s".')
failure_message = _('Unable to add Vip "%s".')
success_message = _('Added VIP "%s".')
failure_message = _('Unable to add VIP "%s".')
success_url = "horizon:project:loadbalancers:index"
default_steps = (AddVipStep,)
@ -212,8 +218,8 @@ class AddVip(workflows.Workflow):
context['address'] = context['floatip_address']
else:
if not context['floatip_address'] == '':
self.failure_message = _('Only one address can be specified.'
'Unable to add Vip %s.')
self.failure_message = _('Only one address can be specified. '
'Unable to add VIP "%s".')
return False
else:
context['address'] = context['other_address']
@ -222,21 +228,16 @@ class AddVip(workflows.Workflow):
context['subnet_id'] = pool['subnet_id']
except:
context['subnet_id'] = None
exceptions.handle(request,
_('Unable to retrieve pool.'))
self.failure_message = _('Unable to retrieve the specified pool. '
'Unable to add VIP "%s".')
return False
if context['session_persistence']:
stype = context['session_persistence']
if stype == 'APP_COOKIE':
if context['cookie_name'] == "":
self.failure_message = _('Cookie name must be specified '
'with APP_COOKIE persistence.')
return False
else:
cookie = context['cookie_name']
context['session_persistence'] = {'type': stype,
'cookie_name': cookie}
cookie = context['cookie_name']
context['session_persistence'] = {'type': stype,
'cookie_name': cookie}
else:
context['session_persistence'] = {'type': stype}
else:
@ -246,8 +247,6 @@ class AddVip(workflows.Workflow):
api.lbaas.vip_create(request, **context)
return True
except:
msg = self.format_status_message(self.failure_message)
exceptions.handle(request, msg)
return False
@ -258,6 +257,8 @@ class AddMemberAction(workflows.Action):
required=True,
initial=["default"],
widget=forms.CheckboxSelectMultiple(),
error_messages={'required':
_('At least one member must be specified')},
help_text=_("Select members for this pool "))
weight = forms.IntegerField(max_value=256, min_value=0, label=_("Weight"),
help_text=_("Relative part of requests this "
@ -335,25 +336,17 @@ class AddMember(workflows.Workflow):
slug = "addmember"
name = _("Add Member")
finalize_button_name = _("Add")
success_message = _('Added Member "%s".')
failure_message = _('Unable to add Member %s.')
success_message = _('Added member(s).')
failure_message = _('Unable to add member(s).')
success_url = "horizon:project:loadbalancers:index"
default_steps = (AddMemberStep,)
def handle(self, request, context):
if context['members'] == []:
self.failure_message = _('No instances available.%s')
context['member_id'] = ''
return False
for m in context['members']:
params = {'device_id': m}
try:
plist = api.quantum.port_list(request, **params)
except:
plist = []
exceptions.handle(request,
_('Unable to retrieve ports list.'))
return False
if plist:
context['address'] = plist[0].fixed_ips[0]['ip_address']
@ -361,7 +354,6 @@ class AddMember(workflows.Workflow):
context['member_id'] = api.lbaas.member_create(
request, **context).id
except:
exceptions.handle(request, _("Unable to add member."))
return False
return True
@ -496,8 +488,8 @@ class AddMonitor(workflows.Workflow):
slug = "addmonitor"
name = _("Add Monitor")
finalize_button_name = _("Add")
success_message = _('Added Monitor "%s".')
failure_message = _('Unable to add Monitor "%s".')
success_message = _('Added monitor')
failure_message = _('Unable to add monitor')
success_url = "horizon:project:loadbalancers:index"
default_steps = (AddMonitorStep,)
@ -507,5 +499,4 @@ class AddMonitor(workflows.Workflow):
request, **context).get('id')
return True
except:
exceptions.handle(request, _("Unable to add monitor."))
return False
return False