From 40ddf9a12fa4040f087d1e83d24f65d8e586e3de Mon Sep 17 00:00:00 2001 From: Marco Ceppi Date: Tue, 26 Nov 2019 10:57:03 -0500 Subject: [PATCH] Add connection type to NestedInterfaceSerializer --- netbox/dcim/api/nested_serializers.py | 5 +++-- netbox/dcim/tests/test_api.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index 30d84f703..a44e7227a 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from dcim.constants import CONNECTION_STATUS_CHOICES +from dcim.constants import CONNECTION_STATUS_CHOICES, IFACE_TYPE_CHOICES from dcim.models import ( Cable, ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, Interface, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerPanel, PowerPort, Rack, RackGroup, RackRole, @@ -203,10 +203,11 @@ class NestedInterfaceSerializer(WritableNestedSerializer): device = NestedDeviceSerializer(read_only=True) url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail') connection_status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, read_only=True) + type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False) class Meta: model = Interface - fields = ['id', 'url', 'device', 'name', 'cable', 'connection_status'] + fields = ['id', 'url', 'device', 'name', 'cable', 'connection_status', 'type'] class NestedRearPortSerializer(WritableNestedSerializer): diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 9c873c886..14ca704cd 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2449,7 +2449,7 @@ class InterfaceTest(APITestCase): self.assertEqual( sorted(response.data['results'][0]), - ['cable', 'connection_status', 'device', 'id', 'name', 'url'] + ['cable', 'connection_status', 'device', 'id', 'name', 'type', 'url'] ) def test_create_interface(self):