From d888fa30abe332dcf5a49ebb4f96d31e51318aa5 Mon Sep 17 00:00:00 2001 From: Arthur Date: Tue, 4 Jun 2024 14:47:07 -0700 Subject: [PATCH] 15156 fix view name --- docs/plugins/development/rest-api.md | 4 +- netbox/circuits/api/nested_serializers.py | 12 +-- netbox/circuits/api/serializers_/circuits.py | 8 +- netbox/circuits/api/serializers_/providers.py | 6 +- netbox/core/api/nested_serializers.py | 6 +- netbox/core/api/serializers_/data.py | 4 +- netbox/core/api/serializers_/jobs.py | 2 +- netbox/dcim/api/nested_serializers.py | 84 +++++++++---------- netbox/dcim/api/serializers_/cables.py | 6 +- .../api/serializers_/device_components.py | 22 ++--- netbox/dcim/api/serializers_/devices.py | 6 +- .../api/serializers_/devicetype_components.py | 20 ++--- netbox/dcim/api/serializers_/devicetypes.py | 4 +- netbox/dcim/api/serializers_/manufacturers.py | 2 +- netbox/dcim/api/serializers_/platforms.py | 2 +- netbox/dcim/api/serializers_/power.py | 4 +- netbox/dcim/api/serializers_/racks.py | 6 +- netbox/dcim/api/serializers_/roles.py | 4 +- netbox/dcim/api/serializers_/sites.py | 8 +- .../dcim/api/serializers_/virtualchassis.py | 2 +- netbox/extras/api/nested_serializers.py | 26 +++--- netbox/extras/api/serializers_/attachments.py | 2 +- netbox/extras/api/serializers_/bookmarks.py | 2 +- .../extras/api/serializers_/change_logging.py | 2 +- .../extras/api/serializers_/configcontexts.py | 2 +- .../api/serializers_/configtemplates.py | 2 +- .../extras/api/serializers_/customfields.py | 4 +- netbox/extras/api/serializers_/customlinks.py | 2 +- netbox/extras/api/serializers_/events.py | 4 +- .../api/serializers_/exporttemplates.py | 2 +- netbox/extras/api/serializers_/journaling.py | 2 +- netbox/extras/api/serializers_/objecttypes.py | 2 +- .../extras/api/serializers_/savedfilters.py | 2 +- netbox/extras/api/serializers_/scripts.py | 2 +- netbox/extras/api/serializers_/tags.py | 2 +- netbox/ipam/api/nested_serializers.py | 32 +++---- netbox/ipam/api/serializers_/asns.py | 6 +- netbox/ipam/api/serializers_/fhrpgroups.py | 4 +- netbox/ipam/api/serializers_/ip.py | 8 +- netbox/ipam/api/serializers_/roles.py | 2 +- netbox/ipam/api/serializers_/services.py | 4 +- netbox/ipam/api/serializers_/vlans.py | 4 +- netbox/ipam/api/serializers_/vrfs.py | 4 +- netbox/netbox/api/serializers/nested.py | 4 +- netbox/tenancy/api/nested_serializers.py | 12 +-- netbox/tenancy/api/serializers_/contacts.py | 8 +- netbox/tenancy/api/serializers_/tenants.py | 4 +- netbox/users/api/nested_serializers.py | 8 +- netbox/users/api/serializers_/permissions.py | 2 +- netbox/users/api/serializers_/tokens.py | 2 +- netbox/users/api/serializers_/users.py | 4 +- .../virtualization/api/nested_serializers.py | 12 +-- .../api/serializers_/clusters.py | 6 +- .../api/serializers_/virtualmachines.py | 6 +- netbox/vpn/api/nested_serializers.py | 20 ++--- netbox/vpn/api/serializers_/crypto.py | 10 +-- netbox/vpn/api/serializers_/l2vpn.py | 4 +- netbox/vpn/api/serializers_/tunnels.py | 6 +- netbox/wireless/api/nested_serializers.py | 6 +- .../wireless/api/serializers_/wirelesslans.py | 4 +- .../api/serializers_/wirelesslinks.py | 2 +- 61 files changed, 227 insertions(+), 227 deletions(-) diff --git a/docs/plugins/development/rest-api.md b/docs/plugins/development/rest-api.md index 1563ae1c5..d109ff3c5 100644 --- a/docs/plugins/development/rest-api.md +++ b/docs/plugins/development/rest-api.md @@ -40,7 +40,7 @@ class MyModelSerializer(NetBoxModelSerializer): view_name='plugins-api:myplugin-api:mymodel-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='plugins:myplugin:mymodel-detail' + view_name='plugins:myplugin:mymodel' ) class Meta: @@ -70,7 +70,7 @@ class NestedMyModelSerializer(WritableNestedSerializer): view_name='plugins-api:myplugin-api:mymodel-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='plugins:myplugin:mymodel-detail' + view_name='plugins:myplugin:mymodel' ) class Meta: diff --git a/netbox/circuits/api/nested_serializers.py b/netbox/circuits/api/nested_serializers.py index 37e91105b..eda79d9a3 100644 --- a/netbox/circuits/api/nested_serializers.py +++ b/netbox/circuits/api/nested_serializers.py @@ -21,7 +21,7 @@ __all__ = [ class NestedProviderNetworkSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:providernetwork-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:providernetwork-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:providernetwork') class Meta: model = ProviderNetwork @@ -37,7 +37,7 @@ class NestedProviderNetworkSerializer(WritableNestedSerializer): ) class NestedProviderSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provider-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provider') circuit_count = RelatedObjectCountField('circuits') class Meta: @@ -51,7 +51,7 @@ class NestedProviderSerializer(WritableNestedSerializer): class NestedProviderAccountSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provideraccount-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provideraccount-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provideraccount') class Meta: model = ProviderAccount @@ -67,7 +67,7 @@ class NestedProviderAccountSerializer(WritableNestedSerializer): ) class NestedCircuitTypeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittype') circuit_count = RelatedObjectCountField('circuits') class Meta: @@ -77,7 +77,7 @@ class NestedCircuitTypeSerializer(WritableNestedSerializer): class NestedCircuitSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuit-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuit') class Meta: model = Circuit @@ -86,7 +86,7 @@ class NestedCircuitSerializer(WritableNestedSerializer): class NestedCircuitTerminationSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittermination-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittermination') circuit = NestedCircuitSerializer() class Meta: diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index d431416a5..220425ecd 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -19,7 +19,7 @@ __all__ = ( class CircuitTypeSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittype') # Related object counts circuit_count = RelatedObjectCountField('circuits') @@ -35,7 +35,7 @@ class CircuitTypeSerializer(NetBoxModelSerializer): class CircuitCircuitTerminationSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittermination-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittermination') site = SiteSerializer(nested=True, allow_null=True) provider_network = ProviderNetworkSerializer(nested=True, allow_null=True) @@ -49,7 +49,7 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer): class CircuitSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuit-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuit') provider = ProviderSerializer(nested=True) provider_account = ProviderAccountSerializer(nested=True, required=False, allow_null=True, default=None) status = ChoiceField(choices=CircuitStatusChoices, required=False) @@ -70,7 +70,7 @@ class CircuitSerializer(NetBoxModelSerializer): class CircuitTerminationSerializer(NetBoxModelSerializer, CabledObjectSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittermination-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:circuittermination') circuit = CircuitSerializer(nested=True) site = SiteSerializer(nested=True, required=False, allow_null=True) provider_network = ProviderNetworkSerializer(nested=True, required=False, allow_null=True) diff --git a/netbox/circuits/api/serializers_/providers.py b/netbox/circuits/api/serializers_/providers.py index 6e9eee1f0..02c74ecf3 100644 --- a/netbox/circuits/api/serializers_/providers.py +++ b/netbox/circuits/api/serializers_/providers.py @@ -16,7 +16,7 @@ __all__ = ( class ProviderSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provider-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provider') accounts = SerializedPKRelatedField( queryset=ProviderAccount.objects.all(), serializer=NestedProviderAccountSerializer, @@ -45,7 +45,7 @@ class ProviderSerializer(NetBoxModelSerializer): class ProviderAccountSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provideraccount-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provideraccount-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:provideraccount') provider = ProviderSerializer(nested=True) name = serializers.CharField(allow_blank=True, max_length=100, required=False, default='') @@ -60,7 +60,7 @@ class ProviderAccountSerializer(NetBoxModelSerializer): class ProviderNetworkSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='circuits-api:providernetwork-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='circuits:providernetwork-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='circuits:providernetwork') provider = ProviderSerializer(nested=True) class Meta: diff --git a/netbox/core/api/nested_serializers.py b/netbox/core/api/nested_serializers.py index 28a8b1e70..b5f249435 100644 --- a/netbox/core/api/nested_serializers.py +++ b/netbox/core/api/nested_serializers.py @@ -15,7 +15,7 @@ __all__ = ( class NestedDataSourceSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='core-api:datasource-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='core:datasource-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='core:datasource') class Meta: model = DataSource @@ -24,7 +24,7 @@ class NestedDataSourceSerializer(WritableNestedSerializer): class NestedDataFileSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='core-api:datafile-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='core:datafile-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='core:datafile') class Meta: model = DataFile @@ -33,7 +33,7 @@ class NestedDataFileSerializer(WritableNestedSerializer): class NestedJobSerializer(serializers.ModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='core-api:job-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='core:job-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='core:job') status = ChoiceField(choices=JobStatusChoices) user = UserSerializer( nested=True, diff --git a/netbox/core/api/serializers_/data.py b/netbox/core/api/serializers_/data.py index 0832a06e1..faf22c79a 100644 --- a/netbox/core/api/serializers_/data.py +++ b/netbox/core/api/serializers_/data.py @@ -17,7 +17,7 @@ class DataSourceSerializer(NetBoxModelSerializer): view_name='core-api:datasource-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='core:datasource-detail' + view_name='core:datasource' ) type = ChoiceField( choices=get_data_backend_choices() @@ -44,7 +44,7 @@ class DataFileSerializer(NetBoxModelSerializer): view_name='core-api:datafile-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='core:datafile-detail' + view_name='core:datafile' ) source = DataSourceSerializer( nested=True, diff --git a/netbox/core/api/serializers_/jobs.py b/netbox/core/api/serializers_/jobs.py index 2edf60949..8635e74df 100644 --- a/netbox/core/api/serializers_/jobs.py +++ b/netbox/core/api/serializers_/jobs.py @@ -13,7 +13,7 @@ __all__ = ( class JobSerializer(BaseModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='core-api:job-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='core:job-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='core:job') user = UserSerializer( nested=True, read_only=True diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index a59316be8..89e05fd08 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -58,7 +58,7 @@ __all__ = [ ) class NestedRegionSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:region-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:region') site_count = serializers.IntegerField(read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) @@ -72,7 +72,7 @@ class NestedRegionSerializer(WritableNestedSerializer): ) class NestedSiteGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:sitegroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:sitegroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:sitegroup') site_count = serializers.IntegerField(read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) @@ -83,7 +83,7 @@ class NestedSiteGroupSerializer(WritableNestedSerializer): class NestedSiteSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:site-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:site-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:site') class Meta: model = models.Site @@ -99,7 +99,7 @@ class NestedSiteSerializer(WritableNestedSerializer): ) class NestedLocationSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:location-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:location-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:location') rack_count = serializers.IntegerField(read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) @@ -113,7 +113,7 @@ class NestedLocationSerializer(WritableNestedSerializer): ) class NestedRackRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackrole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackrole') rack_count = RelatedObjectCountField('racks') class Meta: @@ -126,7 +126,7 @@ class NestedRackRoleSerializer(WritableNestedSerializer): ) class NestedRackSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rack-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rack') device_count = RelatedObjectCountField('devices') class Meta: @@ -136,7 +136,7 @@ class NestedRackSerializer(WritableNestedSerializer): class NestedRackReservationSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackreservation-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackreservation-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackreservation') user = serializers.SerializerMethodField(read_only=True) class Meta: @@ -156,7 +156,7 @@ class NestedRackReservationSerializer(WritableNestedSerializer): ) class NestedManufacturerSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:manufacturer-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:manufacturer') devicetype_count = RelatedObjectCountField('device_types') class Meta: @@ -169,7 +169,7 @@ class NestedManufacturerSerializer(WritableNestedSerializer): ) class NestedDeviceTypeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicetype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicetype') manufacturer = NestedManufacturerSerializer(read_only=True) device_count = RelatedObjectCountField('instances') @@ -180,7 +180,7 @@ class NestedDeviceTypeSerializer(WritableNestedSerializer): class NestedModuleTypeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:moduletype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:moduletype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:moduletype') manufacturer = NestedManufacturerSerializer(read_only=True) class Meta: @@ -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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlettemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interfacetemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebaytemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebaytemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemtemplate') _depth = serializers.IntegerField(source='level', read_only=True) class Meta: @@ -292,7 +292,7 @@ class NestedInventoryItemTemplateSerializer(WritableNestedSerializer): ) class NestedDeviceRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicerole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicerole') device_count = RelatedObjectCountField('devices') virtualmachine_count = RelatedObjectCountField('virtual_machines') @@ -306,7 +306,7 @@ class NestedDeviceRoleSerializer(WritableNestedSerializer): ) class NestedPlatformSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:platform-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:platform') device_count = RelatedObjectCountField('devices') virtualmachine_count = RelatedObjectCountField('virtual_machines') @@ -317,7 +317,7 @@ class NestedPlatformSerializer(WritableNestedSerializer): class NestedDeviceSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:device-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:device') class Meta: model = models.Device @@ -326,7 +326,7 @@ class NestedDeviceSerializer(WritableNestedSerializer): class ModuleNestedModuleBaySerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebay-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebay-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebay') class Meta: model = models.ModuleBay @@ -335,7 +335,7 @@ class ModuleNestedModuleBaySerializer(WritableNestedSerializer): class ModuleBayNestedModuleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:module-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:module-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:module') class Meta: model = models.Module @@ -344,7 +344,7 @@ class ModuleBayNestedModuleSerializer(WritableNestedSerializer): class NestedModuleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:module-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:module-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:module') device = NestedDeviceSerializer(read_only=True) module_bay = ModuleNestedModuleBaySerializer(read_only=True) module_type = NestedModuleTypeSerializer(read_only=True) @@ -356,7 +356,7 @@ class NestedModuleSerializer(WritableNestedSerializer): class NestedConsoleServerPortSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverport') device = NestedDeviceSerializer(read_only=True) _occupied = serializers.BooleanField(required=False, read_only=True) @@ -367,7 +367,7 @@ class NestedConsoleServerPortSerializer(WritableNestedSerializer): class NestedConsolePortSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleport') device = NestedDeviceSerializer(read_only=True) _occupied = serializers.BooleanField(required=False, read_only=True) @@ -378,7 +378,7 @@ class NestedConsolePortSerializer(WritableNestedSerializer): class NestedPowerOutletSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlet-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlet') device = NestedDeviceSerializer(read_only=True) _occupied = serializers.BooleanField(required=False, read_only=True) @@ -389,7 +389,7 @@ class NestedPowerOutletSerializer(WritableNestedSerializer): class NestedPowerPortSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerport') device = NestedDeviceSerializer(read_only=True) _occupied = serializers.BooleanField(required=False, read_only=True) @@ -401,7 +401,7 @@ class NestedPowerPortSerializer(WritableNestedSerializer): class NestedInterfaceSerializer(WritableNestedSerializer): device = NestedDeviceSerializer(read_only=True) url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interface-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interface') _occupied = serializers.BooleanField(required=False, read_only=True) class Meta: @@ -412,7 +412,7 @@ class NestedInterfaceSerializer(WritableNestedSerializer): class NestedRearPortSerializer(WritableNestedSerializer): device = NestedDeviceSerializer(read_only=True) url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearport') _occupied = serializers.BooleanField(required=False, read_only=True) class Meta: @@ -423,7 +423,7 @@ class NestedRearPortSerializer(WritableNestedSerializer): class NestedFrontPortSerializer(WritableNestedSerializer): device = NestedDeviceSerializer(read_only=True) url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontport') _occupied = serializers.BooleanField(required=False, read_only=True) class Meta: @@ -433,7 +433,7 @@ class NestedFrontPortSerializer(WritableNestedSerializer): class NestedModuleBaySerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebay-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebay-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebay') installed_module = ModuleBayNestedModuleSerializer(required=False, allow_null=True) class Meta: @@ -443,7 +443,7 @@ class NestedModuleBaySerializer(WritableNestedSerializer): class NestedDeviceBaySerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebay-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebay-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebay') device = NestedDeviceSerializer(read_only=True) class Meta: @@ -453,7 +453,7 @@ class NestedDeviceBaySerializer(WritableNestedSerializer): class NestedInventoryItemSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitem-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitem-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitem') device = NestedDeviceSerializer(read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) @@ -467,7 +467,7 @@ class NestedInventoryItemSerializer(WritableNestedSerializer): ) class NestedInventoryItemRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemrole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemrole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemrole') inventoryitem_count = RelatedObjectCountField('inventory_items') class Meta: @@ -481,7 +481,7 @@ class NestedInventoryItemRoleSerializer(WritableNestedSerializer): class NestedCableSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cable-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cable') class Meta: model = models.Cable @@ -497,7 +497,7 @@ class NestedCableSerializer(WritableNestedSerializer): ) class NestedVirtualChassisSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualchassis-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualchassis') master = NestedDeviceSerializer() member_count = serializers.IntegerField(read_only=True) @@ -515,7 +515,7 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer): ) class NestedPowerPanelSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerpanel-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerpanel') powerfeed_count = RelatedObjectCountField('powerfeeds') class Meta: @@ -525,7 +525,7 @@ class NestedPowerPanelSerializer(WritableNestedSerializer): class NestedPowerFeedSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerfeed-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerfeed') _occupied = serializers.BooleanField(required=False, read_only=True) class Meta: @@ -535,7 +535,7 @@ class NestedPowerFeedSerializer(WritableNestedSerializer): class NestedVirtualDeviceContextSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualdevicecontext-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualdevicecontext-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualdevicecontext') device = NestedDeviceSerializer() class Meta: diff --git a/netbox/dcim/api/serializers_/cables.py b/netbox/dcim/api/serializers_/cables.py index bd408aa66..e1e69a8fa 100644 --- a/netbox/dcim/api/serializers_/cables.py +++ b/netbox/dcim/api/serializers_/cables.py @@ -22,7 +22,7 @@ __all__ = ( class CableSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cable-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cable') a_terminations = GenericObjectSerializer(many=True, required=False) b_terminations = GenericObjectSerializer(many=True, required=False) status = ChoiceField(choices=LinkStatusChoices, required=False) @@ -44,7 +44,7 @@ class TracedCableSerializer(serializers.ModelSerializer): Used only while tracing a cable path. """ url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cable-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cable') class Meta: model = Cable @@ -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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cabletermination') termination_type = ContentTypeField( queryset=ContentType.objects.filter(CABLE_TERMINATION_MODELS) ) diff --git a/netbox/dcim/api/serializers_/device_components.py b/netbox/dcim/api/serializers_/device_components.py index 11d2a362a..0a842960b 100644 --- a/netbox/dcim/api/serializers_/device_components.py +++ b/netbox/dcim/api/serializers_/device_components.py @@ -42,7 +42,7 @@ __all__ = ( class ConsoleServerPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverport') device = DeviceSerializer(nested=True) module = ModuleSerializer( nested=True, @@ -74,7 +74,7 @@ class ConsoleServerPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, class ConsolePortSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleport') device = DeviceSerializer(nested=True) module = ModuleSerializer( nested=True, @@ -106,7 +106,7 @@ class ConsolePortSerializer(NetBoxModelSerializer, CabledObjectSerializer, Conne class PowerPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerport') device = DeviceSerializer(nested=True) module = ModuleSerializer( nested=True, @@ -134,7 +134,7 @@ class PowerPortSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect class PowerOutletSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlet-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlet') device = DeviceSerializer(nested=True) module = ModuleSerializer( nested=True, @@ -173,7 +173,7 @@ class PowerOutletSerializer(NetBoxModelSerializer, CabledObjectSerializer, Conne class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interface-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interface') device = DeviceSerializer(nested=True) vdcs = SerializedPKRelatedField( queryset=VirtualDeviceContext.objects.all(), @@ -256,7 +256,7 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect class RearPortSerializer(NetBoxModelSerializer, CabledObjectSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearport') device = DeviceSerializer(nested=True) module = ModuleSerializer( nested=True, @@ -281,7 +281,7 @@ class FrontPortRearPortSerializer(WritableNestedSerializer): NestedRearPortSerializer but with parent device omitted (since front and rear ports must belong to same device) """ url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearport') class Meta: model = RearPort @@ -290,7 +290,7 @@ class FrontPortRearPortSerializer(WritableNestedSerializer): class FrontPortSerializer(NetBoxModelSerializer, CabledObjectSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontport-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontport') device = DeviceSerializer(nested=True) module = ModuleSerializer( nested=True, @@ -313,7 +313,7 @@ class FrontPortSerializer(NetBoxModelSerializer, CabledObjectSerializer): class ModuleBaySerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebay-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebay-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebay') device = DeviceSerializer(nested=True) installed_module = ModuleSerializer( nested=True, @@ -333,7 +333,7 @@ class ModuleBaySerializer(NetBoxModelSerializer): class DeviceBaySerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebay-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebay-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebay') device = DeviceSerializer(nested=True) installed_device = DeviceSerializer(nested=True, required=False, allow_null=True) @@ -348,7 +348,7 @@ class DeviceBaySerializer(NetBoxModelSerializer): class InventoryItemSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitem-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitem-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitem') device = DeviceSerializer(nested=True) parent = serializers.PrimaryKeyRelatedField(queryset=InventoryItem.objects.all(), allow_null=True, default=None) role = InventoryItemRoleSerializer(nested=True, required=False, allow_null=True) diff --git a/netbox/dcim/api/serializers_/devices.py b/netbox/dcim/api/serializers_/devices.py index c3e46fbbd..730b4e60c 100644 --- a/netbox/dcim/api/serializers_/devices.py +++ b/netbox/dcim/api/serializers_/devices.py @@ -30,7 +30,7 @@ __all__ = ( class DeviceSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:device-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:device') device_type = DeviceTypeSerializer(nested=True) role = DeviceRoleSerializer(nested=True) tenant = TenantSerializer( @@ -122,7 +122,7 @@ class DeviceWithConfigContextSerializer(DeviceSerializer): class VirtualDeviceContextSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualdevicecontext-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualdevicecontext-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualdevicecontext') device = DeviceSerializer(nested=True) identifier = serializers.IntegerField(allow_null=True, max_value=32767, min_value=0, required=False, default=None) tenant = TenantSerializer(nested=True, required=False, allow_null=True, default=None) @@ -146,7 +146,7 @@ class VirtualDeviceContextSerializer(NetBoxModelSerializer): class ModuleSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:module-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:module-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:module') device = DeviceSerializer(nested=True) module_bay = NestedModuleBaySerializer() module_type = ModuleTypeSerializer(nested=True) diff --git a/netbox/dcim/api/serializers_/devicetype_components.py b/netbox/dcim/api/serializers_/devicetype_components.py index 72fe88622..813cd872f 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlettemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interfacetemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontporttemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebaytemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebaytemplate') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemtemplate') device_type = DeviceTypeSerializer( nested=True ) diff --git a/netbox/dcim/api/serializers_/devicetypes.py b/netbox/dcim/api/serializers_/devicetypes.py index 1b685b368..cfe5a19fd 100644 --- a/netbox/dcim/api/serializers_/devicetypes.py +++ b/netbox/dcim/api/serializers_/devicetypes.py @@ -18,7 +18,7 @@ __all__ = ( class DeviceTypeSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicetype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicetype') manufacturer = ManufacturerSerializer(nested=True) default_platform = PlatformSerializer(nested=True, required=False, allow_null=True) u_height = serializers.DecimalField( @@ -65,7 +65,7 @@ class DeviceTypeSerializer(NetBoxModelSerializer): class ModuleTypeSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:moduletype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:moduletype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:moduletype') manufacturer = ManufacturerSerializer(nested=True) weight_unit = ChoiceField(choices=WeightUnitChoices, allow_blank=True, required=False, allow_null=True) diff --git a/netbox/dcim/api/serializers_/manufacturers.py b/netbox/dcim/api/serializers_/manufacturers.py index 814c05177..671222f27 100644 --- a/netbox/dcim/api/serializers_/manufacturers.py +++ b/netbox/dcim/api/serializers_/manufacturers.py @@ -11,7 +11,7 @@ __all__ = ( class ManufacturerSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:manufacturer-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:manufacturer') # Related object counts devicetype_count = RelatedObjectCountField('device_types') diff --git a/netbox/dcim/api/serializers_/platforms.py b/netbox/dcim/api/serializers_/platforms.py index 3de1e88f7..e61520b63 100644 --- a/netbox/dcim/api/serializers_/platforms.py +++ b/netbox/dcim/api/serializers_/platforms.py @@ -13,7 +13,7 @@ __all__ = ( class PlatformSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:platform-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:platform') manufacturer = ManufacturerSerializer(nested=True, required=False, allow_null=True) config_template = ConfigTemplateSerializer(nested=True, required=False, allow_null=True, default=None) diff --git a/netbox/dcim/api/serializers_/power.py b/netbox/dcim/api/serializers_/power.py index a83dda0e4..601d52348 100644 --- a/netbox/dcim/api/serializers_/power.py +++ b/netbox/dcim/api/serializers_/power.py @@ -18,7 +18,7 @@ __all__ = ( class PowerPanelSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerpanel-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerpanel') site = SiteSerializer(nested=True) location = LocationSerializer( nested=True, @@ -41,7 +41,7 @@ class PowerPanelSerializer(NetBoxModelSerializer): class PowerFeedSerializer(NetBoxModelSerializer, CabledObjectSerializer, ConnectedEndpointsSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerfeed-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerfeed') power_panel = PowerPanelSerializer(nested=True) rack = RackSerializer( nested=True, diff --git a/netbox/dcim/api/serializers_/racks.py b/netbox/dcim/api/serializers_/racks.py index 2483208d1..6c741918c 100644 --- a/netbox/dcim/api/serializers_/racks.py +++ b/netbox/dcim/api/serializers_/racks.py @@ -21,7 +21,7 @@ __all__ = ( class RackRoleSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackrole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackrole') # Related object counts rack_count = RelatedObjectCountField('racks') @@ -37,7 +37,7 @@ class RackRoleSerializer(NetBoxModelSerializer): class RackSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rack-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rack') site = SiteSerializer(nested=True) location = LocationSerializer(nested=True, required=False, allow_null=True, default=None) tenant = TenantSerializer(nested=True, required=False, allow_null=True) @@ -67,7 +67,7 @@ class RackSerializer(NetBoxModelSerializer): class RackReservationSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackreservation-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackreservation-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rackreservation') rack = RackSerializer(nested=True) user = UserSerializer(nested=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True) diff --git a/netbox/dcim/api/serializers_/roles.py b/netbox/dcim/api/serializers_/roles.py index fbb2799a6..aec7f3346 100644 --- a/netbox/dcim/api/serializers_/roles.py +++ b/netbox/dcim/api/serializers_/roles.py @@ -13,7 +13,7 @@ __all__ = ( class DeviceRoleSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicerole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicerole') config_template = ConfigTemplateSerializer(nested=True, required=False, allow_null=True, default=None) # Related object counts @@ -31,7 +31,7 @@ class DeviceRoleSerializer(NetBoxModelSerializer): class InventoryItemRoleSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemrole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemrole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemrole') # Related object counts inventoryitem_count = RelatedObjectCountField('inventory_items') diff --git a/netbox/dcim/api/serializers_/sites.py b/netbox/dcim/api/serializers_/sites.py index 4e23b1a09..4cc255cd4 100644 --- a/netbox/dcim/api/serializers_/sites.py +++ b/netbox/dcim/api/serializers_/sites.py @@ -20,7 +20,7 @@ __all__ = ( class RegionSerializer(NestedGroupModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:region-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:region') parent = NestedRegionSerializer(required=False, allow_null=True, default=None) site_count = serializers.IntegerField(read_only=True, default=0) @@ -35,7 +35,7 @@ class RegionSerializer(NestedGroupModelSerializer): class SiteGroupSerializer(NestedGroupModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:sitegroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:sitegroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:sitegroup') parent = NestedSiteGroupSerializer(required=False, allow_null=True, default=None) site_count = serializers.IntegerField(read_only=True, default=0) @@ -50,7 +50,7 @@ class SiteGroupSerializer(NestedGroupModelSerializer): class SiteSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:site-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:site-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:site') status = ChoiceField(choices=SiteStatusChoices, required=False) region = RegionSerializer(nested=True, required=False, allow_null=True) group = SiteGroupSerializer(nested=True, required=False, allow_null=True) @@ -85,7 +85,7 @@ class SiteSerializer(NetBoxModelSerializer): class LocationSerializer(NestedGroupModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:location-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:location-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:location') site = SiteSerializer(nested=True) parent = NestedLocationSerializer(required=False, allow_null=True, default=None) status = ChoiceField(choices=LocationStatusChoices, required=False) diff --git a/netbox/dcim/api/serializers_/virtualchassis.py b/netbox/dcim/api/serializers_/virtualchassis.py index a033bc0ab..67e3b0f12 100644 --- a/netbox/dcim/api/serializers_/virtualchassis.py +++ b/netbox/dcim/api/serializers_/virtualchassis.py @@ -11,7 +11,7 @@ __all__ = ( class VirtualChassisSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualchassis-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='dcim:virtualchassis') master = NestedDeviceSerializer(required=False, allow_null=True, default=None) members = NestedDeviceSerializer(many=True, read_only=True) diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py index 17901c73c..b50175bc3 100644 --- a/netbox/extras/api/nested_serializers.py +++ b/netbox/extras/api/nested_serializers.py @@ -23,7 +23,7 @@ __all__ = [ class NestedEventRuleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:eventrule-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:eventrule-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:eventrule') class Meta: model = models.EventRule @@ -32,7 +32,7 @@ class NestedEventRuleSerializer(WritableNestedSerializer): class NestedWebhookSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:webhook-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:webhook-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:webhook') class Meta: model = models.Webhook @@ -41,7 +41,7 @@ class NestedWebhookSerializer(WritableNestedSerializer): class NestedCustomFieldSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:customfield-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfield-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfield') class Meta: model = models.CustomField @@ -50,7 +50,7 @@ class NestedCustomFieldSerializer(WritableNestedSerializer): class NestedCustomFieldChoiceSetSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:customfieldchoiceset-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfieldchoiceset-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfieldchoiceset') class Meta: model = models.CustomFieldChoiceSet @@ -59,7 +59,7 @@ class NestedCustomFieldChoiceSetSerializer(WritableNestedSerializer): class NestedCustomLinkSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:customlink-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:customlink-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:customlink') class Meta: model = models.CustomLink @@ -68,7 +68,7 @@ class NestedCustomLinkSerializer(WritableNestedSerializer): class NestedConfigContextSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:configcontext-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:configcontext-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:configcontext') class Meta: model = models.ConfigContext @@ -77,7 +77,7 @@ class NestedConfigContextSerializer(WritableNestedSerializer): class NestedConfigTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:configtemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:configtemplate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:configtemplate') class Meta: model = models.ConfigTemplate @@ -86,7 +86,7 @@ class NestedConfigTemplateSerializer(WritableNestedSerializer): class NestedExportTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:exporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:exporttemplate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:exporttemplate') class Meta: model = models.ExportTemplate @@ -95,7 +95,7 @@ class NestedExportTemplateSerializer(WritableNestedSerializer): class NestedSavedFilterSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:savedfilter-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:savedfilter-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:savedfilter') class Meta: model = models.SavedFilter @@ -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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:bookmark') 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:imageattachment') class Meta: model = models.ImageAttachment @@ -122,7 +122,7 @@ class NestedImageAttachmentSerializer(WritableNestedSerializer): class NestedJournalEntrySerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:journalentry-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:journalentry-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:journalentry') class Meta: model = models.JournalEntry @@ -136,7 +136,7 @@ class NestedScriptSerializer(WritableNestedSerializer): lookup_url_kwarg='pk' ) display_url = serializers.HyperlinkedIdentityField( - view_name='extras:script-detail', + view_name='extras:script', lookup_field='full_name', lookup_url_kwarg='pk' ) diff --git a/netbox/extras/api/serializers_/attachments.py b/netbox/extras/api/serializers_/attachments.py index adb8d6f1e..646ec3255 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:imageattachment') object_type = ContentTypeField( queryset=ObjectType.objects.all() ) diff --git a/netbox/extras/api/serializers_/bookmarks.py b/netbox/extras/api/serializers_/bookmarks.py index 0b85a68cd..244735833 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:bookmark') object_type = ContentTypeField( queryset=ObjectType.objects.with_feature('bookmarks'), ) diff --git a/netbox/extras/api/serializers_/change_logging.py b/netbox/extras/api/serializers_/change_logging.py index e312a866a..dc02e4a5a 100644 --- a/netbox/extras/api/serializers_/change_logging.py +++ b/netbox/extras/api/serializers_/change_logging.py @@ -16,7 +16,7 @@ __all__ = ( class ObjectChangeSerializer(BaseModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:objectchange-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:objectchange-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:objectchange') user = UserSerializer( nested=True, read_only=True diff --git a/netbox/extras/api/serializers_/configcontexts.py b/netbox/extras/api/serializers_/configcontexts.py index 747330140..e18a8b605 100644 --- a/netbox/extras/api/serializers_/configcontexts.py +++ b/netbox/extras/api/serializers_/configcontexts.py @@ -21,7 +21,7 @@ __all__ = ( class ConfigContextSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:configcontext-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:configcontext-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:configcontext') regions = SerializedPKRelatedField( queryset=Region.objects.all(), serializer=RegionSerializer, diff --git a/netbox/extras/api/serializers_/configtemplates.py b/netbox/extras/api/serializers_/configtemplates.py index fd8ef8c02..c6c277852 100644 --- a/netbox/extras/api/serializers_/configtemplates.py +++ b/netbox/extras/api/serializers_/configtemplates.py @@ -12,7 +12,7 @@ __all__ = ( class ConfigTemplateSerializer(TaggableModelSerializer, ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:configtemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:configtemplate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:configtemplate') data_source = DataSourceSerializer( nested=True, required=False diff --git a/netbox/extras/api/serializers_/customfields.py b/netbox/extras/api/serializers_/customfields.py index a765faf4b..d2f0af175 100644 --- a/netbox/extras/api/serializers_/customfields.py +++ b/netbox/extras/api/serializers_/customfields.py @@ -17,7 +17,7 @@ __all__ = ( class CustomFieldChoiceSetSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:customfieldchoiceset-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfieldchoiceset-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfieldchoiceset') base_choices = ChoiceField( choices=CustomFieldChoiceSetBaseChoices, required=False @@ -40,7 +40,7 @@ class CustomFieldChoiceSetSerializer(ValidatedModelSerializer): class CustomFieldSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:customfield-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfield-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:customfield') object_types = ContentTypeField( queryset=ObjectType.objects.with_feature('custom_fields'), many=True diff --git a/netbox/extras/api/serializers_/customlinks.py b/netbox/extras/api/serializers_/customlinks.py index 9ee321f65..f1728dc4c 100644 --- a/netbox/extras/api/serializers_/customlinks.py +++ b/netbox/extras/api/serializers_/customlinks.py @@ -12,7 +12,7 @@ __all__ = ( class CustomLinkSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:customlink-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:customlink-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:customlink') object_types = ContentTypeField( queryset=ObjectType.objects.with_feature('custom_links'), many=True diff --git a/netbox/extras/api/serializers_/events.py b/netbox/extras/api/serializers_/events.py index 7fd2cf3e1..e15b02afa 100644 --- a/netbox/extras/api/serializers_/events.py +++ b/netbox/extras/api/serializers_/events.py @@ -22,7 +22,7 @@ __all__ = ( class EventRuleSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:eventrule-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:eventrule-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:eventrule') object_types = ContentTypeField( queryset=ObjectType.objects.with_feature('event_rules'), many=True @@ -60,7 +60,7 @@ class EventRuleSerializer(NetBoxModelSerializer): class WebhookSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:webhook-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:webhook-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:webhook') class Meta: model = Webhook diff --git a/netbox/extras/api/serializers_/exporttemplates.py b/netbox/extras/api/serializers_/exporttemplates.py index e5b7b4737..a9d1db10b 100644 --- a/netbox/extras/api/serializers_/exporttemplates.py +++ b/netbox/extras/api/serializers_/exporttemplates.py @@ -13,7 +13,7 @@ __all__ = ( class ExportTemplateSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:exporttemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:exporttemplate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:exporttemplate') object_types = ContentTypeField( queryset=ObjectType.objects.with_feature('export_templates'), many=True diff --git a/netbox/extras/api/serializers_/journaling.py b/netbox/extras/api/serializers_/journaling.py index 2a31dccc3..721b918fa 100644 --- a/netbox/extras/api/serializers_/journaling.py +++ b/netbox/extras/api/serializers_/journaling.py @@ -17,7 +17,7 @@ __all__ = ( class JournalEntrySerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:journalentry-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:journalentry-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:journalentry') assigned_object_type = ContentTypeField( queryset=ObjectType.objects.all() ) diff --git a/netbox/extras/api/serializers_/objecttypes.py b/netbox/extras/api/serializers_/objecttypes.py index 7587901cd..aea480793 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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:objecttype') class Meta: model = ObjectType diff --git a/netbox/extras/api/serializers_/savedfilters.py b/netbox/extras/api/serializers_/savedfilters.py index 7358a76d6..8222ab275 100644 --- a/netbox/extras/api/serializers_/savedfilters.py +++ b/netbox/extras/api/serializers_/savedfilters.py @@ -12,7 +12,7 @@ __all__ = ( class SavedFilterSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:savedfilter-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:savedfilter-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:savedfilter') object_types = ContentTypeField( queryset=ObjectType.objects.all(), many=True diff --git a/netbox/extras/api/serializers_/scripts.py b/netbox/extras/api/serializers_/scripts.py index f5f9947b3..77dddc45f 100644 --- a/netbox/extras/api/serializers_/scripts.py +++ b/netbox/extras/api/serializers_/scripts.py @@ -15,7 +15,7 @@ __all__ = ( class ScriptSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:script-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:script-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:script') description = serializers.SerializerMethodField(read_only=True) vars = serializers.SerializerMethodField(read_only=True) result = JobSerializer(nested=True, read_only=True) diff --git a/netbox/extras/api/serializers_/tags.py b/netbox/extras/api/serializers_/tags.py index 21a02f7fa..f84decec5 100644 --- a/netbox/extras/api/serializers_/tags.py +++ b/netbox/extras/api/serializers_/tags.py @@ -12,7 +12,7 @@ __all__ = ( class TagSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:tag-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:tag-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:tag') object_types = ContentTypeField( queryset=ObjectType.objects.with_feature('tags'), many=True, diff --git a/netbox/ipam/api/nested_serializers.py b/netbox/ipam/api/nested_serializers.py index d3526e439..00f5f1d32 100644 --- a/netbox/ipam/api/nested_serializers.py +++ b/netbox/ipam/api/nested_serializers.py @@ -32,7 +32,7 @@ __all__ = [ class NestedASNRangeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:asnrange-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asnrange-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asnrange') class Meta: model = models.ASNRange @@ -45,7 +45,7 @@ class NestedASNRangeSerializer(WritableNestedSerializer): class NestedASNSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:asn-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asn-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asn') class Meta: model = models.ASN @@ -61,7 +61,7 @@ class NestedASNSerializer(WritableNestedSerializer): ) class NestedVRFSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vrf-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vrf') prefix_count = RelatedObjectCountField('prefixes') class Meta: @@ -75,7 +75,7 @@ class NestedVRFSerializer(WritableNestedSerializer): class NestedRouteTargetSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:routetarget-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:routetarget-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:routetarget') class Meta: model = models.RouteTarget @@ -91,7 +91,7 @@ class NestedRouteTargetSerializer(WritableNestedSerializer): ) class NestedRIRSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:rir-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:rir') aggregate_count = RelatedObjectCountField('aggregates') class Meta: @@ -101,7 +101,7 @@ class NestedRIRSerializer(WritableNestedSerializer): class NestedAggregateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:aggregate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:aggregate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:aggregate') family = serializers.IntegerField(read_only=True) class Meta: @@ -115,7 +115,7 @@ class NestedAggregateSerializer(WritableNestedSerializer): class NestedFHRPGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:fhrpgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroup') class Meta: model = models.FHRPGroup @@ -124,7 +124,7 @@ class NestedFHRPGroupSerializer(WritableNestedSerializer): class NestedFHRPGroupAssignmentSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:fhrpgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroup') group = NestedFHRPGroupSerializer() class Meta: @@ -141,7 +141,7 @@ class NestedFHRPGroupAssignmentSerializer(WritableNestedSerializer): ) class NestedRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:role-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:role') prefix_count = RelatedObjectCountField('prefixes') vlan_count = RelatedObjectCountField('vlans') @@ -155,7 +155,7 @@ class NestedRoleSerializer(WritableNestedSerializer): ) class NestedVLANGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlangroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlangroup') vlan_count = RelatedObjectCountField('vlans') class Meta: @@ -165,7 +165,7 @@ class NestedVLANGroupSerializer(WritableNestedSerializer): class NestedVLANSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlan-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlan') class Meta: model = models.VLAN @@ -178,7 +178,7 @@ class NestedVLANSerializer(WritableNestedSerializer): class NestedPrefixSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:prefix-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:prefix') family = serializers.IntegerField(read_only=True) _depth = serializers.IntegerField(read_only=True) @@ -193,7 +193,7 @@ class NestedPrefixSerializer(WritableNestedSerializer): class NestedIPRangeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:iprange-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:iprange-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:iprange') family = serializers.IntegerField(read_only=True) start_address = IPAddressField() end_address = IPAddressField() @@ -209,7 +209,7 @@ class NestedIPRangeSerializer(WritableNestedSerializer): class NestedIPAddressSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:ipaddress-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:ipaddress') family = serializers.IntegerField(read_only=True) address = IPAddressField() @@ -224,7 +224,7 @@ class NestedIPAddressSerializer(WritableNestedSerializer): class NestedServiceTemplateSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:servicetemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:servicetemplate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:servicetemplate') class Meta: model = models.ServiceTemplate @@ -233,7 +233,7 @@ class NestedServiceTemplateSerializer(WritableNestedSerializer): class NestedServiceSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:service-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:service-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:service') class Meta: model = models.Service diff --git a/netbox/ipam/api/serializers_/asns.py b/netbox/ipam/api/serializers_/asns.py index 615b93bf8..13ca47f8c 100644 --- a/netbox/ipam/api/serializers_/asns.py +++ b/netbox/ipam/api/serializers_/asns.py @@ -15,7 +15,7 @@ __all__ = ( class RIRSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:rir-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:rir') # Related object counts aggregate_count = RelatedObjectCountField('aggregates') @@ -31,7 +31,7 @@ class RIRSerializer(NetBoxModelSerializer): class ASNRangeSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:asnrange-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asnrange-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asnrange') rir = RIRSerializer(nested=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True) asn_count = serializers.IntegerField(read_only=True) @@ -47,7 +47,7 @@ class ASNRangeSerializer(NetBoxModelSerializer): class ASNSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:asn-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asn-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:asn') rir = RIRSerializer(nested=True, required=False, allow_null=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True) diff --git a/netbox/ipam/api/serializers_/fhrpgroups.py b/netbox/ipam/api/serializers_/fhrpgroups.py index f2da9767c..ebc5e1d5e 100644 --- a/netbox/ipam/api/serializers_/fhrpgroups.py +++ b/netbox/ipam/api/serializers_/fhrpgroups.py @@ -16,7 +16,7 @@ __all__ = ( class FHRPGroupSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:fhrpgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroup') ip_addresses = IPAddressSerializer(nested=True, many=True, read_only=True) class Meta: @@ -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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroupassignment') group = FHRPGroupSerializer(nested=True) interface_type = ContentTypeField( queryset=ContentType.objects.all() diff --git a/netbox/ipam/api/serializers_/ip.py b/netbox/ipam/api/serializers_/ip.py index ab53d3619..c65798474 100644 --- a/netbox/ipam/api/serializers_/ip.py +++ b/netbox/ipam/api/serializers_/ip.py @@ -30,7 +30,7 @@ __all__ = ( class AggregateSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:aggregate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:aggregate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:aggregate') family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True) rir = RIRSerializer(nested=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True) @@ -47,7 +47,7 @@ class AggregateSerializer(NetBoxModelSerializer): class PrefixSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:prefix-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:prefix') family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True) site = SiteSerializer(nested=True, required=False, allow_null=True) vrf = VRFSerializer(nested=True, required=False, allow_null=True) @@ -122,7 +122,7 @@ class AvailablePrefixSerializer(serializers.Serializer): class IPRangeSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:iprange-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:iprange-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:iprange') family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True) start_address = IPAddressField() end_address = IPAddressField() @@ -147,7 +147,7 @@ class IPRangeSerializer(NetBoxModelSerializer): class IPAddressSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:ipaddress-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:ipaddress') family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True) address = IPAddressField() vrf = VRFSerializer(nested=True, required=False, allow_null=True) diff --git a/netbox/ipam/api/serializers_/roles.py b/netbox/ipam/api/serializers_/roles.py index 26026b87b..e3c79c19a 100644 --- a/netbox/ipam/api/serializers_/roles.py +++ b/netbox/ipam/api/serializers_/roles.py @@ -11,7 +11,7 @@ __all__ = ( class RoleSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:role-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:role') # Related object counts prefix_count = RelatedObjectCountField('prefixes') diff --git a/netbox/ipam/api/serializers_/services.py b/netbox/ipam/api/serializers_/services.py index 10ba32250..b08d17121 100644 --- a/netbox/ipam/api/serializers_/services.py +++ b/netbox/ipam/api/serializers_/services.py @@ -16,7 +16,7 @@ __all__ = ( class ServiceTemplateSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:servicetemplate-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:servicetemplate-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:servicetemplate') protocol = ChoiceField(choices=ServiceProtocolChoices, required=False) class Meta: @@ -30,7 +30,7 @@ class ServiceTemplateSerializer(NetBoxModelSerializer): class ServiceSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:service-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:service-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:service') device = DeviceSerializer(nested=True, required=False, allow_null=True) virtual_machine = VirtualMachineSerializer(nested=True, required=False, allow_null=True) protocol = ChoiceField(choices=ServiceProtocolChoices, required=False) diff --git a/netbox/ipam/api/serializers_/vlans.py b/netbox/ipam/api/serializers_/vlans.py index 5deba3dae..bb243365b 100644 --- a/netbox/ipam/api/serializers_/vlans.py +++ b/netbox/ipam/api/serializers_/vlans.py @@ -23,7 +23,7 @@ __all__ = ( class VLANGroupSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlangroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlangroup') scope_type = ContentTypeField( queryset=ContentType.objects.filter( model__in=VLANGROUP_SCOPE_TYPES @@ -59,7 +59,7 @@ class VLANGroupSerializer(NetBoxModelSerializer): class VLANSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlan-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vlan') site = SiteSerializer(nested=True, required=False, allow_null=True) group = VLANGroupSerializer(nested=True, required=False, allow_null=True, default=None) tenant = TenantSerializer(nested=True, required=False, allow_null=True) diff --git a/netbox/ipam/api/serializers_/vrfs.py b/netbox/ipam/api/serializers_/vrfs.py index 6c3878261..a316b404b 100644 --- a/netbox/ipam/api/serializers_/vrfs.py +++ b/netbox/ipam/api/serializers_/vrfs.py @@ -13,7 +13,7 @@ __all__ = ( class RouteTargetSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:routetarget-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:routetarget-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:routetarget') tenant = TenantSerializer(nested=True, required=False, allow_null=True) class Meta: @@ -27,7 +27,7 @@ class RouteTargetSerializer(NetBoxModelSerializer): class VRFSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vrf-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='ipam:vrf') tenant = TenantSerializer(nested=True, required=False, allow_null=True) import_targets = SerializedPKRelatedField( queryset=RouteTarget.objects.all(), diff --git a/netbox/netbox/api/serializers/nested.py b/netbox/netbox/api/serializers/nested.py index c39701e95..aa7c6e59e 100644 --- a/netbox/netbox/api/serializers/nested.py +++ b/netbox/netbox/api/serializers/nested.py @@ -23,8 +23,8 @@ class WritableNestedSerializer(BaseModelSerializer): # Declared here for use by PrimaryModelSerializer, but should be imported from extras.api.nested_serializers class NestedTagSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='extras-api:tag-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='extras:tag-detail') + url = serializers.HyperlinkedIdentityField(view_name='extras-api:tag-detai') + display_url = serializers.HyperlinkedIdentityField(view_name='extras:tag') class Meta: model = Tag diff --git a/netbox/tenancy/api/nested_serializers.py b/netbox/tenancy/api/nested_serializers.py index 4125dd154..fe8f9ad8b 100644 --- a/netbox/tenancy/api/nested_serializers.py +++ b/netbox/tenancy/api/nested_serializers.py @@ -23,7 +23,7 @@ __all__ = [ ) class NestedTenantGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenantgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenantgroup') tenant_count = serializers.IntegerField(read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) @@ -34,7 +34,7 @@ class NestedTenantGroupSerializer(WritableNestedSerializer): class NestedTenantSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenant-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenant-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenant') class Meta: model = Tenant @@ -50,7 +50,7 @@ class NestedTenantSerializer(WritableNestedSerializer): ) class NestedContactGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactgroup') contact_count = serializers.IntegerField(read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) @@ -61,7 +61,7 @@ class NestedContactGroupSerializer(WritableNestedSerializer): class NestedContactRoleSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactrole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactrole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactrole') class Meta: model = ContactRole @@ -70,7 +70,7 @@ class NestedContactRoleSerializer(WritableNestedSerializer): class NestedContactSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contact-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contact-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contact') class Meta: model = Contact @@ -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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactassignment') contact = NestedContactSerializer() role = NestedContactRoleSerializer diff --git a/netbox/tenancy/api/serializers_/contacts.py b/netbox/tenancy/api/serializers_/contacts.py index d315abff6..4b5b7827e 100644 --- a/netbox/tenancy/api/serializers_/contacts.py +++ b/netbox/tenancy/api/serializers_/contacts.py @@ -20,7 +20,7 @@ __all__ = ( class ContactGroupSerializer(NestedGroupModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactgroup') parent = NestedContactGroupSerializer(required=False, allow_null=True, default=None) contact_count = serializers.IntegerField(read_only=True, default=0) @@ -35,7 +35,7 @@ class ContactGroupSerializer(NestedGroupModelSerializer): class ContactRoleSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactrole-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactrole-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactrole') class Meta: model = ContactRole @@ -48,7 +48,7 @@ class ContactRoleSerializer(NetBoxModelSerializer): class ContactSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contact-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contact-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contact') group = ContactGroupSerializer(nested=True, required=False, allow_null=True, default=None) class Meta: @@ -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-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactassignment') object_type = ContentTypeField( queryset=ContentType.objects.all() ) diff --git a/netbox/tenancy/api/serializers_/tenants.py b/netbox/tenancy/api/serializers_/tenants.py index 5beaa807d..eb31b47a8 100644 --- a/netbox/tenancy/api/serializers_/tenants.py +++ b/netbox/tenancy/api/serializers_/tenants.py @@ -13,7 +13,7 @@ __all__ = ( class TenantGroupSerializer(NestedGroupModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenantgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenantgroup') parent = NestedTenantGroupSerializer(required=False, allow_null=True) tenant_count = serializers.IntegerField(read_only=True, default=0) @@ -28,7 +28,7 @@ class TenantGroupSerializer(NestedGroupModelSerializer): class TenantSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenant-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenant-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:tenant') group = TenantGroupSerializer(nested=True, required=False, allow_null=True, default=None) # Related object counts diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py index d6f9dbb5c..103984634 100644 --- a/netbox/users/api/nested_serializers.py +++ b/netbox/users/api/nested_serializers.py @@ -18,7 +18,7 @@ __all__ = [ class NestedGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:group-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:group') class Meta: model = Group @@ -27,7 +27,7 @@ class NestedGroupSerializer(WritableNestedSerializer): class NestedUserSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:user-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:user') class Meta: model = get_user_model() @@ -42,7 +42,7 @@ class NestedUserSerializer(WritableNestedSerializer): class NestedTokenSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:token-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:token') class Meta: model = Token @@ -51,7 +51,7 @@ class NestedTokenSerializer(WritableNestedSerializer): class NestedObjectPermissionSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:objectpermission-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:objectpermission') object_types = ContentTypeField( queryset=ObjectType.objects.all(), many=True diff --git a/netbox/users/api/serializers_/permissions.py b/netbox/users/api/serializers_/permissions.py index 8534fb8f1..f9974e7de 100644 --- a/netbox/users/api/serializers_/permissions.py +++ b/netbox/users/api/serializers_/permissions.py @@ -13,7 +13,7 @@ __all__ = ( class ObjectPermissionSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:objectpermission-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:objectpermission') object_types = ContentTypeField( queryset=ObjectType.objects.all(), many=True diff --git a/netbox/users/api/serializers_/tokens.py b/netbox/users/api/serializers_/tokens.py index b0c3ffd89..6c777ccbc 100644 --- a/netbox/users/api/serializers_/tokens.py +++ b/netbox/users/api/serializers_/tokens.py @@ -16,7 +16,7 @@ __all__ = ( class TokenSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:token-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:token') key = serializers.CharField( min_length=40, max_length=40, diff --git a/netbox/users/api/serializers_/users.py b/netbox/users/api/serializers_/users.py index 13541207b..aeeefe9d3 100644 --- a/netbox/users/api/serializers_/users.py +++ b/netbox/users/api/serializers_/users.py @@ -16,7 +16,7 @@ __all__ = ( class GroupSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:group-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:group') user_count = serializers.IntegerField(read_only=True) permissions = SerializedPKRelatedField( source='object_permissions', @@ -35,7 +35,7 @@ class GroupSerializer(ValidatedModelSerializer): class UserSerializer(ValidatedModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='users:user-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='users:user') groups = SerializedPKRelatedField( queryset=Group.objects.all(), serializer=GroupSerializer, diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py index accba4b8a..c7b5986ad 100644 --- a/netbox/virtualization/api/nested_serializers.py +++ b/netbox/virtualization/api/nested_serializers.py @@ -24,7 +24,7 @@ __all__ = [ ) class NestedClusterTypeSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustertype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustertype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustertype') cluster_count = RelatedObjectCountField('clusters') class Meta: @@ -37,7 +37,7 @@ class NestedClusterTypeSerializer(WritableNestedSerializer): ) class NestedClusterGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustergroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustergroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustergroup') cluster_count = RelatedObjectCountField('clusters') class Meta: @@ -50,7 +50,7 @@ class NestedClusterGroupSerializer(WritableNestedSerializer): ) class NestedClusterSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:cluster-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:cluster') virtualmachine_count = RelatedObjectCountField('virtual_machines') class Meta: @@ -64,7 +64,7 @@ class NestedClusterSerializer(WritableNestedSerializer): class NestedVirtualMachineSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:virtualmachine-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualmachine-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualmachine') class Meta: model = VirtualMachine @@ -73,7 +73,7 @@ class NestedVirtualMachineSerializer(WritableNestedSerializer): class NestedVMInterfaceSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:vminterface-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:vminterface-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:vminterface') virtual_machine = NestedVirtualMachineSerializer(read_only=True) class Meta: @@ -83,7 +83,7 @@ class NestedVMInterfaceSerializer(WritableNestedSerializer): class NestedVirtualDiskSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:virtualdisk-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualdisk-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualdisk') virtual_machine = NestedVirtualMachineSerializer(read_only=True) class Meta: diff --git a/netbox/virtualization/api/serializers_/clusters.py b/netbox/virtualization/api/serializers_/clusters.py index c5a256984..3ee50bfad 100644 --- a/netbox/virtualization/api/serializers_/clusters.py +++ b/netbox/virtualization/api/serializers_/clusters.py @@ -16,7 +16,7 @@ __all__ = ( class ClusterTypeSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustertype-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustertype-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustertype') # Related object counts cluster_count = RelatedObjectCountField('clusters') @@ -32,7 +32,7 @@ class ClusterTypeSerializer(NetBoxModelSerializer): class ClusterGroupSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustergroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustergroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:clustergroup') # Related object counts cluster_count = RelatedObjectCountField('clusters') @@ -48,7 +48,7 @@ class ClusterGroupSerializer(NetBoxModelSerializer): class ClusterSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:cluster-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:cluster') type = ClusterTypeSerializer(nested=True) group = ClusterGroupSerializer(nested=True, required=False, allow_null=True, default=None) status = ChoiceField(choices=ClusterStatusChoices, required=False) diff --git a/netbox/virtualization/api/serializers_/virtualmachines.py b/netbox/virtualization/api/serializers_/virtualmachines.py index 6af0b3442..9cd78b9d9 100644 --- a/netbox/virtualization/api/serializers_/virtualmachines.py +++ b/netbox/virtualization/api/serializers_/virtualmachines.py @@ -30,7 +30,7 @@ __all__ = ( class VirtualMachineSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:virtualmachine-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualmachine-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualmachine') status = ChoiceField(choices=VirtualMachineStatusChoices, required=False) site = SiteSerializer(nested=True, required=False, allow_null=True, default=None) cluster = ClusterSerializer(nested=True, required=False, allow_null=True, default=None) @@ -80,7 +80,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer): class VMInterfaceSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:vminterface-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:vminterface-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:vminterface') virtual_machine = VirtualMachineSerializer(nested=True) parent = NestedVMInterfaceSerializer(required=False, allow_null=True) bridge = NestedVMInterfaceSerializer(required=False, allow_null=True) @@ -132,7 +132,7 @@ class VMInterfaceSerializer(NetBoxModelSerializer): class VirtualDiskSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:virtualdisk-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualdisk-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='virtualization:virtualdisk') virtual_machine = VirtualMachineSerializer(nested=True) class Meta: diff --git a/netbox/vpn/api/nested_serializers.py b/netbox/vpn/api/nested_serializers.py index 385bbe2a5..cc911878d 100644 --- a/netbox/vpn/api/nested_serializers.py +++ b/netbox/vpn/api/nested_serializers.py @@ -24,7 +24,7 @@ __all__ = ( ) class NestedTunnelGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='vpn-api:tunnelgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='vpn:tunnelgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='vpn:tunnelgroup') tunnel_count = RelatedObjectCountField('tunnels') class Meta: @@ -37,7 +37,7 @@ class NestedTunnelSerializer(WritableNestedSerializer): view_name='vpn-api:tunnel-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:tunnel-detail' + view_name='vpn:tunnel' ) class Meta: @@ -50,7 +50,7 @@ class NestedTunnelTerminationSerializer(WritableNestedSerializer): view_name='vpn-api:tunneltermination-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:tunneltermination-detail' + view_name='vpn:tunneltermination' ) class Meta: @@ -63,7 +63,7 @@ class NestedIKEProposalSerializer(WritableNestedSerializer): view_name='vpn-api:ikeproposal-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ikeproposal-detail' + view_name='vpn:ikeproposal' ) class Meta: @@ -76,7 +76,7 @@ class NestedIKEPolicySerializer(WritableNestedSerializer): view_name='vpn-api:ikepolicy-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ikepolicy-detail' + view_name='vpn:ikepolicy' ) class Meta: @@ -89,7 +89,7 @@ class NestedIPSecProposalSerializer(WritableNestedSerializer): view_name='vpn-api:ipsecproposal-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ipsecproposal-detail' + view_name='vpn:ipsecproposal' ) class Meta: @@ -102,7 +102,7 @@ class NestedIPSecPolicySerializer(WritableNestedSerializer): view_name='vpn-api:ipsecpolicy-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ipsecpolicy-detail' + view_name='vpn:ipsecpolicy' ) class Meta: @@ -115,7 +115,7 @@ class NestedIPSecProfileSerializer(WritableNestedSerializer): view_name='vpn-api:ipsecprofile-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ipsecprofile-detail' + view_name='vpn:ipsecprofile' ) class Meta: @@ -129,7 +129,7 @@ class NestedIPSecProfileSerializer(WritableNestedSerializer): class NestedL2VPNSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='vpn-api:l2vpn-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpn-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpn') class Meta: model = models.L2VPN @@ -140,7 +140,7 @@ class NestedL2VPNSerializer(WritableNestedSerializer): class NestedL2VPNTerminationSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='vpn-api:l2vpntermination-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpntermination-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpntermination') l2vpn = NestedL2VPNSerializer() class Meta: diff --git a/netbox/vpn/api/serializers_/crypto.py b/netbox/vpn/api/serializers_/crypto.py index 0f625f8a0..52e453b26 100644 --- a/netbox/vpn/api/serializers_/crypto.py +++ b/netbox/vpn/api/serializers_/crypto.py @@ -19,7 +19,7 @@ class IKEProposalSerializer(NetBoxModelSerializer): view_name='vpn-api:ikeproposal-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ikeproposal-detail' + view_name='vpn:ikeproposal' ) authentication_method = ChoiceField( choices=AuthenticationMethodChoices @@ -49,7 +49,7 @@ class IKEPolicySerializer(NetBoxModelSerializer): view_name='vpn-api:ikepolicy-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ikepolicy-detail' + view_name='vpn:ikepolicy' ) version = ChoiceField( choices=IKEVersionChoices @@ -79,7 +79,7 @@ class IPSecProposalSerializer(NetBoxModelSerializer): view_name='vpn-api:ipsecproposal-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ipsecproposal-detail' + view_name='vpn:ipsecproposal' ) encryption_algorithm = ChoiceField( choices=EncryptionAlgorithmChoices @@ -102,7 +102,7 @@ class IPSecPolicySerializer(NetBoxModelSerializer): view_name='vpn-api:ipsecpolicy-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ipsecpolicy-detail' + view_name='vpn:ipsecpolicy' ) proposals = SerializedPKRelatedField( queryset=IPSecProposal.objects.all(), @@ -130,7 +130,7 @@ class IPSecProfileSerializer(NetBoxModelSerializer): view_name='vpn-api:ipsecprofile-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:ipsecprofile-detail' + view_name='vpn:ipsecprofile' ) mode = ChoiceField( choices=IPSecModeChoices diff --git a/netbox/vpn/api/serializers_/l2vpn.py b/netbox/vpn/api/serializers_/l2vpn.py index 6c5faa6e2..96539b8aa 100644 --- a/netbox/vpn/api/serializers_/l2vpn.py +++ b/netbox/vpn/api/serializers_/l2vpn.py @@ -19,7 +19,7 @@ __all__ = ( class L2VPNSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='vpn-api:l2vpn-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpn-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpn') type = ChoiceField(choices=L2VPNTypeChoices, required=False) import_targets = SerializedPKRelatedField( queryset=RouteTarget.objects.all(), @@ -48,7 +48,7 @@ class L2VPNSerializer(NetBoxModelSerializer): class L2VPNTerminationSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='vpn-api:l2vpntermination-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpntermination-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='vpn:l2vpntermination') l2vpn = L2VPNSerializer( nested=True ) diff --git a/netbox/vpn/api/serializers_/tunnels.py b/netbox/vpn/api/serializers_/tunnels.py index e2fa53459..d463f49dd 100644 --- a/netbox/vpn/api/serializers_/tunnels.py +++ b/netbox/vpn/api/serializers_/tunnels.py @@ -24,7 +24,7 @@ __all__ = ( class TunnelGroupSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='vpn-api:tunnelgroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='vpn:tunnelgroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='vpn:tunnelgroup') # Related object counts tunnel_count = RelatedObjectCountField('tunnels') @@ -43,7 +43,7 @@ class TunnelSerializer(NetBoxModelSerializer): view_name='vpn-api:tunnel-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:tunnel-detail' + view_name='vpn:tunnel' ) status = ChoiceField( choices=TunnelStatusChoices @@ -86,7 +86,7 @@ class TunnelTerminationSerializer(NetBoxModelSerializer): view_name='vpn-api:tunneltermination-detail' ) display_url = serializers.HyperlinkedIdentityField( - view_name='vpn:tunneltermination-detail' + view_name='vpn:tunneltermination' ) tunnel = TunnelSerializer( nested=True diff --git a/netbox/wireless/api/nested_serializers.py b/netbox/wireless/api/nested_serializers.py index d8ea12fa3..e0731e6c9 100644 --- a/netbox/wireless/api/nested_serializers.py +++ b/netbox/wireless/api/nested_serializers.py @@ -16,7 +16,7 @@ __all__ = ( ) class NestedWirelessLANGroupSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='wireless-api:wirelesslangroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslangroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslangroup') wirelesslan_count = serializers.IntegerField(read_only=True) _depth = serializers.IntegerField(source='level', read_only=True) @@ -27,7 +27,7 @@ class NestedWirelessLANGroupSerializer(WritableNestedSerializer): class NestedWirelessLANSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='wireless-api:wirelesslan-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslan-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslan') class Meta: model = WirelessLAN @@ -36,7 +36,7 @@ class NestedWirelessLANSerializer(WritableNestedSerializer): class NestedWirelessLinkSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='wireless-api:wirelesslink-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslink-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslink') class Meta: model = WirelessLink diff --git a/netbox/wireless/api/serializers_/wirelesslans.py b/netbox/wireless/api/serializers_/wirelesslans.py index ff41485c7..08f4f90d9 100644 --- a/netbox/wireless/api/serializers_/wirelesslans.py +++ b/netbox/wireless/api/serializers_/wirelesslans.py @@ -16,7 +16,7 @@ __all__ = ( class WirelessLANGroupSerializer(NestedGroupModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='wireless-api:wirelesslangroup-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslangroup-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslangroup') parent = NestedWirelessLANGroupSerializer(required=False, allow_null=True, default=None) wirelesslan_count = serializers.IntegerField(read_only=True, default=0) @@ -31,7 +31,7 @@ class WirelessLANGroupSerializer(NestedGroupModelSerializer): class WirelessLANSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='wireless-api:wirelesslan-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslan-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslan') group = WirelessLANGroupSerializer(nested=True, required=False, allow_null=True) status = ChoiceField(choices=WirelessLANStatusChoices, required=False, allow_blank=True) vlan = VLANSerializer(nested=True, required=False, allow_null=True) diff --git a/netbox/wireless/api/serializers_/wirelesslinks.py b/netbox/wireless/api/serializers_/wirelesslinks.py index cd9d90b3a..880ce9f62 100644 --- a/netbox/wireless/api/serializers_/wirelesslinks.py +++ b/netbox/wireless/api/serializers_/wirelesslinks.py @@ -15,7 +15,7 @@ __all__ = ( class WirelessLinkSerializer(NetBoxModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='wireless-api:wirelesslink-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslink-detail') + display_url = serializers.HyperlinkedIdentityField(view_name='wireless:wirelesslink') status = ChoiceField(choices=LinkStatusChoices, required=False) interface_a = InterfaceSerializer(nested=True) interface_b = InterfaceSerializer(nested=True)