18296 add tenant to vlan groups

netbox-community · Feb 20, 2025 · 99bf1cb · 99bf1cb
1 parent 689ce73
commit 99bf1cb
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py
@@ -411,12 +411,13 @@ class FHRPGroupFilterForm(NetBoxModelFilterSetForm):
     tag = TagFilterField(model)
 
 
-class VLANGroupFilterForm(NetBoxModelFilterSetForm):
+class VLANGroupFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet('q', 'filter_id', 'tag'),
         FieldSet('region', 'sitegroup', 'site', 'location', 'rack', name=_('Location')),
         FieldSet('cluster_group', 'cluster', name=_('Cluster')),
         FieldSet('contains_vid', name=_('VLANs')),
+        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
     )
     model = VLANGroup
     region = DynamicModelMultipleChoiceField(

diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py
@@ -1568,27 +1568,45 @@ def setUpTestData(cls):
         cluster = Cluster(name='Cluster 1', type=clustertype)
         cluster.save()
 
+        tenant_groups = (
+            TenantGroup(name='Tenant group 1', slug='tenant-group-1'),
+            TenantGroup(name='Tenant group 2', slug='tenant-group-2'),
+            TenantGroup(name='Tenant group 3', slug='tenant-group-3'),
+        )
+        for tenantgroup in tenant_groups:
+            tenantgroup.save()
+
+        tenants = (
+            Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]),
+            Tenant(name='Tenant 2', slug='tenant-2', group=tenant_groups[1]),
+            Tenant(name='Tenant 3', slug='tenant-3', group=tenant_groups[2]),
+        )
+        Tenant.objects.bulk_create(tenants)
+
         vlan_groups = (
             VLANGroup(
                 name='VLAN Group 1',
                 slug='vlan-group-1',
                 vid_ranges=[NumericRange(1, 11), NumericRange(100, 200)],
                 scope=region,
-                description='foobar1'
+                description='foobar1',
+                tenant=tenants[0]
             ),
             VLANGroup(
                 name='VLAN Group 2',
                 slug='vlan-group-2',
                 vid_ranges=[NumericRange(1, 11), NumericRange(200, 300)],
                 scope=sitegroup,
-                description='foobar2'
+                description='foobar2',
+                tenant=tenants[1]
             ),
             VLANGroup(
                 name='VLAN Group 3',
                 slug='vlan-group-3',
                 vid_ranges=[NumericRange(1, 11), NumericRange(300, 400)],
                 scope=site,
-                description='foobar3'
+                description='foobar3',
+                tenant=tenants[1]
             ),
             VLANGroup(
                 name='VLAN Group 4',
@@ -1671,6 +1689,20 @@ def test_cluster(self):
         params = {'cluster': Cluster.objects.first().pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
+    def test_tenant(self):
+        tenants = Tenant.objects.all()[:2]
+        params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+        params = {'tenant': [tenants[0].slug, tenants[1].slug]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+
+    def test_tenant_group(self):
+        tenant_groups = TenantGroup.objects.all()[:2]
+        params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+        params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+
 
 class VLANTestCase(TestCase, ChangeLoggedFilterSetTests):
     queryset = VLAN.objects.all()