mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Add 'display' field to all REST API serializers

Browse Source
This commit is contained in:
Jeremy Stretch
2021-03-16 10:06:25 -04:00
parent ee7f7c877a
commit fb48c1f6dd
26 changed files with 287 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/virtualization/api/nested_serializers.py
View File

@@ -23,7 +23,7 @@ class NestedClusterTypeSerializer(WritableNestedSerializer):
class Meta:
model = ClusterType
fields = ['id', 'url', 'name', 'slug', 'cluster_count']
fields = ['id', 'url', 'display', 'name', 'slug', 'cluster_count']
class NestedClusterGroupSerializer(WritableNestedSerializer):
@@ -32,7 +32,7 @@ class NestedClusterGroupSerializer(WritableNestedSerializer):
class Meta:
model = ClusterGroup
fields = ['id', 'url', 'name', 'slug', 'cluster_count']
fields = ['id', 'url', 'display', 'name', 'slug', 'cluster_count']
class NestedClusterSerializer(WritableNestedSerializer):
@@ -41,7 +41,7 @@ class NestedClusterSerializer(WritableNestedSerializer):
class Meta:
model = Cluster
fields = ['id', 'url', 'name', 'virtualmachine_count']
fields = ['id', 'url', 'display', 'name', 'virtualmachine_count']
#
@@ -53,7 +53,7 @@ class NestedVirtualMachineSerializer(WritableNestedSerializer):
class Meta:
model = VirtualMachine
fields = ['id', 'url', 'name']
fields = ['id', 'url', 'display', 'name']
class NestedVMInterfaceSerializer(WritableNestedSerializer):
@@ -62,4 +62,4 @@ class NestedVMInterfaceSerializer(WritableNestedSerializer):
class Meta:
model = Interface
fields = ['id', 'url', 'virtual_machine', 'name']
fields = ['id', 'url', 'display', 'virtual_machine', 'name']

24
netbox/virtualization/api/serializers.py
View File

@@ -24,7 +24,8 @@ class ClusterTypeSerializer(OrganizationalModelSerializer):
class Meta:
model = ClusterType
fields = [
'id', 'url', 'name', 'slug', 'description', 'custom_fields', 'created', 'last_updated', 'cluster_count',
'id', 'url', 'display', 'name', 'slug', 'description', 'custom_fields', 'created', 'last_updated',
'cluster_count',
]
@@ -35,7 +36,8 @@ class ClusterGroupSerializer(OrganizationalModelSerializer):
class Meta:
model = ClusterGroup
fields = [
'id', 'url', 'name', 'slug', 'description', 'custom_fields', 'created', 'last_updated', 'cluster_count',
'id', 'url', 'display', 'name', 'slug', 'description', 'custom_fields', 'created', 'last_updated',
'cluster_count',
]
@@ -51,8 +53,8 @@ class ClusterSerializer(PrimaryModelSerializer):
class Meta:
model = Cluster
fields = [
'id', 'url', 'name', 'type', 'group', 'tenant', 'site', 'comments', 'tags', 'custom_fields', 'created',
'last_updated', 'device_count', 'virtualmachine_count',
'id', 'url', 'display', 'name', 'type', 'group', 'tenant', 'site', 'comments', 'tags', 'custom_fields',
'created', 'last_updated', 'device_count', 'virtualmachine_count',
]
@@ -75,9 +77,9 @@ class VirtualMachineSerializer(PrimaryModelSerializer):
class Meta:
model = VirtualMachine
fields = [
'id', 'url', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags', 'custom_fields',
'created', 'last_updated',
'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip',
'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags',
'custom_fields', 'created', 'last_updated',
]
validators = []
@@ -87,9 +89,9 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
class Meta(VirtualMachineSerializer.Meta):
fields = [
'id', 'url', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags', 'custom_fields',
'config_context', 'created', 'last_updated',
'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip',
'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags',
'custom_fields', 'config_context', 'created', 'last_updated',
]
@swagger_serializer_method(serializer_or_field=serializers.DictField)
@@ -116,7 +118,7 @@ class VMInterfaceSerializer(PrimaryModelSerializer):
class Meta:
model = VMInterface
fields = [
'id', 'url', 'virtual_machine', 'name', 'enabled', 'mtu', 'mac_address', 'description', 'mode',
'id', 'url', 'display', 'virtual_machine', 'name', 'enabled', 'mtu', 'mac_address', 'description', 'mode',
'untagged_vlan', 'tagged_vlans', 'tags', 'custom_fields', 'created', 'last_updated',
]

10
netbox/virtualization/tests/test_api.py
View File

@@ -19,7 +19,7 @@ class AppTest(APITestCase):
class ClusterTypeTest(APIViewTestCases.APIViewTestCase):
model = ClusterType
brief_fields = ['cluster_count', 'id', 'name', 'slug', 'url']
brief_fields = ['cluster_count', 'display', 'id', 'name', 'slug', 'url']
create_data = [
{
'name': 'Cluster Type 4',
@@ -51,7 +51,7 @@ class ClusterTypeTest(APIViewTestCases.APIViewTestCase):
class ClusterGroupTest(APIViewTestCases.APIViewTestCase):
model = ClusterGroup
brief_fields = ['cluster_count', 'id', 'name', 'slug', 'url']
brief_fields = ['cluster_count', 'display', 'id', 'name', 'slug', 'url']
create_data = [
{
'name': 'Cluster Group 4',
@@ -83,7 +83,7 @@ class ClusterGroupTest(APIViewTestCases.APIViewTestCase):
class ClusterTest(APIViewTestCases.APIViewTestCase):
model = Cluster
brief_fields = ['id', 'name', 'url', 'virtualmachine_count']
brief_fields = ['display', 'id', 'name', 'url', 'virtualmachine_count']
bulk_update_data = {
'comments': 'New comment',
}
@@ -131,7 +131,7 @@ class ClusterTest(APIViewTestCases.APIViewTestCase):
class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
model = VirtualMachine
brief_fields = ['id', 'name', 'url']
brief_fields = ['display', 'id', 'name', 'url']
bulk_update_data = {
'status': 'staged',
}
@@ -207,7 +207,7 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
model = VMInterface
brief_fields = ['id', 'name', 'url', 'virtual_machine']
brief_fields = ['display', 'id', 'name', 'url', 'virtual_machine']
bulk_update_data = {
'description': 'New description',
}