NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-19 17:59:11 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Closes #946: Disregard mask length when filtering IP addresses by a parent prefix

Browse Source
This commit is contained in:
Jeremy Stretch 2017-03-08 11:59:24 -05:00
parent 4e766c7c3b
commit ed83b1d9e9
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/ipam/fields.py
View File

@ -6,7 +6,7 @@ from django.db import models
from .formfields import IPFormField from .formfields import IPFormField
from .lookups import ( from .lookups import (
EndsWith, IEndsWith, IRegex, IStartsWith, NetContained, NetContainedOrEqual, NetContains, NetContainsOrEquals, EndsWith, IEndsWith, IRegex, IStartsWith, NetContained, NetContainedOrEqual, NetContains, NetContainsOrEquals,
NetHost, NetMaskLength, Regex, StartsWith, NetHost, NetHostContained, NetMaskLength, Regex, StartsWith,
) )
@ -66,7 +66,6 @@ IPNetworkField.register_lookup(NetContained)
IPNetworkField.register_lookup(NetContainedOrEqual) IPNetworkField.register_lookup(NetContainedOrEqual)
IPNetworkField.register_lookup(NetContains) IPNetworkField.register_lookup(NetContains)
IPNetworkField.register_lookup(NetContainsOrEquals) IPNetworkField.register_lookup(NetContainsOrEquals)
IPNetworkField.register_lookup(NetHost)
IPNetworkField.register_lookup(NetMaskLength) IPNetworkField.register_lookup(NetMaskLength)
@ -91,4 +90,5 @@ IPAddressField.register_lookup(NetContainedOrEqual)
IPAddressField.register_lookup(NetContains) IPAddressField.register_lookup(NetContains)
IPAddressField.register_lookup(NetContainsOrEquals) IPAddressField.register_lookup(NetContainsOrEquals)
IPAddressField.register_lookup(NetHost) IPAddressField.register_lookup(NetHost)
IPAddressField.register_lookup(NetHostContained)
IPAddressField.register_lookup(NetMaskLength) IPAddressField.register_lookup(NetMaskLength)

2
netbox/ipam/filters.py
View File

@ -254,7 +254,7 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet):
return queryset return queryset
try: try:
query = str(IPNetwork(value.strip()).cidr) query = str(IPNetwork(value.strip()).cidr)
return queryset.filter(address__net_contained_or_equal=query) return queryset.filter(address__net_host_contained=query)
except AddrFormatError: except AddrFormatError:
return queryset.none() return queryset.none()

14
netbox/ipam/lookups.py
View File

@ -89,6 +89,20 @@ class NetHost(Lookup):
return 'HOST(%s) = %s' % (lhs, rhs), params return 'HOST(%s) = %s' % (lhs, rhs), params
class NetHostContained(Lookup):
"""
Check for the host portion of an IP address without regard to its mask. This allows us to find e.g. 192.0.2.1/24
when specifying a parent prefix of 192.0.2.0/26.
"""
lookup_name = 'net_host_contained'
def as_sql(self, qn, connection):
lhs, lhs_params = self.process_lhs(qn, connection)
rhs, rhs_params = self.process_rhs(qn, connection)
params = lhs_params + rhs_params
return 'CAST(HOST(%s) AS INET) << %s' % (lhs, rhs), params
class NetMaskLength(Transform): class NetMaskLength(Transform):
lookup_name = 'net_mask_length' lookup_name = 'net_mask_length'
function = 'MASKLEN' function = 'MASKLEN'

4
netbox/ipam/views.py
View File

@ -403,7 +403,7 @@ def prefix(request, pk):
aggregate = None aggregate = None
# Count child IP addresses # Count child IP addresses
ipaddress_count = IPAddress.objects.filter(vrf=prefix.vrf, address__net_contained_or_equal=str(prefix.prefix))\ ipaddress_count = IPAddress.objects.filter(vrf=prefix.vrf, address__net_host_contained=str(prefix.prefix))\
.count() .count()
# Parent prefixes table # Parent prefixes table
@ -499,7 +499,7 @@ def prefix_ipaddresses(request, pk):
prefix = get_object_or_404(Prefix.objects.all(), pk=pk) prefix = get_object_or_404(Prefix.objects.all(), pk=pk)
# Find all IPAddresses belonging to this Prefix # Find all IPAddresses belonging to this Prefix
ipaddresses = IPAddress.objects.filter(vrf=prefix.vrf, address__net_contained_or_equal=str(prefix.prefix))\ ipaddresses = IPAddress.objects.filter(vrf=prefix.vrf, address__net_host_contained=str(prefix.prefix))\
.select_related('vrf', 'interface__device', 'primary_ip4_for', 'primary_ip6_for') .select_related('vrf', 'interface__device', 'primary_ip4_for', 'primary_ip6_for')
ipaddresses = add_available_ipaddresses(prefix.prefix, ipaddresses, prefix.is_pool) ipaddresses = add_available_ipaddresses(prefix.prefix, ipaddresses, prefix.is_pool)