From 548127cc88ca7a7bca7521644bf4c0bbea782f5c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 15:46:20 -0400
Subject: [PATCH] Rename VMInterface serializers

---
 netbox/utilities/custom_inspectors.py           | 6 ------
 netbox/virtualization/api/nested_serializers.py | 4 ++--
 netbox/virtualization/api/serializers.py        | 2 +-
 netbox/virtualization/api/views.py              | 9 +--------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/netbox/utilities/custom_inspectors.py b/netbox/utilities/custom_inspectors.py
index 14463de23..38297838d 100644
--- a/netbox/utilities/custom_inspectors.py
+++ b/netbox/utilities/custom_inspectors.py
@@ -5,14 +5,8 @@ from drf_yasg.utils import get_serializer_ref_name
 from rest_framework.fields import ChoiceField
 from rest_framework.relations import ManyRelatedField
 
-from dcim.api.serializers import InterfaceSerializer as DeviceInterfaceSerializer
 from extras.api.customfields import CustomFieldsSerializer
 from utilities.api import ChoiceField, SerializedPKRelatedField, WritableNestedSerializer
-from virtualization.api.serializers import InterfaceSerializer as VirtualMachineInterfaceSerializer
-
-# this might be ugly, but it limits drf_yasg-specific code to this file
-DeviceInterfaceSerializer.Meta.ref_name = 'DeviceInterface'
-VirtualMachineInterfaceSerializer.Meta.ref_name = 'VirtualMachineInterface'
 
 
 class NetBoxSwaggerAutoSchema(SwaggerAutoSchema):
diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py
index 6e7a7c460..de56e6e6a 100644
--- a/netbox/virtualization/api/nested_serializers.py
+++ b/netbox/virtualization/api/nested_serializers.py
@@ -8,7 +8,7 @@ __all__ = [
     'NestedClusterGroupSerializer',
     'NestedClusterSerializer',
     'NestedClusterTypeSerializer',
-    'NestedInterfaceSerializer',
+    'NestedVMInterfaceSerializer',
     'NestedVirtualMachineSerializer',
 ]
 
@@ -56,7 +56,7 @@ class NestedVirtualMachineSerializer(WritableNestedSerializer):
         fields = ['id', 'url', 'name']
 
 
-class NestedInterfaceSerializer(WritableNestedSerializer):
+class NestedVMInterfaceSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:vminterface-detail')
     virtual_machine = NestedVirtualMachineSerializer(read_only=True)
 
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index d2a13ce7d..5698791f8 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -94,7 +94,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
 # VM interfaces
 #
 
-class InterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+class VMInterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     virtual_machine = NestedVirtualMachineSerializer()
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 8d16e08e1..3a720e56f 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -77,12 +77,5 @@ class InterfaceViewSet(ModelViewSet):
     ).prefetch_related(
         'virtual_machine', 'tags'
     )
-    serializer_class = serializers.InterfaceSerializer
+    serializer_class = serializers.VMInterfaceSerializer
     filterset_class = filters.InterfaceFilterSet
-
-    def get_serializer_class(self):
-        request = self.get_serializer_context()['request']
-        if request.query_params.get('brief', False):
-            # Override get_serializer_for_model(), which will return the DCIM NestedInterfaceSerializer
-            return serializers.NestedInterfaceSerializer
-        return serializers.InterfaceSerializer