NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #1643 from RyanBreaker/wildcard

Browse Source 
Implements #1586, add additional variants for ExpandableNameFields
This commit is contained in:
Jeremy Stretch 2018-03-22 11:40:54 -04:00 committed by GitHub
commit 720c5fabaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
netbox/utilities/forms.py
View File

@ -39,6 +39,7 @@ COLOR_CHOICES = (
('111111', 'Black'), ('111111', 'Black'),
) )
NUMERIC_EXPANSION_PATTERN = '\[((?:\d+[?:,-])+\d+)\]' NUMERIC_EXPANSION_PATTERN = '\[((?:\d+[?:,-])+\d+)\]'
ALPHANUMERIC_EXPANSION_PATTERN = '\[((?:[a-zA-Z0-9]+[?:,-])+[a-zA-Z0-9]+)\]'
IP4_EXPANSION_PATTERN = '\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]' IP4_EXPANSION_PATTERN = '\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]'
IP6_EXPANSION_PATTERN = '\[((?:[0-9a-f]{1,4}[?:,-])+[0-9a-f]{1,4})\]' IP6_EXPANSION_PATTERN = '\[((?:[0-9a-f]{1,4}[?:,-])+[0-9a-f]{1,4})\]'
@ -77,6 +78,45 @@ def expand_numeric_pattern(string):
yield "{}{}{}".format(lead, i, remnant) yield "{}{}{}".format(lead, i, remnant)
def parse_alphanumeric_range(string):
"""
Expand an alphanumeric range (continuous or not) into a list.
'a-d,f' => [a, b, c, d, f]
'0-3,a-d' => [0, 1, 2, 3, a, b, c, d]
"""
values = []
for dash_range in string.split(','):
try:
begin, end = dash_range.split('-')
vals = begin + end
# Break out of loop if there's an invalid pattern to return an error
if (not (vals.isdigit() or vals.isalpha())) or (vals.isalpha() and not (vals.isupper() or vals.islower())):
return []
except ValueError:
begin, end = dash_range, dash_range
if begin.isdigit() and end.isdigit():
for n in list(range(int(begin), int(end) + 1)):
values.append(n)
else:
for n in list(range(ord(begin), ord(end) + 1)):
values.append(chr(n))
return values
def expand_alphanumeric_pattern(string):
"""
Expand an alphabetic pattern into a list of strings.
"""
lead, pattern, remnant = re.split(ALPHANUMERIC_EXPANSION_PATTERN, string, maxsplit=1)
parsed_range = parse_alphanumeric_range(pattern)
for i in parsed_range:
if re.search(ALPHANUMERIC_EXPANSION_PATTERN, remnant):
for string in expand_alphanumeric_pattern(remnant):
yield "{}{}{}".format(lead, i, string)
else:
yield "{}{}{}".format(lead, i, remnant)
def expand_ipaddress_pattern(string, family): def expand_ipaddress_pattern(string, family):
""" """
Expand an IP address pattern into a list of strings. Examples: Expand an IP address pattern into a list of strings. Examples:
@ -306,12 +346,15 @@ class ExpandableNameField(forms.CharField):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(ExpandableNameField, self).__init__(*args, **kwargs) super(ExpandableNameField, self).__init__(*args, **kwargs)
if not self.help_text: if not self.help_text:
self.help_text = 'Numeric ranges are supported for bulk creation.<br />'\ self.help_text = 'Alphanumeric ranges are supported for bulk creation.<br />' \
'Example: <code>ge-0/0/[0-23,25,30]</code>' 'Mixed cases and types within a single range are not supported.<br />' \
'Examples:<ul><li><code>ge-0/0/[0-23,25,30]</code></li>' \
'<li><code>e[0-3][a-d,f]</code></li>' \
'<li><code>e[0-3,a-d,f]</code></li></ul>'
def to_python(self, value): def to_python(self, value):
if re.search(NUMERIC_EXPANSION_PATTERN, value): if re.search(ALPHANUMERIC_EXPANSION_PATTERN, value):
return list(expand_numeric_pattern(value)) return list(expand_alphanumeric_pattern(value))
return [value] return [value]