From 5abfe821bc50084a5bff4a3f29a7168dd844b326 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 21 Jan 2022 15:43:53 -0500 Subject: [PATCH] Changelog cnad cleanup for #7853 --- docs/release-notes/version-3.2.md | 3 ++- netbox/dcim/forms/bulk_import.py | 3 +-- netbox/dcim/models/device_components.py | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 432d6fafc..c35806c04 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -69,6 +69,7 @@ Inventory item templates can be arranged hierarchically within a device type, an * [#7784](https://github.com/netbox-community/netbox/issues/7784) - Support cluster type assignment for config contexts * [#7846](https://github.com/netbox-community/netbox/issues/7846) - Enable associating inventory items with device components * [#7852](https://github.com/netbox-community/netbox/issues/7852) - Enable assigning interfaces to VRFs +* [#7853](https://github.com/netbox-community/netbox/issues/7853) - Add `speed` and `duplex` fields to interface model * [#8168](https://github.com/netbox-community/netbox/issues/8168) - Add `min_vid` and `max_vid` fields to VLAN group * [#8295](https://github.com/netbox-community/netbox/issues/8295) - Webhook URLs can now be templatized * [#8296](https://github.com/netbox-community/netbox/issues/8296) - Allow disabling custom links @@ -100,7 +101,7 @@ Inventory item templates can be arranged hierarchically within a device type, an * dcim.FrontPort * Added `module` field * dcim.Interface - * Added `module` and `vrf` fields + * Added `module`, `speed`, `duplex`, and `vrf` fields * dcim.InventoryItem * Added `component_type`, `component_id`, and `role` fields * Added read-only `component` field diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index acce43be0..1aec329eb 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -620,8 +620,7 @@ class InterfaceCSVForm(CustomFieldModelCSVForm): ) duplex = CSVChoiceField( choices=InterfaceDuplexChoices, - required=False, - help_text='Duplex' + required=False ) mode = CSVChoiceField( choices=InterfaceModeChoices, diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index cae0d1150..4a68f7c8d 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -546,12 +546,10 @@ class Interface(ModularComponentModel, BaseInterface, LinkTermination, PathEndpo help_text='This interface is used only for out-of-band management' ) speed = models.PositiveIntegerField( - verbose_name='Speed', blank=True, null=True ) duplex = models.CharField( - verbose_name='Duplex', max_length=50, blank=True, null=True,