From e413012cbbabe9aea701237e4e86a051caa6b0fe Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 4 Aug 2016 11:48:30 -0400 Subject: [PATCH] Fixes #427: Prevent error when duplicate IPs are present in a prefix's IP list --- netbox/ipam/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index ce3c2a8f9..3ff0ff76e 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -66,10 +66,10 @@ def add_available_ipaddresses(prefix, ipaddress_list): # Iterate through existing IPs and annotate free ranges for ip in ipaddress_list: if prev_ip: - skipped_count = int(ip.address.ip - prev_ip.address.ip - 1) - if skipped_count: + diff = int(ip.address.ip - prev_ip.address.ip) + if diff > 1: first_skipped = '{}/{}'.format(prev_ip.address.ip + 1, prefix.prefixlen) - output.append((skipped_count, first_skipped)) + output.append((diff - 1, first_skipped)) output.append(ip) prev_ip = ip