mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-21 11:37:21 -06:00
Maintain backward-compatibile support for Interface.form_factor until v2.7
This commit is contained in:
parent
778d56ac12
commit
4acd842237
@ -232,10 +232,12 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
|
|||||||
class InterfaceTemplateSerializer(ValidatedModelSerializer):
|
class InterfaceTemplateSerializer(ValidatedModelSerializer):
|
||||||
device_type = NestedDeviceTypeSerializer()
|
device_type = NestedDeviceTypeSerializer()
|
||||||
type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False)
|
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:
|
class Meta:
|
||||||
model = InterfaceTemplate
|
model = InterfaceTemplate
|
||||||
fields = ['id', 'device_type', 'name', 'type', 'mgmt_only']
|
fields = ['id', 'device_type', 'name', 'type', 'form_factor', 'mgmt_only']
|
||||||
|
|
||||||
|
|
||||||
class RearPortTemplateSerializer(ValidatedModelSerializer):
|
class RearPortTemplateSerializer(ValidatedModelSerializer):
|
||||||
@ -419,6 +421,8 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
|
|||||||
class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
|
class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
|
||||||
device = NestedDeviceSerializer()
|
device = NestedDeviceSerializer()
|
||||||
type = ChoiceField(choices=IFACE_TYPE_CHOICES, required=False)
|
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)
|
lag = NestedInterfaceSerializer(required=False, allow_null=True)
|
||||||
mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True)
|
mode = ChoiceField(choices=IFACE_MODE_CHOICES, required=False, allow_null=True)
|
||||||
untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
|
untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
|
||||||
@ -434,9 +438,9 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = Interface
|
model = Interface
|
||||||
fields = [
|
fields = [
|
||||||
'id', 'device', 'name', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
|
'id', 'device', 'name', 'type', 'form_factor', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only',
|
||||||
'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan',
|
'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode',
|
||||||
'tagged_vlans', 'tags', 'count_ipaddresses',
|
'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses',
|
||||||
]
|
]
|
||||||
|
|
||||||
# TODO: This validation should be handled by Interface.clean()
|
# TODO: This validation should be handled by Interface.clean()
|
||||||
|
@ -1150,6 +1150,22 @@ class InterfaceTemplate(ComponentTemplateModel):
|
|||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
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
|
||||||
|
|
||||||
|
|
||||||
class FrontPortTemplate(ComponentTemplateModel):
|
class FrontPortTemplate(ComponentTemplateModel):
|
||||||
"""
|
"""
|
||||||
@ -2254,6 +2270,22 @@ class Interface(CableTermination, ComponentModel):
|
|||||||
object_data=serialize_object(self)
|
object_data=serialize_object(self)
|
||||||
).save()
|
).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
|
@property
|
||||||
def connected_endpoint(self):
|
def connected_endpoint(self):
|
||||||
if self._connected_interface:
|
if self._connected_interface:
|
||||||
|
Loading…
Reference in New Issue
Block a user