openstack/horizon
Code Issues Proposed changes

Making IP protocol field required

Browse Source 
While adding rule to security group and choosing
"Other Protocol" field, we should make "IP Protocol"
 field mandatory to prevent getting error.

Change-Id: I56da00c6a000c019699edda12b405b6ddc389001
Closes-Bug: #2023362
This commit is contained in:
Dmitriy Chubinidze
2025-04-27 07:50:55 +00:00
parent c7e4095f95
commit 9445725a9e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstack_dashboard/dashboards/project/security_groups/forms.py
View File

@@ -126,8 +126,9 @@ class AddRule(forms.SelfHandlingForm):
})) }))
ip_protocol = forms.IntegerField( ip_protocol = forms.IntegerField(
label=_('IP Protocol'), required=False, label=_('IP Protocol'), required=True,
help_text=_("Enter an integer value between 0 and 255."), help_text=_("Enter an integer value between -1 and 255 "
"(-1 means wild card)."),
validators=[utils_validators.validate_ip_protocol], validators=[utils_validators.validate_ip_protocol],
widget=forms.TextInput(attrs={ widget=forms.TextInput(attrs={
'class': 'switched', 'class': 'switched',
@@ -283,10 +284,6 @@ class AddRule(forms.SelfHandlingForm):
self.fields['direction'].choices = [('ingress', _('Ingress')), self.fields['direction'].choices = [('ingress', _('Ingress')),
('egress', _('Egress'))] ('egress', _('Egress'))]
self.fields['ip_protocol'].help_text = _(
"Enter an integer value between -1 and 255 "
"(-1 means wild card)."
)
self.fields['port_or_range'].choices = [ self.fields['port_or_range'].choices = [
('port', _('Port')), ('port', _('Port')),

9
openstack_dashboard/dashboards/project/security_groups/tests.py
View File

@@ -461,7 +461,8 @@ class SecurityGroupsViewTests(test.TestCase):
'rule_menu': 'http', 'rule_menu': 'http',
'port_or_range': 'port', 'port_or_range': 'port',
'cidr': rule.ip_range['cidr'], 'cidr': rule.ip_range['cidr'],
'remote': 'cidr'} 'remote': 'cidr',
'ip_protocol': 6}
res = self.client.post(self.edit_url, formData) res = self.client.post(self.edit_url, formData)
self.assertRedirectsNoFollow(res, self.detail_url) self.assertRedirectsNoFollow(res, self.detail_url)
@@ -544,7 +545,8 @@ class SecurityGroupsViewTests(test.TestCase):
'port_or_range': 'port', 'port_or_range': 'port',
'cidr': '0.0.0.0/0', 'cidr': '0.0.0.0/0',
'security_group': sec_group.id, 'security_group': sec_group.id,
'remote': 'sg'} 'remote': 'sg',
'ip_protocol': 6}
res = self.client.post(self.edit_url, formData) res = self.client.post(self.edit_url, formData)
self.assertRedirectsNoFollow(res, self.detail_url) self.assertRedirectsNoFollow(res, self.detail_url)
@@ -931,7 +933,8 @@ class SecurityGroupsViewTests(test.TestCase):
'port_or_range': 'range', 'port_or_range': 'range',
'rule_menu': 'all_tcp', 'rule_menu': 'all_tcp',
'cidr': rule.ip_range['cidr'], 'cidr': rule.ip_range['cidr'],
'remote': 'cidr'} 'remote': 'cidr',
'ip_protocol': 6}
res = self.client.post(self.edit_url, formData) res = self.client.post(self.edit_url, formData)
self.assertRedirectsNoFollow(res, self.detail_url) self.assertRedirectsNoFollow(res, self.detail_url)