From 15b55f5e628f33926fc3f14262ecdf9b59fa8bb1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 8 Aug 2019 21:35:59 -0400
Subject: [PATCH] Remove deprecated form_factor accessor on Interface and
 InterfaceTemplate

---
 netbox/dcim/api/serializers.py | 12 ++++--------
 netbox/dcim/models.py          | 32 --------------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index e9526fa41..19a80a809 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -241,12 +241,10 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
 class InterfaceTemplateSerializer(ValidatedModelSerializer):
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False)
-    # TODO: Remove in v2.7 (backward-compatibility for form_factor)
-    form_factor = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False)
 
     class Meta:
         model = InterfaceTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'form_factor', 'mgmt_only']
+        fields = ['id', 'device_type', 'name', 'type', 'mgmt_only']
 
 
 class RearPortTemplateSerializer(ValidatedModelSerializer):
@@ -437,8 +435,6 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
 class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False)
-    # TODO: Remove in v2.7 (backward-compatibility for form_factor)
-    form_factor = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False)
     lag = NestedInterfaceSerializer(required=False, allow_null=True)
     mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
@@ -454,9 +450,9 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = Interface
         fields = [
-            'id', 'device', 'name', 'type', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only',
-            'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode',
-            'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses',
+            'id', 'device', 'name', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
+            'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan',
+            'tagged_vlans', 'tags', 'count_ipaddresses',
         ]
 
     # TODO: This validation should be handled by Interface.clean()
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 4c22c9549..fb8ab1dc5 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -1181,22 +1181,6 @@ class InterfaceTemplate(ComponentTemplateModel):
     def __str__(self):
         return self.name
 
-    # TODO: Remove in v2.7
-    @property
-    def form_factor(self):
-        """
-        Backward-compatibility for form_factor
-        """
-        return self.type
-
-    # TODO: Remove in v2.7
-    @form_factor.setter
-    def form_factor(self, value):
-        """
-        Backward-compatibility for form_factor
-        """
-        self.type = value
-
     def instantiate(self, device):
         return Interface(
             device=device,
@@ -2342,22 +2326,6 @@ class Interface(CableTermination, ComponentModel):
             object_data=serialize_object(self)
         ).save()
 
-    # TODO: Remove in v2.7
-    @property
-    def form_factor(self):
-        """
-        Backward-compatibility for form_factor
-        """
-        return self.type
-
-    # TODO: Remove in v2.7
-    @form_factor.setter
-    def form_factor(self, value):
-        """
-        Backward-compatibility for form_factor
-        """
-        self.type = value
-
     @property
     def connected_endpoint(self):
         if self._connected_interface: