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 #1689: Disregard IP address mask when filtering for child IPs of a prefix

Browse Source
This commit is contained in:
Jeremy Stretch
2017-11-06 10:07:44 -05:00
parent 73cd76932a
commit d306e76420
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/ipam/views.py
View File

@ -459,9 +459,7 @@ class PrefixView(View):
aggregate = None
# Count child IP addresses
ipaddress_count = IPAddress.objects.filter(
vrf=prefix.vrf, address__net_host_contained=str(prefix.prefix)
).count()
ipaddress_count = prefix.get_child_ips().count()
# Parent prefixes table
parent_prefixes = Prefix.objects.filter(
@ -530,9 +528,7 @@ class PrefixIPAddressesView(View):
prefix = get_object_or_404(Prefix.objects.all(), pk=pk)
# Find all IPAddresses belonging to this Prefix
ipaddresses = IPAddress.objects.filter(
vrf=prefix.vrf, address__net_host_contained=str(prefix.prefix)
).select_related(
ipaddresses = prefix.get_child_ips().select_related(
'vrf', 'interface__device', 'primary_ip4_for', 'primary_ip6_for'
)
ipaddresses = add_available_ipaddresses(prefix.prefix, ipaddresses, prefix.is_pool)