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

#6455 - initial

Browse Source
This commit is contained in:
Your Name
2021-06-04 16:46:02 +02:00
parent 0783d57459
commit a665b79f85
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,16 +340,6 @@ class Prefix(PrimaryModel):
'prefix': "Cannot create prefix with /0 mask." 'prefix': "Cannot create prefix with /0 mask."
}) })
# Disallow host masks
if self.prefix.version == 4 and self.prefix.prefixlen == 32:
raise ValidationError({
'prefix': "Cannot create host addresses (/32) as prefixes. Create an IPv4 address instead."
})
elif self.prefix.version == 6 and self.prefix.prefixlen == 128:
raise ValidationError({
'prefix': "Cannot create host addresses (/128) as prefixes. Create an IPv6 address instead."
})
# Enforce unique IP space (if applicable) # Enforce unique IP space (if applicable)
if (self.vrf is None and settings.ENFORCE_GLOBAL_UNIQUE) or (self.vrf and self.vrf.enforce_unique): if (self.vrf is None and settings.ENFORCE_GLOBAL_UNIQUE) or (self.vrf and self.vrf.enforce_unique):
duplicate_prefixes = self.get_duplicates() duplicate_prefixes = self.get_duplicates()
@ -471,8 +461,8 @@ class Prefix(PrimaryModel):
child_ips = netaddr.IPSet([ip.address.ip for ip in self.get_child_ips()]) child_ips = netaddr.IPSet([ip.address.ip for ip in self.get_child_ips()])
available_ips = prefix - child_ips available_ips = prefix - child_ips
# IPv6, pool, or IPv4 /31 sets are fully usable # IPv6, pool, or IPv4 /31-/32 sets are fully usable
if self.family == 6 or self.is_pool or self.prefix.prefixlen == 31: if self.family == 6 or self.is_pool or (self.family == 4 and self.prefix.prefixlen >= 31):
return available_ips return available_ips
# For "normal" IPv4 prefixes, omit first and last addresses # For "normal" IPv4 prefixes, omit first and last addresses

2
netbox/ipam/views.py
View File

@ -522,7 +522,7 @@ class IPAddressView(generic.ObjectView):
# Parent prefixes table # Parent prefixes table
parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter( parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
vrf=instance.vrf, vrf=instance.vrf,
prefix__net_contains=str(instance.address.ip) prefix__net_contains_or_equals=str(instance.address.ip)
).prefetch_related( ).prefetch_related(
'site', 'role' 'site', 'role'
) )