Merge branch 'main' into feature

netbox/vpn/tables/l2vpn.py

@@ -2,7 +2,7 @@ import django_tables2 as tables
 from django.utils.translation import gettext_lazy as _
 
 from netbox.tables import NetBoxTable, PrimaryModelTable, columns
-from tenancy.tables import TenancyColumnsMixin
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from vpn.models import L2VPN, L2VPNTermination
 
 __all__ = (
@@ -17,7 +17,7 @@ L2VPN_TARGETS = """
 """
 
 
-class L2VPNTable(TenancyColumnsMixin, PrimaryModelTable):
+class L2VPNTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModelTable):
     pk = columns.ToggleColumn()
     name = tables.Column(
         verbose_name=_('Name'),
@@ -44,7 +44,7 @@ class L2VPNTable(TenancyColumnsMixin, PrimaryModelTable):
         model = L2VPN
         fields = (
             'pk', 'name', 'slug', 'status', 'identifier', 'type', 'import_targets', 'export_targets', 'tenant',
-            'tenant_group', 'description', 'comments', 'tags', 'created', 'last_updated',
+            'tenant_group', 'description', 'contacts', 'comments', 'tags', 'created', 'last_updated',
         )
         default_columns = ('pk', 'name', 'status', 'identifier', 'type', 'description')
 

netbox/vpn/tables/tunnels.py

@@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _
 from django_tables2.utils import Accessor
 
 from netbox.tables import NetBoxTable, OrganizationalModelTable, PrimaryModelTable, columns
-from tenancy.tables import TenancyColumnsMixin
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from vpn.models import *
 
 __all__ = (
@@ -13,7 +13,7 @@ __all__ = (
 )
 
 
-class TunnelGroupTable(OrganizationalModelTable):
+class TunnelGroupTable(ContactsColumnMixin, OrganizationalModelTable):
     name = tables.Column(
         verbose_name=_('Name'),
         linkify=True
@@ -30,12 +30,13 @@ class TunnelGroupTable(OrganizationalModelTable):
     class Meta(OrganizationalModelTable.Meta):
         model = TunnelGroup
         fields = (
-            'pk', 'id', 'name', 'tunnel_count', 'description', 'slug', 'tags', 'actions', 'created', 'last_updated',
+            'pk', 'id', 'name', 'tunnel_count', 'description', 'slug', 'contacts', 'tags', 'actions', 'created',
+            'last_updated',
         )
         default_columns = ('pk', 'name', 'tunnel_count', 'description')
 
 
-class TunnelTable(TenancyColumnsMixin, PrimaryModelTable):
+class TunnelTable(TenancyColumnsMixin, ContactsColumnMixin, PrimaryModelTable):
     name = tables.Column(
         verbose_name=_('Name'),
         linkify=True
@@ -65,7 +66,8 @@ class TunnelTable(TenancyColumnsMixin, PrimaryModelTable):
         model = Tunnel
         fields = (
             'pk', 'id', 'name', 'group', 'status', 'encapsulation', 'ipsec_profile', 'tenant', 'tenant_group',
-            'tunnel_id', 'termination_count', 'description', 'comments', 'tags', 'created', 'last_updated',
+            'tunnel_id', 'termination_count', 'description', 'contacts', 'comments', 'tags', 'created',
+            'last_updated',
         )
         default_columns = ('pk', 'name', 'group', 'status', 'encapsulation', 'tenant', 'terminations_count')
 

netbox/vpn/views.py

@@ -62,6 +62,7 @@ class TunnelGroupBulkEditView(generic.BulkEditView):
 @register_model_view(TunnelGroup, 'bulk_rename', path='rename', detail=False)
 class TunnelGroupBulkRenameView(generic.BulkRenameView):
     queryset = TunnelGroup.objects.all()
+    filterset = filtersets.TunnelGroupFilterSet
 
 
 @register_model_view(TunnelGroup, 'bulk_delete', path='delete', detail=False)
@@ -131,6 +132,7 @@ class TunnelBulkEditView(generic.BulkEditView):
 @register_model_view(Tunnel, 'bulk_rename', path='rename', detail=False)
 class TunnelBulkRenameView(generic.BulkRenameView):
     queryset = Tunnel.objects.all()
+    filterset = filtersets.TunnelFilterSet
 
 
 @register_model_view(Tunnel, 'bulk_delete', path='delete', detail=False)
@@ -238,6 +240,7 @@ class IKEProposalBulkEditView(generic.BulkEditView):
 @register_model_view(IKEProposal, 'bulk_rename', path='rename', detail=False)
 class IKEProposalBulkRenameView(generic.BulkRenameView):
     queryset = IKEProposal.objects.all()
+    filterset = filtersets.IKEProposalFilterSet
 
 
 @register_model_view(IKEProposal, 'bulk_delete', path='delete', detail=False)
@@ -293,6 +296,7 @@ class IKEPolicyBulkEditView(generic.BulkEditView):
 @register_model_view(IKEPolicy, 'bulk_rename', path='rename', detail=False)
 class IKEPolicyBulkRenameView(generic.BulkRenameView):
     queryset = IKEPolicy.objects.all()
+    filterset = filtersets.IKEPolicyFilterSet
 
 
 @register_model_view(IKEPolicy, 'bulk_delete', path='delete', detail=False)
@@ -348,6 +352,7 @@ class IPSecProposalBulkEditView(generic.BulkEditView):
 @register_model_view(IPSecProposal, 'bulk_rename', path='rename', detail=False)
 class IPSecProposalBulkRenameView(generic.BulkRenameView):
     queryset = IPSecProposal.objects.all()
+    filterset = filtersets.IPSecProposalFilterSet
 
 
 @register_model_view(IPSecProposal, 'bulk_delete', path='delete', detail=False)
@@ -403,6 +408,7 @@ class IPSecPolicyBulkEditView(generic.BulkEditView):
 @register_model_view(IPSecPolicy, 'bulk_rename', path='rename', detail=False)
 class IPSecPolicyBulkRenameView(generic.BulkRenameView):
     queryset = IPSecPolicy.objects.all()
+    filterset = filtersets.IPSecPolicyFilterSet
 
 
 @register_model_view(IPSecPolicy, 'bulk_delete', path='delete', detail=False)
@@ -458,6 +464,7 @@ class IPSecProfileBulkEditView(generic.BulkEditView):
 @register_model_view(IPSecProfile, 'bulk_rename', path='rename', detail=False)
 class IPSecProfileBulkRenameView(generic.BulkRenameView):
     queryset = IPSecProfile.objects.all()
+    filterset = filtersets.IPSecProfileFilterSet
 
 
 @register_model_view(IPSecProfile, 'bulk_delete', path='delete', detail=False)
@@ -530,6 +537,7 @@ class L2VPNBulkEditView(generic.BulkEditView):
 @register_model_view(L2VPN, 'bulk_rename', path='rename', detail=False)
 class L2VPNBulkRenameView(generic.BulkRenameView):
     queryset = L2VPN.objects.all()
+    filterset = filtersets.L2VPNFilterSet
 
 
 @register_model_view(L2VPN, 'bulk_delete', path='delete', detail=False)