NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-30 04:16:24 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix serializer tests

Browse Source
This commit is contained in:
Brian Tiemann 2024-10-31 10:01:23 -04:00
parent dfaa354140
commit a631b69dc0
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
netbox/dcim/api/serializers_/device_components.py
View File

@ -164,6 +164,14 @@ class PowerOutletSerializer(NetBoxModelSerializer, CabledObjectSerializer, Conne
brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', 'cable', '_occupied') brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', 'cable', '_occupied')
class MACAddressSerializer(NetBoxModelSerializer):
class Meta:
model = MACAddress
fields = ['mac_address',]
brief_fields = ('mac_address',)
class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer): class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer):
device = DeviceSerializer(nested=True) device = DeviceSerializer(nested=True)
vdcs = SerializedPKRelatedField( vdcs = SerializedPKRelatedField(
@ -210,12 +218,7 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect
) )
count_ipaddresses = serializers.IntegerField(read_only=True) count_ipaddresses = serializers.IntegerField(read_only=True)
count_fhrp_groups = serializers.IntegerField(read_only=True) count_fhrp_groups = serializers.IntegerField(read_only=True)
mac_address = serializers.CharField( mac_address = MACAddressSerializer(read_only=True, allow_null=True)
required=False,
default=None,
allow_blank=True,
allow_null=True
)
wwn = serializers.CharField(required=False, default=None, allow_blank=True, allow_null=True) wwn = serializers.CharField(required=False, default=None, allow_blank=True, allow_null=True)
class Meta: class Meta:
@ -365,11 +368,3 @@ class InventoryItemSerializer(NetBoxModelSerializer):
serializer = get_serializer_for_model(obj.component) serializer = get_serializer_for_model(obj.component)
context = {'request': self.context['request']} context = {'request': self.context['request']}
return serializer(obj.component, nested=True, context=context).data return serializer(obj.component, nested=True, context=context).data
class MACAddressSerializer(NetBoxModelSerializer):
class Meta:
model = MACAddress
fields = ['mac_address',]
brief_fields = ('mac_address',)

7
netbox/virtualization/api/serializers_/virtualmachines.py
View File

@ -2,6 +2,7 @@ from drf_spectacular.utils import extend_schema_field
from rest_framework import serializers from rest_framework import serializers
from dcim.api.serializers_.devices import DeviceSerializer from dcim.api.serializers_.devices import DeviceSerializer
from dcim.api.serializers_.device_components import MACAddressSerializer
from dcim.api.serializers_.platforms import PlatformSerializer from dcim.api.serializers_.platforms import PlatformSerializer
from dcim.api.serializers_.roles import DeviceRoleSerializer from dcim.api.serializers_.roles import DeviceRoleSerializer
from dcim.api.serializers_.sites import SiteSerializer from dcim.api.serializers_.sites import SiteSerializer
@ -94,11 +95,7 @@ class VMInterfaceSerializer(NetBoxModelSerializer):
l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True) l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True)
count_ipaddresses = serializers.IntegerField(read_only=True) count_ipaddresses = serializers.IntegerField(read_only=True)
count_fhrp_groups = serializers.IntegerField(read_only=True) count_fhrp_groups = serializers.IntegerField(read_only=True)
mac_address = serializers.CharField( mac_address = MACAddressSerializer(read_only=True, allow_null=True)
required=False,
default=None,
allow_null=True
)
class Meta: class Meta:
model = VMInterface model = VMInterface