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

15156 fix tests

Browse Source
This commit is contained in:
Arthur 2024-06-05 10:21:43 -07:00
parent fb1f72ea69
commit 91f1cdb355
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/dcim/api/nested_serializers.py
View File

@ -194,7 +194,7 @@ class NestedModuleTypeSerializer(WritableNestedSerializer):
class NestedConsolePortTemplateSerializer(WritableNestedSerializer): class NestedConsolePortTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.ConsolePortTemplate model = models.ConsolePortTemplate
@ -203,7 +203,7 @@ class NestedConsolePortTemplateSerializer(WritableNestedSerializer):
class NestedConsoleServerPortTemplateSerializer(WritableNestedSerializer): class NestedConsoleServerPortTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.ConsoleServerPortTemplate model = models.ConsoleServerPortTemplate
@ -212,7 +212,7 @@ class NestedConsoleServerPortTemplateSerializer(WritableNestedSerializer):
class NestedPowerPortTemplateSerializer(WritableNestedSerializer): class NestedPowerPortTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.PowerPortTemplate model = models.PowerPortTemplate
@ -221,7 +221,7 @@ class NestedPowerPortTemplateSerializer(WritableNestedSerializer):
class NestedPowerOutletTemplateSerializer(WritableNestedSerializer): class NestedPowerOutletTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlettemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlettemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlettemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.PowerOutletTemplate model = models.PowerOutletTemplate
@ -230,7 +230,7 @@ class NestedPowerOutletTemplateSerializer(WritableNestedSerializer):
class NestedInterfaceTemplateSerializer(WritableNestedSerializer): class NestedInterfaceTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfacetemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfacetemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interfacetemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.InterfaceTemplate model = models.InterfaceTemplate
@ -239,7 +239,7 @@ class NestedInterfaceTemplateSerializer(WritableNestedSerializer):
class NestedRearPortTemplateSerializer(WritableNestedSerializer): class NestedRearPortTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.RearPortTemplate model = models.RearPortTemplate
@ -248,7 +248,7 @@ class NestedRearPortTemplateSerializer(WritableNestedSerializer):
class NestedFrontPortTemplateSerializer(WritableNestedSerializer): class NestedFrontPortTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.FrontPortTemplate model = models.FrontPortTemplate
@ -257,7 +257,7 @@ class NestedFrontPortTemplateSerializer(WritableNestedSerializer):
class NestedModuleBayTemplateSerializer(WritableNestedSerializer): class NestedModuleBayTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebaytemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebaytemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebaytemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.ModuleBayTemplate model = models.ModuleBayTemplate
@ -266,7 +266,7 @@ class NestedModuleBayTemplateSerializer(WritableNestedSerializer):
class NestedDeviceBayTemplateSerializer(WritableNestedSerializer): class NestedDeviceBayTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebaytemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebaytemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebaytemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.DeviceBayTemplate model = models.DeviceBayTemplate
@ -275,7 +275,7 @@ class NestedDeviceBayTemplateSerializer(WritableNestedSerializer):
class NestedInventoryItemTemplateSerializer(WritableNestedSerializer): class NestedInventoryItemTemplateSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemtemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemtemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemtemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
_depth = serializers.IntegerField(source='level', read_only=True) _depth = serializers.IntegerField(source='level', read_only=True)
class Meta: class Meta:

2
netbox/dcim/api/serializers_/cables.py
View File

@ -55,7 +55,7 @@ class TracedCableSerializer(serializers.ModelSerializer):
class CableTerminationSerializer(NetBoxModelSerializer): class CableTerminationSerializer(NetBoxModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cabletermination-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cabletermination-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cabletermination') display_url = serializers.CharField(allow_null=True, read_only=True)
termination_type = ContentTypeField( termination_type = ContentTypeField(
queryset=ContentType.objects.filter(CABLE_TERMINATION_MODELS) queryset=ContentType.objects.filter(CABLE_TERMINATION_MODELS)
) )

20
netbox/dcim/api/serializers_/devicetype_components.py
View File

@ -33,7 +33,7 @@ __all__ = (
class ConsolePortTemplateSerializer(ValidatedModelSerializer): class ConsolePortTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True, nested=True,
required=False, required=False,
@ -63,7 +63,7 @@ class ConsolePortTemplateSerializer(ValidatedModelSerializer):
class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer): class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:consoleserverporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True, nested=True,
required=False, required=False,
@ -93,7 +93,7 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
class PowerPortTemplateSerializer(ValidatedModelSerializer): class PowerPortTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:powerporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True, nested=True,
required=False, required=False,
@ -124,7 +124,7 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer):
class PowerOutletTemplateSerializer(ValidatedModelSerializer): class PowerOutletTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlettemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlettemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:poweroutlettemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True, nested=True,
required=False, required=False,
@ -166,7 +166,7 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
class InterfaceTemplateSerializer(ValidatedModelSerializer): class InterfaceTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfacetemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfacetemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:interfacetemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True, nested=True,
required=False, required=False,
@ -214,7 +214,7 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer):
class RearPortTemplateSerializer(ValidatedModelSerializer): class RearPortTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:rearporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
required=False, required=False,
nested=True, nested=True,
@ -240,7 +240,7 @@ class RearPortTemplateSerializer(ValidatedModelSerializer):
class FrontPortTemplateSerializer(ValidatedModelSerializer): class FrontPortTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:frontporttemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True, nested=True,
required=False, required=False,
@ -267,7 +267,7 @@ class FrontPortTemplateSerializer(ValidatedModelSerializer):
class ModuleBayTemplateSerializer(ValidatedModelSerializer): class ModuleBayTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebaytemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:modulebaytemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:modulebaytemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True nested=True
) )
@ -283,7 +283,7 @@ class ModuleBayTemplateSerializer(ValidatedModelSerializer):
class DeviceBayTemplateSerializer(ValidatedModelSerializer): class DeviceBayTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebaytemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebaytemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:devicebaytemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True nested=True
) )
@ -299,7 +299,7 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer):
class InventoryItemTemplateSerializer(ValidatedModelSerializer): class InventoryItemTemplateSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemtemplate-detail') url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitemtemplate-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='dcim:inventoryitemtemplate') display_url = serializers.CharField(allow_null=True, read_only=True)
device_type = DeviceTypeSerializer( device_type = DeviceTypeSerializer(
nested=True nested=True
) )

4
netbox/extras/api/nested_serializers.py
View File

@ -104,7 +104,7 @@ class NestedSavedFilterSerializer(WritableNestedSerializer):
class NestedBookmarkSerializer(WritableNestedSerializer): class NestedBookmarkSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='extras-api:bookmark-detail') url = serializers.HyperlinkedIdentityField(view_name='extras-api:bookmark-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='extras:bookmark') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.Bookmark model = models.Bookmark
@ -113,7 +113,7 @@ class NestedBookmarkSerializer(WritableNestedSerializer):
class NestedImageAttachmentSerializer(WritableNestedSerializer): class NestedImageAttachmentSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail') url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='extras:imageattachment') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.ImageAttachment model = models.ImageAttachment

2
netbox/extras/api/serializers_/attachments.py
View File

@ -15,7 +15,7 @@ __all__ = (
class ImageAttachmentSerializer(ValidatedModelSerializer): class ImageAttachmentSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail') url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='extras:imageattachment') display_url = serializers.CharField(allow_null=True, read_only=True)
object_type = ContentTypeField( object_type = ContentTypeField(
queryset=ObjectType.objects.all() queryset=ObjectType.objects.all()
) )

2
netbox/extras/api/serializers_/bookmarks.py
View File

@ -15,7 +15,7 @@ __all__ = (
class BookmarkSerializer(ValidatedModelSerializer): class BookmarkSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='extras-api:bookmark-detail') url = serializers.HyperlinkedIdentityField(view_name='extras-api:bookmark-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='extras:bookmark') display_url = serializers.CharField(allow_null=True, read_only=True)
object_type = ContentTypeField( object_type = ContentTypeField(
queryset=ObjectType.objects.with_feature('bookmarks'), queryset=ObjectType.objects.with_feature('bookmarks'),
) )

2
netbox/extras/api/serializers_/objecttypes.py
View File

@ -10,7 +10,7 @@ __all__ = (
class ObjectTypeSerializer(BaseModelSerializer): class ObjectTypeSerializer(BaseModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='extras-api:objecttype-detail') url = serializers.HyperlinkedIdentityField(view_name='extras-api:objecttype-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='extras:objecttype') display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = ObjectType model = ObjectType

2
netbox/ipam/api/serializers_/fhrpgroups.py
View File

@ -30,7 +30,7 @@ class FHRPGroupSerializer(NetBoxModelSerializer):
class FHRPGroupAssignmentSerializer(NetBoxModelSerializer): class FHRPGroupAssignmentSerializer(NetBoxModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='ipam-api:fhrpgroupassignment-detail') url = serializers.HyperlinkedIdentityField(view_name='ipam-api:fhrpgroupassignment-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='ipam:fhrpgroupassignment') display_url = serializers.CharField(allow_null=True, read_only=True)
group = FHRPGroupSerializer(nested=True) group = FHRPGroupSerializer(nested=True)
interface_type = ContentTypeField( interface_type = ContentTypeField(
queryset=ContentType.objects.all() queryset=ContentType.objects.all()

2
netbox/tenancy/api/nested_serializers.py
View File

@ -79,7 +79,7 @@ class NestedContactSerializer(WritableNestedSerializer):
class NestedContactAssignmentSerializer(WritableNestedSerializer): class NestedContactAssignmentSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactassignment-detail') url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactassignment-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactassignment') display_url = serializers.CharField(allow_null=True, read_only=True)
contact = NestedContactSerializer() contact = NestedContactSerializer()
role = NestedContactRoleSerializer role = NestedContactRoleSerializer

2
netbox/tenancy/api/serializers_/contacts.py
View File

@ -62,7 +62,7 @@ class ContactSerializer(NetBoxModelSerializer):
class ContactAssignmentSerializer(NetBoxModelSerializer): class ContactAssignmentSerializer(NetBoxModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactassignment-detail') url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactassignment-detail')
display_url = serializers.HyperlinkedIdentityField(view_name='tenancy:contactassignment') display_url = serializers.CharField(allow_null=True, read_only=True)
object_type = ContentTypeField( object_type = ContentTypeField(
queryset=ContentType.objects.all() queryset=ContentType.objects.all()
) )