mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #6894: Fix available IP generation for prefix assigned to a VRF

Browse Source
This commit is contained in:
jeremystretch
2021-08-05 13:23:14 -04:00
parent 79f726e6cd
commit 42b961229f
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.0.md
View File

@ -13,6 +13,7 @@
* [#6832](https://github.com/netbox-community/netbox/issues/6832) - Support config context rendering under GraphQL API * [#6832](https://github.com/netbox-community/netbox/issues/6832) - Support config context rendering under GraphQL API
* [#6846](https://github.com/netbox-community/netbox/issues/6846) - Form-driven REST API calls should use brief mode * [#6846](https://github.com/netbox-community/netbox/issues/6846) - Form-driven REST API calls should use brief mode
* [#6871](https://github.com/netbox-community/netbox/issues/6871) - Support dynamic tag types in GraphQL API * [#6871](https://github.com/netbox-community/netbox/issues/6871) - Support dynamic tag types in GraphQL API
* [#6894](https://github.com/netbox-community/netbox/issues/6894) - Fix available IP generation for prefix assigned to a VRF
--- ---

1
netbox/ipam/api/mixins.py
View File

@ -176,6 +176,7 @@ class AvailableIPsMixin:
serializer = serializers.AvailableIPSerializer(ip_list, many=True, context={ serializer = serializers.AvailableIPSerializer(ip_list, many=True, context={
'request': request, 'request': request,
'parent': parent, 'parent': parent,
'vrf': parent.vrf,
}) })
return Response(serializer.data) return Response(serializer.data)

2
netbox/ipam/api/serializers.py
View File

@ -331,7 +331,7 @@ class AvailableIPSerializer(serializers.Serializer):
return OrderedDict([ return OrderedDict([
('family', self.context['parent'].family), ('family', self.context['parent'].family),
('address', f"{instance}/{self.context['parent'].mask_length}"), ('address', f"{instance}/{self.context['parent'].mask_length}"),
('vrf', self.context['parent'].vrf), ('vrf', vrf),
]) ])

30
netbox/ipam/tests/test_api.py
View File

@ -216,9 +216,10 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
""" """
Test retrieval of all available prefixes within a parent prefix. Test retrieval of all available prefixes within a parent prefix.
""" """
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/24')) vrf = VRF.objects.create(name='VRF 1')
Prefix.objects.create(prefix=IPNetwork('192.0.2.64/26')) prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/24'), vrf=vrf)
Prefix.objects.create(prefix=IPNetwork('192.0.2.192/27')) Prefix.objects.create(prefix=IPNetwork('192.0.2.64/26'), vrf=vrf)
Prefix.objects.create(prefix=IPNetwork('192.0.2.192/27'), vrf=vrf)
url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk}) url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk})
self.add_permissions('ipam.view_prefix') self.add_permissions('ipam.view_prefix')
@ -232,7 +233,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
""" """
Test retrieval of the first available prefix within a parent prefix. Test retrieval of the first available prefix within a parent prefix.
""" """
vrf = VRF.objects.create(name='Test VRF 1', rd='1234') vrf = VRF.objects.create(name='VRF 1')
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/28'), vrf=vrf, is_pool=True) prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/28'), vrf=vrf, is_pool=True)
url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk}) url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk})
self.add_permissions('ipam.add_prefix') self.add_permissions('ipam.add_prefix')
@ -269,17 +270,18 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
""" """
Test the creation of available prefixes within a parent prefix. Test the creation of available prefixes within a parent prefix.
""" """
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/28'), is_pool=True) vrf = VRF.objects.create(name='VRF 1')
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/28'), vrf=vrf, is_pool=True)
url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk}) url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk})
self.add_permissions('ipam.view_prefix', 'ipam.add_prefix') self.add_permissions('ipam.view_prefix', 'ipam.add_prefix')
# Try to create five /30s (only four are available) # Try to create five /30s (only four are available)
data = [ data = [
{'prefix_length': 30, 'description': 'Test Prefix 1'}, {'prefix_length': 30, 'description': 'Prefix 1'},
{'prefix_length': 30, 'description': 'Test Prefix 2'}, {'prefix_length': 30, 'description': 'Prefix 2'},
{'prefix_length': 30, 'description': 'Test Prefix 3'}, {'prefix_length': 30, 'description': 'Prefix 3'},
{'prefix_length': 30, 'description': 'Test Prefix 4'}, {'prefix_length': 30, 'description': 'Prefix 4'},
{'prefix_length': 30, 'description': 'Test Prefix 5'}, {'prefix_length': 30, 'description': 'Prefix 5'},
] ]
response = self.client.post(url, data, format='json', **self.header) response = self.client.post(url, data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
@ -299,7 +301,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
""" """
Test retrieval of all available IP addresses within a parent prefix. Test retrieval of all available IP addresses within a parent prefix.
""" """
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), is_pool=True) vrf = VRF.objects.create(name='VRF 1')
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), vrf=vrf, is_pool=True)
url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk}) url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
self.add_permissions('ipam.view_prefix', 'ipam.view_ipaddress') self.add_permissions('ipam.view_prefix', 'ipam.view_ipaddress')
@ -318,7 +321,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
""" """
Test retrieval of the first available IP address within a parent prefix. Test retrieval of the first available IP address within a parent prefix.
""" """
vrf = VRF.objects.create(name='Test VRF 1', rd='1234') vrf = VRF.objects.create(name='VRF 1')
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/30'), vrf=vrf, is_pool=True) prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/30'), vrf=vrf, is_pool=True)
url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk}) url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
self.add_permissions('ipam.view_prefix', 'ipam.add_ipaddress') self.add_permissions('ipam.view_prefix', 'ipam.add_ipaddress')
@ -342,7 +345,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
""" """
Test the creation of available IP addresses within a parent prefix. Test the creation of available IP addresses within a parent prefix.
""" """
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), is_pool=True) vrf = VRF.objects.create(name='VRF 1')
prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), vrf=vrf, is_pool=True)
url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk}) url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
self.add_permissions('ipam.view_prefix', 'ipam.add_ipaddress') self.add_permissions('ipam.view_prefix', 'ipam.add_ipaddress')