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

12278 remove validator

Browse Source
This commit is contained in:
Arthur 2023-04-21 08:43:28 -07:00
parent 7bdefbb264
commit 762d9bdbf6
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/ipam/api/field_serializers.py
View File

@ -2,7 +2,6 @@ from django.utils.translation import gettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from ipam import models from ipam import models
from ipam.validators import validate_ipaddress_with_mask
from netaddr import AddrFormatError, IPNetwork from netaddr import AddrFormatError, IPNetwork
__all__ = [ __all__ = [
@ -21,11 +20,6 @@ class IPAddressField(serializers.CharField):
'invalid': _('Enter a valid IPv4 or IPv6 address with optional mask.'), 'invalid': _('Enter a valid IPv4 or IPv6 address with optional mask.'),
} }
def __init__(self, **kwargs):
super().__init__(**kwargs)
validator = validate_ipaddress_with_mask
self.validators.append(validator)
def to_internal_value(self, data): def to_internal_value(self, data):
try: try:
return IPNetwork(data) return IPNetwork(data)

11
netbox/ipam/validators.py
View File

@ -1,6 +1,5 @@
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.validators import BaseValidator, RegexValidator from django.core.validators import BaseValidator, RegexValidator
from netaddr import AddrFormatError, IPNetwork
def prefix_validator(prefix): def prefix_validator(prefix):
@ -29,13 +28,3 @@ DNSValidator = RegexValidator(
message='Only alphanumeric characters, asterisks, hyphens, periods, and underscores are allowed in DNS names', message='Only alphanumeric characters, asterisks, hyphens, periods, and underscores are allowed in DNS names',
code='invalid' code='invalid'
) )
def validate_ipaddress_with_mask(address):
if address:
try:
IPNetwork(address)
except AddrFormatError:
raise ValidationError("Invalid IP address format: {}".format(address))
except (TypeError, ValueError) as e:
raise ValidationError(e)