NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Tweaked API error reporting from #2181

Browse Source
This commit is contained in:
Jeremy Stretch 2018-06-29 15:18:30 -04:00
parent af54d96d30
commit 8008015082
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
netbox/ipam/api/views.py
View File

@ -101,20 +101,28 @@ class PrefixViewSet(CustomFieldModelViewSet):
for i, requested_prefix in enumerate(requested_prefixes): for i, requested_prefix in enumerate(requested_prefixes):
# Validate requested prefix size # Validate requested prefix size
error_msg = None
if 'prefix_length' not in requested_prefix: if 'prefix_length' not in requested_prefix:
raise ValidationError("Item {}: prefix_length field missing".format(i)) error_msg = "Item {}: prefix_length field missing".format(i)
elif not isinstance(requested_prefix['prefix_length'], int): elif not isinstance(requested_prefix['prefix_length'], int):
raise ValidationError("Item {}: Invalid prefix length ({})".format( error_msg = "Item {}: Invalid prefix length ({})".format(
i, requested_prefix['prefix_length'] i, requested_prefix['prefix_length']
)) )
elif prefix.family == 4 and requested_prefix['prefix_length'] > 32: elif prefix.family == 4 and requested_prefix['prefix_length'] > 32:
raise ValidationError("Item {}: Invalid prefix length ({}) for IPv4".format( error_msg = "Item {}: Invalid prefix length ({}) for IPv4".format(
i, requested_prefix['prefix_length'] i, requested_prefix['prefix_length']
)) )
elif prefix.family == 6 and requested_prefix['prefix_length'] > 128: elif prefix.family == 6 and requested_prefix['prefix_length'] > 128:
raise ValidationError("Item {}: Invalid prefix length ({}) for IPv6".format( error_msg = "Item {}: Invalid prefix length ({}) for IPv6".format(
i, requested_prefix['prefix_length'] i, requested_prefix['prefix_length']
)) )
if error_msg:
return Response(
{
"detail": error_msg
},
status=status.HTTP_400_BAD_REQUEST
)
# Find the first available prefix equal to or larger than the requested size # Find the first available prefix equal to or larger than the requested size
for available_prefix in available_prefixes.iter_cidrs(): for available_prefix in available_prefixes.iter_cidrs():