From 59d03a11c5835cb07eebc7509cb3a1d5f848c03b Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Sat, 14 Jan 2023 00:38:40 +0530 Subject: [PATCH 1/2] added l2vpn_termination on vlan filterset --- netbox/ipam/filtersets.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index d5d589dc6a5..5ab537152bf 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -852,10 +852,15 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): queryset=VirtualMachine.objects.all(), method='get_for_virtualmachine' ) + l2vpn_termination = django_filters.ModelMultipleChoiceFilter( + field_name='l2vpn_terminations', + queryset=L2VPNTermination.objects.all(), + label=_('L2VPN termination (ID)'), + ) class Meta: model = VLAN - fields = ['id', 'vid', 'name', 'description'] + fields = ['id', 'vid', 'name', 'description', 'l2vpn_termination'] def search(self, queryset, name, value): if not value.strip(): From 53d07977c3e3952e7697c17568c85fc211e2f19e Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Wed, 18 Jan 2023 21:03:56 +0530 Subject: [PATCH 2/2] added l2vpn to vlan filterset --- netbox/ipam/filtersets.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 5ab537152bf..ecbb84eab01 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -852,15 +852,15 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): queryset=VirtualMachine.objects.all(), method='get_for_virtualmachine' ) - l2vpn_termination = django_filters.ModelMultipleChoiceFilter( - field_name='l2vpn_terminations', - queryset=L2VPNTermination.objects.all(), - label=_('L2VPN termination (ID)'), + l2vpn = django_filters.ModelMultipleChoiceFilter( + field_name='l2vpn_terminations__l2vpn', + queryset=L2VPN.objects.all(), + label=_('L2VPN (ID)'), ) class Meta: model = VLAN - fields = ['id', 'vid', 'name', 'description', 'l2vpn_termination'] + fields = ['id', 'vid', 'name', 'description', 'l2vpn'] def search(self, queryset, name, value): if not value.strip():