NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 08:38:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

7025 fix tests

Browse Source
This commit is contained in:
Arthur Hanson 2024-07-19 17:45:54 +07:00
parent 8eb4609da0
commit 1855c37deb
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/circuits/graphql/types.py
View File

@ -6,7 +6,7 @@ import strawberry_django
from circuits import models from circuits import models
from dcim.graphql.mixins import CabledObjectMixin from dcim.graphql.mixins import CabledObjectMixin
from extras.graphql.mixins import ContactsMixin, CustomFieldsMixin, TagsMixin from extras.graphql.mixins import ContactsMixin, CustomFieldsMixin, TagsMixin
from netbox.graphql.types import NetBoxObjectType, ObjectType, OrganizationalObjectType from netbox.graphql.types import BaseObjectType, NetBoxObjectType, ObjectType, OrganizationalObjectType
from tenancy.graphql.types import TenantType from tenancy.graphql.types import TenantType
from .filters import * from .filters import *
@ -109,5 +109,6 @@ class CircuitGroupType(OrganizationalObjectType):
fields='__all__', fields='__all__',
filters=CircuitGroupAssignmentFilter filters=CircuitGroupAssignmentFilter
) )
class CircuitGroupAssignmentType(TagsMixin, ObjectType): class CircuitGroupAssignmentType(TagsMixin, BaseObjectType):
pass group: Annotated["CircuitGroupType", strawberry.lazy('circuits.graphql.types')]
circuit: Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')]

14
netbox/circuits/tests/test_api.py
View File

@ -283,7 +283,7 @@ class ProviderAccountTest(APIViewTestCases.APIViewTestCase):
class CircuitGroupAssignmentTest(APIViewTestCases.APIViewTestCase): class CircuitGroupAssignmentTest(APIViewTestCases.APIViewTestCase):
model = CircuitGroupAssignment model = CircuitGroupAssignment
brief_fields = ['group', 'circuit', 'display', 'id', 'priority', 'url'] brief_fields = ['circuit', 'display', 'group', 'id', 'priority', 'url']
bulk_update_data = { bulk_update_data = {
'priority': CircuitPriorityChoices.PRIORITY_INACTIVE, 'priority': CircuitPriorityChoices.PRIORITY_INACTIVE,
} }
@ -335,18 +335,18 @@ class CircuitGroupAssignmentTest(APIViewTestCases.APIViewTestCase):
cls.create_data = [ cls.create_data = [
{ {
'group_id': groups[3].pk, 'group': circuit_groups[3].pk,
'circuit_id': circuits[3].pk 'circuit': circuits[3].pk,
'priority': CircuitPriorityChoices.PRIORITY_PRIMARY, 'priority': CircuitPriorityChoices.PRIORITY_PRIMARY,
}, },
{ {
'group_id': groups[4].pk, 'group': circuit_groups[4].pk,
'circuit_id': circuits[4].pk 'circuit': circuits[4].pk,
'priority': CircuitPriorityChoices.PRIORITY_SECONDARY, 'priority': CircuitPriorityChoices.PRIORITY_SECONDARY,
}, },
{ {
'group_id': groups[5].pk, 'group': circuit_groups[5].pk,
'circuit_id': circuits[5].pk 'circuit': circuits[5].pk,
'priority': CircuitPriorityChoices.PRIORITY_TERTIARY, 'priority': CircuitPriorityChoices.PRIORITY_TERTIARY,
}, },
] ]