Skip to content

Commit a99753f

Browse files
Merge pull request #7366 from shuichiro-makigaki/optimize-prefix-util
Fix #7365: Optimize calculation of prefix utilization
2 parents ad65e06 + d514290 commit a99753f

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

netbox/ipam/models/ip.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,9 @@ def get_utilization(self):
487487
utilization = int(float(child_prefixes.size) / self.prefix.size * 100)
488488
else:
489489
# Compile an IPSet to avoid counting duplicate IPs
490-
child_ips = netaddr.IPSet()
491-
for iprange in self.get_child_ranges():
492-
child_ips.add(iprange.range)
493-
for ip in self.get_child_ips():
494-
child_ips.add(ip.address.ip)
490+
child_ips = netaddr.IPSet(
491+
[_.range for _ in self.get_child_ranges()] + [_.address.ip for _ in self.get_child_ips()]
492+
)
495493

496494
prefix_size = self.prefix.size
497495
if self.prefix.version == 4 and self.prefix.prefixlen < 31 and not self.is_pool:

0 commit comments

Comments
 (0)