diff --git a/netbox/circuits/graphql/types.py b/netbox/circuits/graphql/types.py index 25416d51d..45f0d065d 100644 --- a/netbox/circuits/graphql/types.py +++ b/netbox/circuits/graphql/types.py @@ -6,7 +6,7 @@ import strawberry_django from circuits import models from dcim.graphql.mixins import CabledObjectMixin 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 .filters import * @@ -109,5 +109,6 @@ class CircuitGroupType(OrganizationalObjectType): fields='__all__', filters=CircuitGroupAssignmentFilter ) -class CircuitGroupAssignmentType(TagsMixin, ObjectType): - pass +class CircuitGroupAssignmentType(TagsMixin, BaseObjectType): + group: Annotated["CircuitGroupType", strawberry.lazy('circuits.graphql.types')] + circuit: Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')] diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py index 311bd65ee..b6e42b7aa 100644 --- a/netbox/circuits/tests/test_api.py +++ b/netbox/circuits/tests/test_api.py @@ -283,7 +283,7 @@ class ProviderAccountTest(APIViewTestCases.APIViewTestCase): class CircuitGroupAssignmentTest(APIViewTestCases.APIViewTestCase): model = CircuitGroupAssignment - brief_fields = ['group', 'circuit', 'display', 'id', 'priority', 'url'] + brief_fields = ['circuit', 'display', 'group', 'id', 'priority', 'url'] bulk_update_data = { 'priority': CircuitPriorityChoices.PRIORITY_INACTIVE, } @@ -335,18 +335,18 @@ class CircuitGroupAssignmentTest(APIViewTestCases.APIViewTestCase): cls.create_data = [ { - 'group_id': groups[3].pk, - 'circuit_id': circuits[3].pk + 'group': circuit_groups[3].pk, + 'circuit': circuits[3].pk, 'priority': CircuitPriorityChoices.PRIORITY_PRIMARY, }, { - 'group_id': groups[4].pk, - 'circuit_id': circuits[4].pk + 'group': circuit_groups[4].pk, + 'circuit': circuits[4].pk, 'priority': CircuitPriorityChoices.PRIORITY_SECONDARY, }, { - 'group_id': groups[5].pk, - 'circuit_id': circuits[5].pk + 'group': circuit_groups[5].pk, + 'circuit': circuits[5].pk, 'priority': CircuitPriorityChoices.PRIORITY_TERTIARY, }, ]