From 5913ae0e949e2ecf021b61d2a19805c5c8ed536d Mon Sep 17 00:00:00 2001
From: Brian Tiemann <btman@mac.com>
Date: Tue, 5 Nov 2024 16:01:54 -0500
Subject: [PATCH] Move MACAddressSerializer

---
 netbox/dcim/api/serializers_/device_components.py | 13 ++-----------
 netbox/dcim/api/serializers_/devices.py           | 11 ++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/netbox/dcim/api/serializers_/device_components.py b/netbox/dcim/api/serializers_/device_components.py
index 10739e536..83e671411 100644
--- a/netbox/dcim/api/serializers_/device_components.py
+++ b/netbox/dcim/api/serializers_/device_components.py
@@ -6,7 +6,7 @@ from dcim.choices import *
 from dcim.constants import *
 from dcim.models import (
     ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, InventoryItem, ModuleBay, PowerOutlet, PowerPort,
-    RearPort, VirtualDeviceContext, MACAddress,
+    RearPort, VirtualDeviceContext,
 )
 from ipam.api.serializers_.vlans import VLANSerializer, VLANTranslationPolicySerializer
 from ipam.api.serializers_.vrfs import VRFSerializer
@@ -21,7 +21,7 @@ from wireless.choices import *
 from wireless.models import WirelessLAN
 from .base import ConnectedEndpointsSerializer
 from .cables import CabledObjectSerializer
-from .devices import DeviceSerializer, ModuleSerializer, VirtualDeviceContextSerializer
+from .devices import DeviceSerializer, MACAddressSerializer, ModuleSerializer, VirtualDeviceContextSerializer
 from .manufacturers import ManufacturerSerializer
 from .nested import NestedInterfaceSerializer
 from .roles import InventoryItemRoleSerializer
@@ -33,7 +33,6 @@ __all__ = (
     'FrontPortSerializer',
     'InterfaceSerializer',
     'InventoryItemSerializer',
-    'MACAddressSerializer',
     'ModuleBaySerializer',
     'PowerOutletSerializer',
     'PowerPortSerializer',
@@ -164,14 +163,6 @@ class PowerOutletSerializer(NetBoxModelSerializer, CabledObjectSerializer, Conne
         brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', 'cable', '_occupied')
 
 
-class MACAddressSerializer(NetBoxModelSerializer):
-
-    class Meta:
-        model = MACAddress
-        fields = ['mac_address', 'is_primary']
-        brief_fields = ('mac_address',)
-
-
 class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer):
     device = DeviceSerializer(nested=True)
     vdcs = SerializedPKRelatedField(
diff --git a/netbox/dcim/api/serializers_/devices.py b/netbox/dcim/api/serializers_/devices.py
index 7a01b49e8..47ef3bd43 100644
--- a/netbox/dcim/api/serializers_/devices.py
+++ b/netbox/dcim/api/serializers_/devices.py
@@ -5,7 +5,7 @@ from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
 from dcim.choices import *
-from dcim.models import Device, DeviceBay, Module, VirtualDeviceContext
+from dcim.models import Device, DeviceBay, MACAddress, Module, VirtualDeviceContext
 from extras.api.serializers_.configtemplates import ConfigTemplateSerializer
 from ipam.api.serializers_.ip import IPAddressSerializer
 from netbox.api.fields import ChoiceField, RelatedObjectCountField
@@ -23,6 +23,7 @@ from .virtualchassis import VirtualChassisSerializer
 __all__ = (
     'DeviceSerializer',
     'DeviceWithConfigContextSerializer',
+    'MACAddressSerializer',
     'ModuleSerializer',
     'VirtualDeviceContextSerializer',
 )
@@ -153,3 +154,11 @@ class ModuleSerializer(NetBoxModelSerializer):
             'asset_tag', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
         ]
         brief_fields = ('id', 'url', 'display', 'device', 'module_bay', 'module_type', 'description')
+
+
+class MACAddressSerializer(NetBoxModelSerializer):
+
+    class Meta:
+        model = MACAddress
+        fields = ['mac_address', 'is_primary']
+        brief_fields = ('mac_address',)