openstack/horizon
Code Issues Proposed changes

Merge "Add Reject option to Firewall Rules"

Browse Source
This commit is contained in:
Jenkins 2015-11-23 13:29:57 +00:00 committed by Gerrit Code Review
commit b9e8dc1e30
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/project/firewalls/forms.py
View File

@ -42,7 +42,8 @@ class UpdateRule(forms.SelfHandlingForm):
help_text=_('Protocol for the firewall rule')) help_text=_('Protocol for the firewall rule'))
action = forms.ChoiceField( action = forms.ChoiceField(
label=_("Action"), required=False, label=_("Action"), required=False,
choices=[('ALLOW', _('ALLOW')), ('DENY', _('DENY'))], choices=[('ALLOW', _('ALLOW')), ('DENY', _('DENY')),
('REJECT', _('REJECT'))],
help_text=_('Action for the firewall rule')) help_text=_('Action for the firewall rule'))
source_ip_address = forms.IPField( source_ip_address = forms.IPField(
label=_("Source IP Address/Subnet"), label=_("Source IP Address/Subnet"),

1
openstack_dashboard/dashboards/project/firewalls/tables.py
View File

@ -286,6 +286,7 @@ class RulesTable(tables.DataTable):
ACTION_DISPLAY_CHOICES = ( ACTION_DISPLAY_CHOICES = (
("Allow", pgettext_lazy("Action Name of a Firewall Rule", u"ALLOW")), ("Allow", pgettext_lazy("Action Name of a Firewall Rule", u"ALLOW")),
("Deny", pgettext_lazy("Action Name of a Firewall Rule", u"DENY")), ("Deny", pgettext_lazy("Action Name of a Firewall Rule", u"DENY")),
("Reject", pgettext_lazy("Action Name of a Firewall Rule", u"REJECT")),
) )
name = tables.Column("name_or_id", name = tables.Column("name_or_id",
verbose_name=_("Name"), verbose_name=_("Name"),

3
openstack_dashboard/dashboards/project/firewalls/workflows.py
View File

@ -43,7 +43,8 @@ class AddRuleAction(workflows.Action):
action = forms.ChoiceField( action = forms.ChoiceField(
label=_("Action"), label=_("Action"),
choices=[('allow', _('ALLOW')), choices=[('allow', _('ALLOW')),
('deny', _('DENY'))],) ('deny', _('DENY')),
('reject', _('REJECT'))],)
source_ip_address = forms.IPField( source_ip_address = forms.IPField(
label=_("Source IP Address/Subnet"), label=_("Source IP Address/Subnet"),
version=forms.IPv4 | forms.IPv6, version=forms.IPv4 | forms.IPv6,