fix 3525

Author: kobayashi

netbox/ipam/fields.py

@@ -32,6 +32,8 @@ def to_python(self, value):
     def get_prep_value(self, value):
         if not value:
             return None
+        if isinstance(value, list):
+            return [str(self.to_python(v)).split('/')[0] for v in value]
         return str(self.to_python(value))
 
     def form_class(self):
@@ -90,5 +92,6 @@ def db_type(self, connection):
 IPAddressField.register_lookup(lookups.NetContains)
 IPAddressField.register_lookup(lookups.NetContainsOrEquals)
 IPAddressField.register_lookup(lookups.NetHost)
+IPAddressField.register_lookup(lookups.NetHostIn)
 IPAddressField.register_lookup(lookups.NetHostContained)
 IPAddressField.register_lookup(lookups.NetMaskLength)

netbox/ipam/filters.py

@@ -7,7 +7,7 @@
 from dcim.models import Device, Interface, Region, Site
 from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
 from tenancy.filtersets import TenancyFilterSet
-from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter
+from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter, MultiValueCharFilter
 from virtualization.models import VirtualMachine
 from .constants import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
@@ -271,7 +271,7 @@ class IPAddressFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt
         method='search_by_parent',
         label='Parent prefix',
     )
-    address = django_filters.CharFilter(
+    address = MultiValueCharFilter(
         method='filter_address',
         label='Address',
     )
@@ -358,13 +358,11 @@ def search_by_parent(self, queryset, name, value):
             return queryset.none()
 
     def filter_address(self, queryset, name, value):
-        if not value.strip():
-            return queryset
         try:
-            # Match address and subnet mask
-            if '/' in value:
-                return queryset.filter(address=value)
-            return queryset.filter(address__net_host=value)
+            return queryset.filter(
+                Q(address__in=value) |
+                Q(address__net_host_in=value)
+            )
         except ValidationError:
             return queryset.none()
 

netbox/ipam/lookups.py

@@ -100,6 +100,25 @@ def as_sql(self, qn, connection):
         return 'HOST(%s) = %s' % (lhs, rhs), params
 
 
+class NetHostIn(Lookup):
+    lookup_name = 'net_host_in'
+
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
+        in_elements = ['HOST(%s) IN (' % lhs]
+        params = []
+        for offset in range(0, len(rhs_params[0])):
+            if offset > 0:
+                in_elements.append(', ')
+            params.extend(lhs_params)
+            sqls_params = rhs_params[0][offset]
+            in_elements.append(rhs)
+            params.append(sqls_params)
+        in_elements.append(')')
+        return ''.join(in_elements), 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