openstack/deb-horizon
Code Issues Proposed changes

Revert "Neutron: fix ICMP code and type validators"

Browse Source 
-1 as port and -1 as type were handled differently in horizon. The patch introduces more issues than it solves.

This reverts commit 0410c04fa2.

Change-Id: Ia41a6d54433c5f21c61ffc3e3af59ce10e1ae476
This commit is contained in:
Matthias Runge 2016-01-08 11:36:21 +00:00
parent 0410c04fa2
commit a4973bae7d
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
horizon/test/tests/utils.py
View File

@ -218,18 +218,6 @@ class ValidatorsTests(test.TestCase):
validators.validate_ip_protocol,
proto)
def test_icmp_code_type(self):
VALID_VALUE = (0, 255)
INVALID_VALUE = (-1, 256)
for value in VALID_VALUE:
self.assertIsNone(validators.validate_icmp(value))
for value in INVALID_VALUE:
self.assertRaises(ValidationError,
validators.validate_icmp,
value)
def test_port_range_validator(self):
VALID_RANGE = ('1:65535',
'1:1')

6
horizon/utils/validators.py
View File

@ -62,12 +62,6 @@ def validate_metadata(value):
if not len(keyval) == 2 or not keyval[0]:
raise ValidationError(error_msg)
def validate_icmp(code_or_type):
if code_or_type not in range(0, 256):
raise ValidationError(_("Not a valid ICMP code or type"))
# Same as POSIX [:print:]. Accordingly, diacritics are disallowed.
PRINT_REGEX = re.compile(r'^[\x20-\x7E]*$')

4
openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py
View File

@ -186,7 +186,7 @@ class AddRule(forms.SelfHandlingForm):
'data-switch-on': 'rule_menu',
'data-rule_menu-icmp': _('Type')}),
validators=[
utils_validators.validate_icmp])
utils_validators.validate_port_range])
icmp_code = forms.IntegerField(label=_("Code"),
required=False,
@ -197,7 +197,7 @@ class AddRule(forms.SelfHandlingForm):
'data-switch-on': 'rule_menu',
'data-rule_menu-icmp': _('Code')}),
validators=[
utils_validators.validate_icmp])
utils_validators.validate_port_range])
remote = forms.ChoiceField(label=_('Remote'),
choices=[('cidr', _('CIDR')),

4
openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py
View File

@ -500,7 +500,7 @@ class SecurityGroupsViewTests(test.TestCase):
'remote': 'cidr'}
res = self.client.post(self.edit_url, formData)
self.assertNoMessages()
self.assertContains(res, "Not a valid ICMP code or type")
self.assertContains(res, "The ICMP type not in range (-1, 255)")
formData = {'method': 'AddRule',
'id': sec_group.id,
@ -512,7 +512,7 @@ class SecurityGroupsViewTests(test.TestCase):
'remote': 'cidr'}
res = self.client.post(self.edit_url, formData)
self.assertNoMessages()
self.assertContains(res, "Not a valid ICMP code or type")
self.assertContains(res, "The ICMP code not in range (-1, 255)")
formData = {'method': 'AddRule',
'id': sec_group.id,