Revert "Bumping version just to test the GitHub Action"

This reverts commit 1cf0868e

netbox/dcim/api/views.py

@@ -2,7 +2,7 @@ from collections import OrderedDict
 
 from django.conf import settings
 from django.db.models import Count, F
-from django.http import HttpResponse, HttpResponseForbidden
+from django.http import HttpResponseForbidden, HttpResponse
 from django.shortcuts import get_object_or_404
 from drf_yasg import openapi
 from drf_yasg.openapi import Parameter
@@ -14,17 +14,20 @@ from rest_framework.viewsets import GenericViewSet, ViewSet
 
 from circuits.models import Circuit
 from dcim import filters
-from dcim.models import (Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device,
+from dcim.models import (
-                         DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface,
+    Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
-                         InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerFeed, PowerOutlet,
+    DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
-                         PowerOutletTemplate, PowerPanel, PowerPort, PowerPortTemplate, Rack, RackGroup,
+    Manufacturer, InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort,
-                         RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis)
+    PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site,
+    VirtualChassis,
+)
 from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
 from extras.models import Graph
 from ipam.models import Prefix, VLAN
-from utilities.api import (IsAuthenticatedOrLoginNotRequired, ModelViewSet, ServiceUnavailable,
+from utilities.api import (
-                           get_serializer_for_model)
+    get_serializer_for_model, IsAuthenticatedOrLoginNotRequired, ModelViewSet, ServiceUnavailable,
+)
 from utilities.utils import get_subquery
 from virtualization.models import VirtualMachine
 from . import serializers
@@ -49,20 +52,14 @@ class CableTraceMixin(object):
 
             # Serialize each object
             serializer_a = get_serializer_for_model(near_end, prefix='Nested')
-            x = serializer_a(near_end, context={
+            x = serializer_a(near_end, context={'request': request}).data
-                'request': request
-            }).data
             if cable is not None:
-                y = serializers.TracedCableSerializer(cable, context={
+                y = serializers.TracedCableSerializer(cable, context={'request': request}).data
-                    'request': request
-                }).data
             else:
                 y = None
             if far_end is not None:
                 serializer_b = get_serializer_for_model(far_end, prefix='Nested')
-                z = serializer_b(far_end, context={
+                z = serializer_b(far_end, context={'request': request}).data
-                    'request': request
-                }).data
             else:
                 z = None
 
@@ -108,9 +105,7 @@ class SiteViewSet(CustomFieldModelViewSet):
         """
         site = get_object_or_404(Site, pk=pk)
         queryset = Graph.objects.filter(type__model='site')
-        serializer = RenderedGraphSerializer(queryset, many=True, context={
+        serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': site})
-            'graphed_object': site
-        })
         return Response(serializer.data)
 
 
@@ -153,9 +148,7 @@ class RackViewSet(CustomFieldModelViewSet):
     filterset_class = filters.RackFilterSet
 
     @swagger_auto_schema(
-        responses={
+        responses={200: serializers.RackUnitSerializer(many=True)},
-            200: serializers.RackUnitSerializer(many=True)
-        },
         query_serializer=serializers.RackElevationDetailFilterSerializer
     )
     @action(detail=True)
@@ -196,9 +189,7 @@ class RackViewSet(CustomFieldModelViewSet):
 
             page = self.paginate_queryset(elevation)
             if page is not None:
-                rack_units = serializers.RackUnitSerializer(page, many=True, context={
+                rack_units = serializers.RackUnitSerializer(page, many=True, context={'request': request})
-                    'request': request
-                })
                 return self.get_paginated_response(rack_units.data)
 
 
@@ -299,11 +290,10 @@ class DeviceBayTemplateViewSet(ModelViewSet):
 #
 
 class DeviceRoleViewSet(ModelViewSet):
-    queryset = DeviceRole.objects.all()
+    queryset = DeviceRole.objects.annotate(
-    #     annotate(
+        device_count=get_subquery(Device, 'device_role'),
-    #     device_count=Count('devices'),
+        virtualmachine_count=get_subquery(VirtualMachine, 'role')
-    #     virtualmachine_count=Count('virtual_machines')
+    )
-    # )
     serializer_class = serializers.DeviceRoleSerializer
     filterset_class = filters.DeviceRoleFilterSet
 
@@ -359,9 +349,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
         """
         device = get_object_or_404(Device, pk=pk)
         queryset = Graph.objects.filter(type__model='device')
-        serializer = RenderedGraphSerializer(queryset, many=True, context={
+        serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': device})
-            'graphed_object': device
-        })
 
         return Response(serializer.data)
 
@@ -374,9 +362,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
                 type=openapi.TYPE_STRING
             )
         ],
-        responses={
+        responses={'200': serializers.DeviceNAPALMSerializer}
-            '200': serializers.DeviceNAPALMSerializer
-        }
     )
     @action(detail=True, url_path='napalm')
     def napalm(self, request, pk):
@@ -450,25 +436,17 @@ class DeviceViewSet(CustomFieldModelViewSet):
         # Validate and execute each specified NAPALM method
         for method in napalm_methods:
             if not hasattr(driver, method):
-                response[method] = {
+                response[method] = {'error': 'Unknown NAPALM method'}
-                    'error': 'Unknown NAPALM method'
-                }
                 continue
             if not method.startswith('get_'):
-                response[method] = {
+                response[method] = {'error': 'Only get_* NAPALM methods are supported'}
-                    'error': 'Only get_* NAPALM methods are supported'
-                }
                 continue
             try:
                 response[method] = getattr(d, method)()
             except NotImplementedError:
-                response[method] = {
+                response[method] = {'error': 'Method {} not implemented for NAPALM driver {}'.format(method, driver)}
-                    'error': 'Method {} not implemented for NAPALM driver {}'.format(method, driver)
-                }
             except Exception as e:
-                response[method] = {
+                response[method] = {'error': 'Method {} failed: {}'.format(method, e)}
-                    'error': 'Method {} failed: {}'.format(method, e)
-                }
         d.close()
 
         return Response(response)
@@ -520,9 +498,7 @@ class InterfaceViewSet(CableTraceMixin, ModelViewSet):
         """
         interface = get_object_or_404(Interface, pk=pk)
         queryset = Graph.objects.filter(type__model='interface')
-        serializer = RenderedGraphSerializer(queryset, many=True, context={
+        serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': interface})
-            'graphed_object': interface
-        })
         return Response(serializer.data)
 
 
@@ -668,9 +644,7 @@ class ConnectedDeviceViewSet(ViewSet):
 
     @swagger_auto_schema(
         manual_parameters=[_device_param, _interface_param],
-        responses={
+        responses={'200': serializers.DeviceSerializer}
-            '200': serializers.DeviceSerializer
-        }
     )
     def list(self, request):
 
@@ -687,6 +661,4 @@ class ConnectedDeviceViewSet(ViewSet):
         if local_interface is None:
             return Response()
 
-        return Response(serializers.DeviceSerializer(local_interface.device, context={
+        return Response(serializers.DeviceSerializer(local_interface.device, context={'request': request}).data)
-            'request': request
-        }).data)

netbox/dcim/models/__init__.py

@@ -1223,23 +1223,6 @@ class DeviceRole(ChangeLoggedModel):
             self.description,
         )
 
-    @property
-    def device_count(self):
-        device_count_map = dict(Device.objects
-                                .order_by('device_role')
-                                .values_list('device_role')
-                                .annotate(Count('pk')))
-        return device_count_map.get(self.pk)
-
-    @property
-    def virtualmachine_count(self):
-        from virtualization.models import VirtualMachine
-        virtualmachine_count_map = dict(VirtualMachine.objects
-                                        .order_by('role')
-                                        .values_list('role')
-                                        .annotate(Count('pk')))
-        return virtualmachine_count_map.get(self.pk)
-
 
 class Platform(ChangeLoggedModel):
     """