From 91f1cdb3551186999c7b0a0a31991900b628f33d Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 5 Jun 2024 10:21:43 -0700 Subject: [PATCH] 15156 fix tests --- netbox/dcim/api/nested_serializers.py | 20 +++++++++---------- netbox/dcim/api/serializers_/cables.py | 2 +- .../api/serializers_/devicetype_components.py | 20 +++++++++---------- netbox/extras/api/nested_serializers.py | 4 ++-- netbox/extras/api/serializers_/attachments.py | 2 +- netbox/extras/api/serializers_/bookmarks.py | 2 +- netbox/extras/api/serializers_/objecttypes.py | 2 +- netbox/ipam/api/serializers_/fhrpgroups.py | 2 +- netbox/tenancy/api/nested_serializers.py | 2 +- netbox/tenancy/api/serializers_/contacts.py | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index 89e05fd08..8f4d97d34 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -194,7 +194,7 @@ class NestedModuleTypeSerializer(WritableNestedSerializer): class NestedConsolePortTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.ConsolePortTemplate @@ -203,7 +203,7 @@ class NestedConsolePortTemplateSerializer(WritableNestedSerializer): class NestedConsoleServerPortTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.ConsoleServerPortTemplate @@ -212,7 +212,7 @@ class NestedConsoleServerPortTemplateSerializer(WritableNestedSerializer): class NestedPowerPortTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.PowerPortTemplate @@ -221,7 +221,7 @@ class NestedPowerPortTemplateSerializer(WritableNestedSerializer): class NestedPowerOutletTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlettemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlettemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.PowerOutletTemplate @@ -230,7 +230,7 @@ class NestedPowerOutletTemplateSerializer(WritableNestedSerializer): class NestedInterfaceTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfacetemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interfacetemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.InterfaceTemplate @@ -239,7 +239,7 @@ class NestedInterfaceTemplateSerializer(WritableNestedSerializer): class NestedRearPortTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.RearPortTemplate @@ -248,7 +248,7 @@ class NestedRearPortTemplateSerializer(WritableNestedSerializer): class NestedFrontPortTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.FrontPortTemplate @@ -257,7 +257,7 @@ class NestedFrontPortTemplateSerializer(WritableNestedSerializer): class NestedModuleBayTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebaytemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebaytemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.ModuleBayTemplate @@ -266,7 +266,7 @@ class NestedModuleBayTemplateSerializer(WritableNestedSerializer): class NestedDeviceBayTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebaytemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebaytemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.DeviceBayTemplate @@ -275,7 +275,7 @@ class NestedDeviceBayTemplateSerializer(WritableNestedSerializer): class NestedInventoryItemTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemtemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemtemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) class Meta: diff --git a/netbox/dcim/api/serializers_/cables.py b/netbox/dcim/api/serializers_/cables.py index e1e69a8fa..1881df41a 100644 --- a/netbox/dcim/api/serializers_/cables.py +++ b/netbox/dcim/api/serializers_/cables.py @@ -55,7 +55,7 @@ class TracedCableSerializer(serializers.ModelSerializer): class CableTerminationSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cabletermination-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cabletermination') + display_url = serializers.CharField(allow_null=True, read_only=True) termination_type = ContentTypeField( queryset=ContentType.objects.filter(CABLE_TERMINATION_MODELS) ) diff --git a/netbox/dcim/api/serializers_/devicetype_components.py b/netbox/dcim/api/serializers_/devicetype_components.py index 813cd872f..cd72236f4 100644 --- a/netbox/dcim/api/serializers_/devicetype_components.py +++ b/netbox/dcim/api/serializers_/devicetype_components.py @@ -33,7 +33,7 @@ __all__ = ( class ConsolePortTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True, required=False, @@ -63,7 +63,7 @@ class ConsolePortTemplateSerializer(ValidatedModelSerializer): class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True, required=False, @@ -93,7 +93,7 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer): class PowerPortTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True, required=False, @@ -124,7 +124,7 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): class PowerOutletTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlettemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlettemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True, required=False, @@ -166,7 +166,7 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer): class InterfaceTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfacetemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interfacetemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True, required=False, @@ -214,7 +214,7 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer): class RearPortTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( required=False, nested=True, @@ -240,7 +240,7 @@ class RearPortTemplateSerializer(ValidatedModelSerializer): class FrontPortTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontporttemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True, required=False, @@ -267,7 +267,7 @@ class FrontPortTemplateSerializer(ValidatedModelSerializer): class ModuleBayTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebaytemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebaytemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True ) @@ -283,7 +283,7 @@ class ModuleBayTemplateSerializer(ValidatedModelSerializer): class DeviceBayTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebaytemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebaytemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True ) @@ -299,7 +299,7 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer): class InventoryItemTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemtemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemtemplate') + display_url = serializers.CharField(allow_null=True, read_only=True) device_type = DeviceTypeSerializer( nested=True ) diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py index b50175bc3..9368e5899 100644 --- a/netbox/extras/api/nested_serializers.py +++ b/netbox/extras/api/nested_serializers.py @@ -104,7 +104,7 @@ class NestedSavedFilterSerializer(WritableNestedSerializer): class NestedBookmarkSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:bookmark-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:bookmark') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.Bookmark @@ -113,7 +113,7 @@ class NestedBookmarkSerializer(WritableNestedSerializer): class NestedImageAttachmentSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:imageattachment') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.ImageAttachment diff --git a/netbox/extras/api/serializers_/attachments.py b/netbox/extras/api/serializers_/attachments.py index 646ec3255..d69555536 100644 --- a/netbox/extras/api/serializers_/attachments.py +++ b/netbox/extras/api/serializers_/attachments.py @@ -15,7 +15,7 @@ __all__ = ( class ImageAttachmentSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:imageattachment') + display_url = serializers.CharField(allow_null=True, read_only=True) object_type = ContentTypeField( queryset=ObjectType.objects.all() ) diff --git a/netbox/extras/api/serializers_/bookmarks.py b/netbox/extras/api/serializers_/bookmarks.py index 244735833..ea9cb4e69 100644 --- a/netbox/extras/api/serializers_/bookmarks.py +++ b/netbox/extras/api/serializers_/bookmarks.py @@ -15,7 +15,7 @@ __all__ = ( class BookmarkSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:bookmark-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:bookmark') + display_url = serializers.CharField(allow_null=True, read_only=True) object_type = ContentTypeField( queryset=ObjectType.objects.with_feature('bookmarks'), ) diff --git a/netbox/extras/api/serializers_/objecttypes.py b/netbox/extras/api/serializers_/objecttypes.py index aea480793..9f0b38819 100644 --- a/netbox/extras/api/serializers_/objecttypes.py +++ b/netbox/extras/api/serializers_/objecttypes.py @@ -10,7 +10,7 @@ __all__ = ( class ObjectTypeSerializer(BaseModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:objecttype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:objecttype') + display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = ObjectType diff --git a/netbox/ipam/api/serializers_/fhrpgroups.py b/netbox/ipam/api/serializers_/fhrpgroups.py index ebc5e1d5e..4990acf2b 100644 --- a/netbox/ipam/api/serializers_/fhrpgroups.py +++ b/netbox/ipam/api/serializers_/fhrpgroups.py @@ -30,7 +30,7 @@ class FHRPGroupSerializer(NetBoxModelSerializer): class FHRPGroupAssignmentSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:fhrpgroupassignment-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroupassignment') + display_url = serializers.CharField(allow_null=True, read_only=True) group = FHRPGroupSerializer(nested=True) interface_type = ContentTypeField( queryset=ContentType.objects.all() diff --git a/netbox/tenancy/api/nested_serializers.py b/netbox/tenancy/api/nested_serializers.py index fe8f9ad8b..ef7a1b03a 100644 --- a/netbox/tenancy/api/nested_serializers.py +++ b/netbox/tenancy/api/nested_serializers.py @@ -79,7 +79,7 @@ class NestedContactSerializer(WritableNestedSerializer): class NestedContactAssignmentSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactassignment-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactassignment') + display_url = serializers.CharField(allow_null=True, read_only=True) contact = NestedContactSerializer() role = NestedContactRoleSerializer diff --git a/netbox/tenancy/api/serializers_/contacts.py b/netbox/tenancy/api/serializers_/contacts.py index 4b5b7827e..134638980 100644 --- a/netbox/tenancy/api/serializers_/contacts.py +++ b/netbox/tenancy/api/serializers_/contacts.py @@ -62,7 +62,7 @@ class ContactSerializer(NetBoxModelSerializer): class ContactAssignmentSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactassignment-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactassignment') + display_url = serializers.CharField(allow_null=True, read_only=True) object_type = ContentTypeField( queryset=ContentType.objects.all() )