diff --git a/CHANGELOG.md b/CHANGELOG.md index 853a0df47..033e767b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ v2.4.5 (FUTURE) * [#2392](https://github.com/digitalocean/netbox/issues/2392) - Implemented local context data for devices and virtual machines * [#2402](https://github.com/digitalocean/netbox/issues/2402) - Order and format JSON data in form fields * [#2432](https://github.com/digitalocean/netbox/issues/2432) - Link remote interface connections to the Interface view +* [#2438](https://github.com/digitalocean/netbox/issues/2438) - API optimizations for tagged objects ## Bug Fixes diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 3b1623da4..eccc1edfc 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -29,7 +29,7 @@ class CircuitsFieldChoicesViewSet(FieldChoicesViewSet): # class ProviderViewSet(CustomFieldModelViewSet): - queryset = Provider.objects.all() + queryset = Provider.objects.prefetch_related('tags') serializer_class = serializers.ProviderSerializer filter_class = filters.ProviderFilter @@ -59,7 +59,7 @@ class CircuitTypeViewSet(ModelViewSet): # class CircuitViewSet(CustomFieldModelViewSet): - queryset = Circuit.objects.select_related('type', 'tenant', 'provider') + queryset = Circuit.objects.select_related('type', 'tenant', 'provider').prefetch_related('tags') serializer_class = serializers.CircuitSerializer filter_class = filters.CircuitFilter diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 901d9d2a5..9edfe7bb9 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from collections import OrderedDict from django.conf import settings -from django.http import HttpResponseBadRequest, HttpResponseForbidden +from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404 from drf_yasg import openapi from drf_yasg.openapi import Parameter @@ -60,7 +60,7 @@ class RegionViewSet(ModelViewSet): # class SiteViewSet(CustomFieldModelViewSet): - queryset = Site.objects.select_related('region', 'tenant') + queryset = Site.objects.select_related('region', 'tenant').prefetch_related('tags') serializer_class = serializers.SiteSerializer filter_class = filters.SiteFilter @@ -100,7 +100,7 @@ class RackRoleViewSet(ModelViewSet): # class RackViewSet(CustomFieldModelViewSet): - queryset = Rack.objects.select_related('site', 'group__site', 'tenant') + queryset = Rack.objects.select_related('site', 'group__site', 'tenant').prefetch_related('tags') serializer_class = serializers.RackSerializer filter_class = filters.RackFilter @@ -154,7 +154,7 @@ class ManufacturerViewSet(ModelViewSet): # class DeviceTypeViewSet(CustomFieldModelViewSet): - queryset = DeviceType.objects.select_related('manufacturer') + queryset = DeviceType.objects.select_related('manufacturer').prefetch_related('tags') serializer_class = serializers.DeviceTypeSerializer filter_class = filters.DeviceTypeFilter @@ -228,7 +228,7 @@ class DeviceViewSet(CustomFieldModelViewSet): 'device_type__manufacturer', 'device_role', 'tenant', 'platform', 'site', 'rack', 'parent_bay', 'virtual_chassis__master', ).prefetch_related( - 'primary_ip4__nat_outside', 'primary_ip6__nat_outside', + 'primary_ip4__nat_outside', 'primary_ip6__nat_outside', 'tags', ) filter_class = filters.DeviceFilter @@ -315,31 +315,31 @@ class DeviceViewSet(CustomFieldModelViewSet): # class ConsolePortViewSet(ModelViewSet): - queryset = ConsolePort.objects.select_related('device', 'cs_port__device') + queryset = ConsolePort.objects.select_related('device', 'cs_port__device').prefetch_related('tags') serializer_class = serializers.ConsolePortSerializer filter_class = filters.ConsolePortFilter class ConsoleServerPortViewSet(ModelViewSet): - queryset = ConsoleServerPort.objects.select_related('device', 'connected_console__device') + queryset = ConsoleServerPort.objects.select_related('device', 'connected_console__device').prefetch_related('tags') serializer_class = serializers.ConsoleServerPortSerializer filter_class = filters.ConsoleServerPortFilter class PowerPortViewSet(ModelViewSet): - queryset = PowerPort.objects.select_related('device', 'power_outlet__device') + queryset = PowerPort.objects.select_related('device', 'power_outlet__device').prefetch_related('tags') serializer_class = serializers.PowerPortSerializer filter_class = filters.PowerPortFilter class PowerOutletViewSet(ModelViewSet): - queryset = PowerOutlet.objects.select_related('device', 'connected_port__device') + queryset = PowerOutlet.objects.select_related('device', 'connected_port__device').prefetch_related('tags') serializer_class = serializers.PowerOutletSerializer filter_class = filters.PowerOutletFilter class InterfaceViewSet(ModelViewSet): - queryset = Interface.objects.select_related('device') + queryset = Interface.objects.select_related('device').prefetch_related('tags') serializer_class = serializers.InterfaceSerializer filter_class = filters.InterfaceFilter @@ -355,13 +355,13 @@ class InterfaceViewSet(ModelViewSet): class DeviceBayViewSet(ModelViewSet): - queryset = DeviceBay.objects.select_related('installed_device') + queryset = DeviceBay.objects.select_related('installed_device').prefetch_related('tags') serializer_class = serializers.DeviceBaySerializer filter_class = filters.DeviceBayFilter class InventoryItemViewSet(ModelViewSet): - queryset = InventoryItem.objects.select_related('device', 'manufacturer') + queryset = InventoryItem.objects.select_related('device', 'manufacturer').prefetch_related('tags') serializer_class = serializers.InventoryItemSerializer filter_class = filters.InventoryItemFilter @@ -393,7 +393,7 @@ class InterfaceConnectionViewSet(ModelViewSet): # class VirtualChassisViewSet(ModelViewSet): - queryset = VirtualChassis.objects.all() + queryset = VirtualChassis.objects.prefetch_related('tags') serializer_class = serializers.VirtualChassisSerializer diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index e32688343..41cea7eaa 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -33,7 +33,7 @@ class IPAMFieldChoicesViewSet(FieldChoicesViewSet): # class VRFViewSet(CustomFieldModelViewSet): - queryset = VRF.objects.select_related('tenant') + queryset = VRF.objects.select_related('tenant').prefetch_related('tags') serializer_class = serializers.VRFSerializer filter_class = filters.VRFFilter @@ -53,7 +53,7 @@ class RIRViewSet(ModelViewSet): # class AggregateViewSet(CustomFieldModelViewSet): - queryset = Aggregate.objects.select_related('rir') + queryset = Aggregate.objects.select_related('rir').prefetch_related('tags') serializer_class = serializers.AggregateSerializer filter_class = filters.AggregateFilter @@ -73,7 +73,7 @@ class RoleViewSet(ModelViewSet): # class PrefixViewSet(CustomFieldModelViewSet): - queryset = Prefix.objects.select_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role') + queryset = Prefix.objects.select_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role').prefetch_related('tags') serializer_class = serializers.PrefixSerializer filter_class = filters.PrefixFilter @@ -245,7 +245,7 @@ class IPAddressViewSet(CustomFieldModelViewSet): queryset = IPAddress.objects.select_related( 'vrf__tenant', 'tenant', 'nat_inside', 'interface__device__device_type', 'interface__virtual_machine' ).prefetch_related( - 'nat_outside' + 'nat_outside', 'tags', ) serializer_class = serializers.IPAddressSerializer filter_class = filters.IPAddressFilter @@ -266,7 +266,7 @@ class VLANGroupViewSet(ModelViewSet): # class VLANViewSet(CustomFieldModelViewSet): - queryset = VLAN.objects.select_related('site', 'group', 'tenant', 'role') + queryset = VLAN.objects.select_related('site', 'group', 'tenant', 'role').prefetch_related('tags') serializer_class = serializers.VLANSerializer filter_class = filters.VLANFilter @@ -276,6 +276,6 @@ class VLANViewSet(CustomFieldModelViewSet): # class ServiceViewSet(ModelViewSet): - queryset = Service.objects.select_related('device') + queryset = Service.objects.select_related('device').prefetch_related('tags') serializer_class = serializers.ServiceSerializer filter_class = filters.ServiceFilter diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py index 9bc52f9f0..01567be8b 100644 --- a/netbox/secrets/api/views.py +++ b/netbox/secrets/api/views.py @@ -48,7 +48,7 @@ class SecretViewSet(ModelViewSet): queryset = Secret.objects.select_related( 'device__primary_ip4', 'device__primary_ip6', 'role', ).prefetch_related( - 'role__users', 'role__groups', + 'role__users', 'role__groups', 'tags', ) serializer_class = serializers.SecretSerializer filter_class = filters.SecretFilter diff --git a/netbox/tenancy/api/views.py b/netbox/tenancy/api/views.py index 1ebd95500..48cd76163 100644 --- a/netbox/tenancy/api/views.py +++ b/netbox/tenancy/api/views.py @@ -30,6 +30,6 @@ class TenantGroupViewSet(ModelViewSet): # class TenantViewSet(CustomFieldModelViewSet): - queryset = Tenant.objects.select_related('group') + queryset = Tenant.objects.select_related('group').prefetch_related('tags') serializer_class = serializers.TenantSerializer filter_class = filters.TenantFilter diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index c20b8091e..ab8ce7fbc 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -35,7 +35,7 @@ class ClusterGroupViewSet(ModelViewSet): class ClusterViewSet(CustomFieldModelViewSet): - queryset = Cluster.objects.select_related('type', 'group') + queryset = Cluster.objects.select_related('type', 'group').prefetch_related('tags') serializer_class = serializers.ClusterSerializer filter_class = filters.ClusterFilter @@ -47,7 +47,7 @@ class ClusterViewSet(CustomFieldModelViewSet): class VirtualMachineViewSet(CustomFieldModelViewSet): queryset = VirtualMachine.objects.select_related( 'cluster__site', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6' - ) + ).prefetch_related('tags') filter_class = filters.VirtualMachineFilter def get_serializer_class(self): @@ -60,6 +60,8 @@ class VirtualMachineViewSet(CustomFieldModelViewSet): class InterfaceViewSet(ModelViewSet): - queryset = Interface.objects.filter(virtual_machine__isnull=False).select_related('virtual_machine') + queryset = Interface.objects.filter( + virtual_machine__isnull=False + ).select_related('virtual_machine').prefetch_related('tags') serializer_class = serializers.InterfaceSerializer filter_class = filters.InterfaceFilter