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

#6934: Account for child IP ranges when calculating prefix utilization

Browse Source
This commit is contained in:
jeremystretch
2021-08-13 10:33:58 -04:00
parent e1fbe89b41
commit 5365c866ff
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/ipam/models/ip.py
View File

@@ -484,11 +484,16 @@ class Prefix(PrimaryModel):
utilization = int(float(child_prefixes.size) / self.prefix.size * 100)
else:
# Compile an IPSet to avoid counting duplicate IPs
child_count = netaddr.IPSet([ip.address.ip for ip in self.get_child_ips()]).size
child_ips = netaddr.IPSet()
for iprange in self.get_child_ranges():
child_ips.add(iprange.range)
for ip in self.get_child_ips():
child_ips.add(ip.address.ip)
prefix_size = self.prefix.size
if self.prefix.version == 4 and self.prefix.prefixlen < 31 and not self.is_pool:
prefix_size -= 2
utilization = int(float(child_count) / prefix_size * 100)
utilization = int(float(child_ips.size) / prefix_size * 100)
return min(utilization, 100)
@@ -603,6 +608,10 @@ class IPRange(PrimaryModel):
def family(self):
return self.start_address.version if self.start_address else None
@property
def range(self):
return netaddr.IPRange(self.start_address.ip, self.end_address.ip)
@property
def mask_length(self):
return self.start_address.prefixlen if self.start_address else None