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

Fixes #3856: Allow filtering VM interfaces by multiple MAC addresses

Browse Source
This commit is contained in:
Jeremy Stretch
2020-01-07 10:31:44 -05:00
parent e7ee4486a5
commit 770f4c962c
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.6.md
View File

@ -9,6 +9,7 @@
* [#3589](https://github.com/netbox-community/netbox/issues/3589) - Fix validation on tagged VLANs of an interface * [#3589](https://github.com/netbox-community/netbox/issues/3589) - Fix validation on tagged VLANs of an interface
* [#3853](https://github.com/netbox-community/netbox/issues/3853) - Fix device role link on config context view * [#3853](https://github.com/netbox-community/netbox/issues/3853) - Fix device role link on config context view
* [#3856](https://github.com/netbox-community/netbox/issues/3856) - Allow filtering VM interfaces by multiple MAC addresses
--- ---

13
netbox/virtualization/filters.py
View File

@ -208,8 +208,7 @@ class InterfaceFilter(django_filters.FilterSet):
to_field_name='name', to_field_name='name',
label='Virtual machine', label='Virtual machine',
) )
mac_address = django_filters.CharFilter( mac_address = MultiValueMACAddressFilter(
method='_mac_address',
label='MAC address', label='MAC address',
) )
@ -217,16 +216,6 @@ class InterfaceFilter(django_filters.FilterSet):
model = Interface model = Interface
fields = ['id', 'name', 'enabled', 'mtu'] fields = ['id', 'name', 'enabled', 'mtu']
def _mac_address(self, queryset, name, value):
value = value.strip()
if not value:
return queryset
try:
mac = EUI(value.strip())
return queryset.filter(mac_address=mac)
except AddrFormatError:
return queryset.none()
def search(self, queryset, name, value): def search(self, queryset, name, value):
if not value.strip(): if not value.strip():
return queryset return queryset