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

9627 update validation

Browse Source
This commit is contained in:
Arthur Hanson 2024-06-21 14:35:41 -07:00
parent 226312631a
commit 1560fff2af
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/ipam/models/vlans.py
View File

@ -98,7 +98,13 @@ class VLANGroup(OrganizationalModel):
# Validate vlan ranges # Validate vlan ranges
if check_ranges_overlap(self.vlan_id_ranges): if check_ranges_overlap(self.vlan_id_ranges):
raise ValidationError(_("Ranges cannot overlap.")) raise ValidationError({'vlan_id_ranges': _("Ranges cannot overlap.")})
for ranges in self.vlan_id_ranges:
if ranges.lower >= ranges.upper:
raise ValidationError({
'vlan_id_ranges': _("Maximum child VID must be greater than or equal to minimum child VID Invalid range ({value})").format(value=ranges)
})
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
self._total_vlan_ids = 0 self._total_vlan_ids = 0

3
netbox/utilities/data.py
View File

@ -140,6 +140,9 @@ def ranges_to_string(ranges):
For example: For example:
[1-100, 200-300] => "1-100, 200-300" [1-100, 200-300] => "1-100, 200-300"
""" """
if not ranges:
return ""
return ', '.join([f"{val.lower}-{val.upper}" for val in ranges]) return ', '.join([f"{val.lower}-{val.upper}" for val in ranges])