Merge "Revert "Making IP protocol field required""
This commit is contained in:
@@ -126,9 +126,8 @@ class AddRule(forms.SelfHandlingForm):
|
||||
}))
|
||||
|
||||
ip_protocol = forms.IntegerField(
|
||||
label=_('IP Protocol'), required=True,
|
||||
help_text=_("Enter an integer value between -1 and 255 "
|
||||
"(-1 means wild card)."),
|
||||
label=_('IP Protocol'), required=False,
|
||||
help_text=_("Enter an integer value between 0 and 255."),
|
||||
validators=[utils_validators.validate_ip_protocol],
|
||||
widget=forms.TextInput(attrs={
|
||||
'class': 'switched',
|
||||
@@ -284,6 +283,10 @@ class AddRule(forms.SelfHandlingForm):
|
||||
|
||||
self.fields['direction'].choices = [('ingress', _('Ingress')),
|
||||
('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 = [
|
||||
('port', _('Port')),
|
||||
|
@@ -461,8 +461,7 @@ class SecurityGroupsViewTests(test.TestCase):
|
||||
'rule_menu': 'http',
|
||||
'port_or_range': 'port',
|
||||
'cidr': rule.ip_range['cidr'],
|
||||
'remote': 'cidr',
|
||||
'ip_protocol': 6}
|
||||
'remote': 'cidr'}
|
||||
res = self.client.post(self.edit_url, formData)
|
||||
self.assertRedirectsNoFollow(res, self.detail_url)
|
||||
|
||||
@@ -545,8 +544,7 @@ class SecurityGroupsViewTests(test.TestCase):
|
||||
'port_or_range': 'port',
|
||||
'cidr': '0.0.0.0/0',
|
||||
'security_group': sec_group.id,
|
||||
'remote': 'sg',
|
||||
'ip_protocol': 6}
|
||||
'remote': 'sg'}
|
||||
res = self.client.post(self.edit_url, formData)
|
||||
self.assertRedirectsNoFollow(res, self.detail_url)
|
||||
|
||||
@@ -933,8 +931,7 @@ class SecurityGroupsViewTests(test.TestCase):
|
||||
'port_or_range': 'range',
|
||||
'rule_menu': 'all_tcp',
|
||||
'cidr': rule.ip_range['cidr'],
|
||||
'remote': 'cidr',
|
||||
'ip_protocol': 6}
|
||||
'remote': 'cidr'}
|
||||
res = self.client.post(self.edit_url, formData)
|
||||
self.assertRedirectsNoFollow(res, self.detail_url)
|
||||
|
||||
|
Reference in New Issue
Block a user