NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-31 04:46:26 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

9604 fix tests

Browse Source
This commit is contained in:
Arthur Hanson 2024-10-21 15:18:25 -07:00
parent 702aa7ac86
commit e0db49f981
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/circuits/views.py
View File

@ -257,7 +257,7 @@ class CircuitTypeBulkDeleteView(generic.BulkDeleteView):
class CircuitListView(generic.ObjectListView): class CircuitListView(generic.ObjectListView):
queryset = Circuit.objects.prefetch_related( queryset = Circuit.objects.prefetch_related(
'tenant__group', 'termination_a__site', 'termination_z__site', 'tenant__group', 'termination_a___site', 'termination_z___site',
'termination_a__provider_network', 'termination_z__provider_network', 'termination_a__provider_network', 'termination_z__provider_network',
) )
filterset = filtersets.CircuitFilterSet filterset = filtersets.CircuitFilterSet
@ -298,7 +298,7 @@ class CircuitBulkImportView(generic.BulkImportView):
class CircuitBulkEditView(generic.BulkEditView): class CircuitBulkEditView(generic.BulkEditView):
queryset = Circuit.objects.prefetch_related( queryset = Circuit.objects.prefetch_related(
'termination_a__site', 'termination_z__site', 'termination_a___site', 'termination_z___site',
'termination_a__provider_network', 'termination_z__provider_network', 'termination_a__provider_network', 'termination_z__provider_network',
) )
filterset = filtersets.CircuitFilterSet filterset = filtersets.CircuitFilterSet
@ -308,7 +308,7 @@ class CircuitBulkEditView(generic.BulkEditView):
class CircuitBulkDeleteView(generic.BulkDeleteView): class CircuitBulkDeleteView(generic.BulkDeleteView):
queryset = Circuit.objects.prefetch_related( queryset = Circuit.objects.prefetch_related(
'termination_a__site', 'termination_z__site', 'termination_a___site', 'termination_z___site',
'termination_a__provider_network', 'termination_z__provider_network', 'termination_a__provider_network', 'termination_z__provider_network',
) )
filterset = filtersets.CircuitFilterSet filterset = filtersets.CircuitFilterSet

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

@ -725,10 +725,13 @@ class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObje
devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]] devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]]
locations: List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]] locations: List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]]
asns: List[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]] asns: List[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]]
circuit_terminations: List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]
clusters: List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]] clusters: List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]
vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]] vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]]
@strawberry_django.field
def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]:
return self._circuit_terminations.all()
@strawberry_django.type( @strawberry_django.type(
models.SiteGroup, models.SiteGroup,