From 15d80f4e1bc1fa53a50bff038112869617d38586 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 21 Apr 2023 08:56:17 -0700 Subject: [PATCH] 12195 remove incorrect null=True on choice fields --- netbox/ipam/api/serializers.py | 2 +- netbox/virtualization/api/serializers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index 10c27b252..6339ca60c 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -394,7 +394,7 @@ class IPAddressSerializer(NetBoxModelSerializer): vrf = NestedVRFSerializer(required=False, allow_null=True) tenant = NestedTenantSerializer(required=False, allow_null=True) status = ChoiceField(choices=IPAddressStatusChoices, required=False) - role = ChoiceField(choices=IPAddressRoleChoices, allow_blank=True, required=False, allow_null=True) + role = ChoiceField(choices=IPAddressRoleChoices, allow_blank=True, required=False) assigned_object_type = ContentTypeField( queryset=ContentType.objects.filter(IPADDRESS_ASSIGNMENT_MODELS), required=False, diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py index e53ce164e..7d0f1107e 100644 --- a/netbox/virtualization/api/serializers.py +++ b/netbox/virtualization/api/serializers.py @@ -114,7 +114,7 @@ class VMInterfaceSerializer(NetBoxModelSerializer): virtual_machine = NestedVirtualMachineSerializer() parent = NestedVMInterfaceSerializer(required=False, allow_null=True) bridge = NestedVMInterfaceSerializer(required=False, allow_null=True) - mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False, allow_null=True) + mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False) untagged_vlan = NestedVLANSerializer(required=False, allow_null=True) tagged_vlans = SerializedPKRelatedField( queryset=VLAN.objects.all(),