NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-17 04:58:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes: #13722 - Correct range expansion code when a numeric set is used

Browse Source
This commit is contained in:
Daniel Sheppard 2024-02-28 11:41:36 -06:00
parent edb7d24b45
commit 017a66b5f9
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/utilities/forms/utils.py
View File

@ -60,7 +60,7 @@ def parse_alphanumeric_range(string):
return [] return []
except ValueError: except ValueError:
begin, end = dash_range, dash_range begin, end = dash_range, dash_range
if begin.isdigit() and end.isdigit(): if begin.isdigit() and end.isdigit() and not begin == end:
if int(begin) >= int(end): if int(begin) >= int(end):
raise forms.ValidationError(_('Range "{value}" is invalid.').format(value=dash_range)) raise forms.ValidationError(_('Range "{value}" is invalid.').format(value=dash_range))

11
netbox/utilities/tests/test_forms.py
View File

@ -191,7 +191,16 @@ class ExpandAlphanumeric(TestCase):
self.assertEqual(sorted(expand_alphanumeric_pattern(input)), output) self.assertEqual(sorted(expand_alphanumeric_pattern(input)), output)
def test_set(self): def test_set_numeric(self):
input = 'r[1,2]a'
output = sorted([
'r1a',
'r2a',
])
self.assertEqual(sorted(expand_alphanumeric_pattern(input)), output)
def test_set_alpha(self):
input = '[r,t]1a' input = '[r,t]1a'
output = sorted([ output = sorted([
'r1a', 'r1a',