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

Closes #1379: Allow searching devices by interface MAC address in global search

Browse Source
This commit is contained in:
Jeremy Stretch
2017-08-02 11:54:53 -04:00
parent fd6df8e52a
commit e50f234ba3
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/dcim/filters.py
View File

@ -1,6 +1,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import django_filters import django_filters
from netaddr import EUI
from netaddr.core import AddrFormatError from netaddr.core import AddrFormatError
from django.contrib.auth.models import User from django.contrib.auth.models import User
@ -447,20 +448,28 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
def search(self, queryset, name, value): def search(self, queryset, name, value):
if not value.strip(): if not value.strip():
return queryset return queryset
return queryset.filter( qs_filter = (
Q(name__icontains=value) | Q(name__icontains=value) |
Q(serial__icontains=value.strip()) | Q(serial__icontains=value.strip()) |
Q(inventory_items__serial__icontains=value.strip()) | Q(inventory_items__serial__icontains=value.strip()) |
Q(asset_tag=value.strip()) | Q(asset_tag=value.strip()) |
Q(comments__icontains=value) Q(comments__icontains=value)
).distinct() )
# If the query value looks like a MAC address, search interfaces as well.
try:
mac = EUI(value.strip())
qs_filter |= Q(interfaces__mac_address=mac)
except AddrFormatError:
pass
return queryset.filter(qs_filter).distinct()
def _mac_address(self, queryset, name, value): def _mac_address(self, queryset, name, value):
value = value.strip() value = value.strip()
if not value: if not value:
return queryset return queryset
try: try:
return queryset.filter(interfaces__mac_address=value).distinct() mac = EUI(value.strip())
return queryset.filter(interfaces__mac_address=mac).distinct()
except AddrFormatError: except AddrFormatError:
return queryset.none() return queryset.none()
@ -572,7 +581,8 @@ class InterfaceFilter(django_filters.FilterSet):
if not value: if not value:
return queryset return queryset
try: try:
return queryset.filter(mac_address=value) mac = EUI(value.strip())
return queryset.filter(mac_address=mac)
except AddrFormatError: except AddrFormatError:
return queryset.none() return queryset.none()