From 77eb1018e83a51f30b852f5e7150367431bda2b3 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 6 Mar 2024 15:00:48 -0800 Subject: [PATCH] 9856 test fixes --- netbox/extras/graphql/types.py | 38 +++++++++++++------------- netbox/virtualization/graphql/types.py | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/netbox/extras/graphql/types.py b/netbox/extras/graphql/types.py index f148a250b..e78ba84ca 100644 --- a/netbox/extras/graphql/types.py +++ b/netbox/extras/graphql/types.py @@ -39,55 +39,55 @@ class ConfigContextType(ObjectType): @strawberry_django.field def roles(self) -> List[Annotated["DeviceRoleType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.roles.all() @strawberry_django.field def device_types(self) -> List[Annotated["DeviceTypeType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.device_types.all() @strawberry_django.field def tags(self) -> List[Annotated["TagType", strawberry.lazy('extras.graphql.types')]]: - return self.vlan_groups.all() + return self.tags.all() @strawberry_django.field def platforms(self) -> List[Annotated["PlatformType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.platforms.all() @strawberry_django.field def regions(self) -> List[Annotated["RegionType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.regions.all() @strawberry_django.field def cluster_groups(self) -> List[Annotated["ClusterGroupType", strawberry.lazy('virtualization.graphql.types')]]: - return self.vlan_groups.all() + return self.cluster_groups.all() @strawberry_django.field def tenant_groups(self) -> List[Annotated["TenantGroupType", strawberry.lazy('tenancy.graphql.types')]]: - return self.vlan_groups.all() + return self.tenant_groups.all() @strawberry_django.field def cluster_types(self) -> List[Annotated["ClusterTypeType", strawberry.lazy('virtualization.graphql.types')]]: - return self.vlan_groups.all() + return self.cluster_types.all() @strawberry_django.field def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: - return self.vlan_groups.all() + return self.clusters.all() @strawberry_django.field def locations(self) -> List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.locations.all() @strawberry_django.field def sites(self) -> List[Annotated["SiteType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.sites.all() @strawberry_django.field def tenants(self) -> List[Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')]]: - return self.vlan_groups.all() + return self.tenants.all() @strawberry_django.field def site_groups(self) -> List[Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.site_groups.all() @strawberry_django.type( @@ -99,19 +99,19 @@ class ConfigTemplateType(TagsMixin, ObjectType): @strawberry_django.field def virtualmachines(self) -> List[Annotated["VirtualMachineType", strawberry.lazy('virtualization.graphql.types')]]: - return self.vlan_groups.all() + return self.virtualmachines.all() @strawberry_django.field def devices(self) -> List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.devices.all() @strawberry_django.field def platforms(self) -> List[Annotated["PlatformType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.platforms.all() @strawberry_django.field def device_roles(self) -> List[Annotated["DeviceRoleType", strawberry.lazy('dcim.graphql.types')]]: - return self.vlan_groups.all() + return self.device_roles.all() @strawberry_django.type( @@ -133,11 +133,11 @@ class CustomFieldChoiceSetType(ObjectType): @strawberry_django.field def choices_for(self) -> List[Annotated["CustomFieldType", strawberry.lazy('extras.graphql.types')]]: - return self.assignments.all() + return self.choices_for.all() @strawberry_django.field def extra_choices(self) -> List[str]: - return self.assignments.all() + return self.extra_choices @strawberry_django.type( diff --git a/netbox/virtualization/graphql/types.py b/netbox/virtualization/graphql/types.py index 86a7d4b2c..6bfe4016f 100644 --- a/netbox/virtualization/graphql/types.py +++ b/netbox/virtualization/graphql/types.py @@ -99,7 +99,7 @@ class VirtualMachineType(ConfigContextMixin, NetBoxObjectType): ) class VMInterfaceType(IPAddressesMixin, ComponentObjectType): _name: str - mac_address: str + mac_address: str | None @strawberry_django.field def ip_addresses(self) -> List[Annotated["IPAddressType", strawberry.lazy('ipam.graphql.types')]]: