From c137fa20222f14b02fb50df3a287438f3c0b2c1f Mon Sep 17 00:00:00 2001 From: Djothi Carpentier Date: Thu, 24 Feb 2022 17:07:54 +0100 Subject: [PATCH] Add description filter for Tenant & ContactRole --- netbox/tenancy/filtersets.py | 4 ++-- netbox/tenancy/tests/test_filtersets.py | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/netbox/tenancy/filtersets.py b/netbox/tenancy/filtersets.py index c8af89143..c7e766389 100644 --- a/netbox/tenancy/filtersets.py +++ b/netbox/tenancy/filtersets.py @@ -62,7 +62,7 @@ class TenantFilterSet(PrimaryModelFilterSet): class Meta: model = Tenant - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'description'] def search(self, queryset, name, value): if not value.strip(): @@ -131,7 +131,7 @@ class ContactRoleFilterSet(OrganizationalModelFilterSet): class Meta: model = ContactRole - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'description'] class ContactFilterSet(PrimaryModelFilterSet): diff --git a/netbox/tenancy/tests/test_filtersets.py b/netbox/tenancy/tests/test_filtersets.py index 86170734c..e427c90ce 100644 --- a/netbox/tenancy/tests/test_filtersets.py +++ b/netbox/tenancy/tests/test_filtersets.py @@ -64,8 +64,8 @@ class TenantTestCase(TestCase, ChangeLoggedFilterSetTests): 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 1', slug='tenant-1', group=tenant_groups[0], description='foobar1'), + Tenant(name='Tenant 2', slug='tenant-2', group=tenant_groups[1], description='foobar2'), Tenant(name='Tenant 3', slug='tenant-3', group=tenant_groups[2]), ) Tenant.objects.bulk_create(tenants) @@ -85,6 +85,10 @@ class TenantTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'group': [group[0].slug, group[1].slug]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_description(self): + params = {'description': ['foobar1', 'foobar2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + class ContactGroupTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = ContactGroup.objects.all() @@ -137,8 +141,8 @@ class ContactRoleTestCase(TestCase, ChangeLoggedFilterSetTests): def setUpTestData(cls): contact_roles = ( - ContactRole(name='Contact Role 1', slug='contact-role-1'), - ContactRole(name='Contact Role 2', slug='contact-role-2'), + ContactRole(name='Contact Role 1', slug='contact-role-1', description='foobar1'), + ContactRole(name='Contact Role 2', slug='contact-role-2', description='foobar2'), ContactRole(name='Contact Role 3', slug='contact-role-3'), ) ContactRole.objects.bulk_create(contact_roles) @@ -151,6 +155,10 @@ class ContactRoleTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'slug': ['contact-role-1', 'contact-role-2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_description(self): + params = {'description': ['foobar1', 'foobar2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + class ContactTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = Contact.objects.all()