NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-29 11:56:25 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

18245 fix tests

Browse Source
This commit is contained in:
Arthur 2025-03-21 10:08:08 -07:00
parent 251840c05e
commit a5dc0807db
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/dcim/graphql/types.py
View File

@ -328,6 +328,7 @@ class InventoryItemTemplateType(ComponentTemplateType):
filters=DeviceRoleFilter filters=DeviceRoleFilter
) )
class DeviceRoleType(OrganizationalObjectType): class DeviceRoleType(OrganizationalObjectType):
group: Annotated['DeviceRoleGroupType', strawberry.lazy('dcim.graphql.types')] | None
color: str color: str
config_template: Annotated["ConfigTemplateType", strawberry.lazy('extras.graphql.types')] | None config_template: Annotated["ConfigTemplateType", strawberry.lazy('extras.graphql.types')] | None

16
netbox/dcim/tests/test_filtersets.py
View File

@ -2236,11 +2236,11 @@ class DeviceRoleGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
def test_name(self): def test_name(self):
params = {'name': ['Tenant Group 1', 'Tenant Group 2']} params = {'name': ['Device Role Group 1', 'Device Role Group 2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_slug(self): def test_slug(self):
params = {'slug': ['tenant-group-1', 'tenant-group-2']} params = {'slug': ['device-role-group-1', 'device-role-group-2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_description(self): def test_description(self):
@ -2248,17 +2248,17 @@ class DeviceRoleGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_parent(self): def test_parent(self):
tenant_groups = TenantGroup.objects.filter(parent__isnull=True)[:2] device_role_groups = DeviceRoleGroup.objects.filter(parent__isnull=True)[:2]
params = {'parent_id': [tenant_groups[0].pk, tenant_groups[1].pk]} params = {'parent_id': [device_role_groups[0].pk, device_role_groups[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
params = {'parent': [tenant_groups[0].slug, tenant_groups[1].slug]} params = {'parent': [device_role_groups[0].slug, device_role_groups[1].slug]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_ancestor(self): def test_ancestor(self):
tenant_groups = TenantGroup.objects.filter(parent__isnull=True)[:2] device_role_groups = DeviceRoleGroup.objects.filter(parent__isnull=True)[:2]
params = {'ancestor_id': [tenant_groups[0].pk, tenant_groups[1].pk]} params = {'ancestor_id': [device_role_groups[0].pk, device_role_groups[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
params = {'ancestor': [tenant_groups[0].slug, tenant_groups[1].slug]} params = {'ancestor': [device_role_groups[0].slug, device_role_groups[1].slug]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)