Merge branch 'develop' into develop-2.4

This commit is contained in:
Jeremy Stretch
2018-07-18 17:51:57 -04:00
13 changed files with 37 additions and 49 deletions

View File

@@ -193,8 +193,9 @@ class PrefixViewSet(CustomFieldModelViewSet):
# Assign addresses from the list of available IPs and copy VRF assignment from the parent prefix
available_ips = iter(available_ips)
prefix_length = prefix.prefix.prefixlen
for requested_ip in requested_ips:
requested_ip['address'] = next(available_ips)
requested_ip['address'] = '{}/{}'.format(next(available_ips), prefix_length)
requested_ip['vrf'] = prefix.vrf.pk if prefix.vrf else None
# Initialize the serializer with a list or a single object depending on what was requested