NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 04:02:52 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Cleaned up bulk IP provisioning a bit

Browse Source
This commit is contained in:
Jeremy Stretch 2017-11-15 13:52:14 -05:00
parent b5a51aced3
commit db0ef95fe3
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
if not request.user.has_perm('ipam.add_prefix'): if not request.user.has_perm('ipam.add_prefix'):
raise PermissionDenied() raise PermissionDenied()
# Normalize to a list of objects
requested_prefixes = request.data if isinstance(request.data, list) else [request.data] requested_prefixes = request.data if isinstance(request.data, list) else [request.data]
# Allocate prefixes to the requested objects based on availability within the parent # Allocate prefixes to the requested objects based on availability within the parent
@ -155,32 +156,30 @@ class PrefixViewSet(CustomFieldModelViewSet):
if not request.user.has_perm('ipam.add_ipaddress'): if not request.user.has_perm('ipam.add_ipaddress'):
raise PermissionDenied() raise PermissionDenied()
# Normalize to a list of objects
requested_ips = request.data if isinstance(request.data, list) else [request.data]
# Determine if the requested number of IPs is available # Determine if the requested number of IPs is available
requested_count = len(request.data) if isinstance(request.data, list) else 1
available_ips = list(prefix.get_available_ips()) available_ips = list(prefix.get_available_ips())
if len(available_ips) < requested_count: if len(available_ips) < len(requested_ips):
return Response( return Response(
{ {
"detail": "An insufficient number of IP addresses are available within the prefix {} ({} " "detail": "An insufficient number of IP addresses are available within the prefix {} ({} "
"requested, {} available)".format(prefix, requested_count, len(available_ips)) "requested, {} available)".format(prefix, len(requested_ips), len(available_ips))
}, },
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
) )
# Deserializing multiple IP addresses # Assign addresses from the list of available IPs and copy VRF assignment from the parent prefix
if isinstance(request.data, list): for requested_ip in requested_ips:
request_data = list(request.data) # Need a mutable copy requested_ip['address'] = available_ips.pop(0)
for obj in request_data: requested_ip['vrf'] = prefix.vrf.pk if prefix.vrf else None
obj['address'] = available_ips.pop(0)
obj['vrf'] = prefix.vrf.pk if prefix.vrf else None
serializer = serializers.WritableIPAddressSerializer(data=request_data, many=True)
# Deserializing a single IP address # Initialize the serializer with a list or a single object depending on what was requested
if isinstance(request.data, list):
serializer = serializers.WritableIPAddressSerializer(data=requested_ips, many=True)
else: else:
request_data = request.data.copy() # Need a mutable copy serializer = serializers.WritableIPAddressSerializer(data=requested_ips[0])
request_data['address'] = available_ips.pop(0)
request_data['vrf'] = prefix.vrf.pk if prefix.vrf else None
serializer = serializers.WritableIPAddressSerializer(data=request_data)
# Create the new IP address(es) # Create the new IP address(es)
if serializer.is_valid(): if serializer.is_valid():