From 37419d791d8b1d1dbcd9902153e5cd55487ec1e6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 12 Sep 2025 15:57:13 -0400 Subject: [PATCH] Standardize labels --- netbox/dcim/choices.py | 144 ++++++++++++++++++++--------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 7889c06b5..34bde9991 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1152,28 +1152,28 @@ class InterfaceTypeChoices(ChoiceSet): ( _('FastEthernet (100 Mbps)'), ( - (TYPE_100ME_FX, '100BASE-FX (10/100ME MMF)'), - (TYPE_100ME_LFX, '100BASE-LFX (10/100ME MMF)'), + (TYPE_100ME_FX, '100BASE-FX (10/100ME)'), + (TYPE_100ME_LFX, '100BASE-LFX (10/100ME)'), (TYPE_100ME_FIXED, '100BASE-TX (10/100ME)'), - (TYPE_100ME_T1, '100BASE-T1 (10/100ME Single Pair)'), + (TYPE_100ME_T1, '100BASE-T1 (10/100ME)'), ), ), ( _('GigabitEthernet (1 Gbps)'), ( (TYPE_1GE_BX10_D, '1000BASE-BX10-D (1GE BiDi Down)'), - (TYPE_1GE_BX10_U, '1000BASE-BX10-D (1GE BiDi Up)'), - (TYPE_1GE_CX, '1000BASE-CX (DAC)'), - (TYPE_1GE_CWDM, '1000BASE-CWDM'), - (TYPE_1GE_DWDM, '1000BASE-DWDM'), - (TYPE_1GE_EX, '1000BASE-EX (SMF)'), - (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE MMF)'), - (TYPE_1GE_LSX, '1000BASE-LSX (1GE MMF)'), - (TYPE_1GE_LX_FIXED, '1000BASE-LX (1GE SMF)'), - (TYPE_1GE_LX10, '1000BASE-LX10/LH (1GE SMF)'), - (TYPE_1GE_FIXED, '1000BASE-T (1GE copper)'), - (TYPE_1GE_TX_FIXED, '1000BASE-TX (1GE copper)'), - (TYPE_1GE_ZX, '1000BASE-ZX (SMF)'), + (TYPE_1GE_BX10_U, '1000BASE-BX10-U (1GE BiDi Up)'), + (TYPE_1GE_CX, '1000BASE-CX (1GE DAC)'), + (TYPE_1GE_CWDM, '1000BASE-CWDM (1GE)'), + (TYPE_1GE_DWDM, '1000BASE-DWDM (1GE)'), + (TYPE_1GE_EX, '1000BASE-EX (1GE)'), + (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE)'), + (TYPE_1GE_LSX, '1000BASE-LSX (1GE)'), + (TYPE_1GE_LX_FIXED, '1000BASE-LX (1GE)'), + (TYPE_1GE_LX10, '1000BASE-LX10/LH (1GE)'), + (TYPE_1GE_FIXED, '1000BASE-T (1GE)'), + (TYPE_1GE_TX_FIXED, '1000BASE-TX (1GE)'), + (TYPE_1GE_ZX, '1000BASE-ZX (1GE)'), ), ), ( @@ -1189,43 +1189,43 @@ class InterfaceTypeChoices(ChoiceSet): (TYPE_10GE_BR_D, '10GBASE-DR-D (10GE BiDi Down)'), (TYPE_10GE_BR_U, '10GBASE-DR-U (10GE BiDi Up)'), (TYPE_10GE_CX4, '10GBASE-CX4 (10GE DAC)'), - (TYPE_10GE_ER, '10GBASE-ER (10GE SMF)'), - (TYPE_10GE_LR, '10GBASE-LR (10GE SMF)'), - (TYPE_10GE_LRM, '10GBASE-LRM (10GE SMF)'), - (TYPE_10GE_LX4, '10GBASE-LX4 (10GE MMF/SMF)'), - (TYPE_10GE_SR, '10GBASE-SR (10GE MMF)'), - (TYPE_10GE_FIXED, '10GBASE-T (10GE copper)'), - (TYPE_10GE_ZR, '10GBASE-ZR (10GE SMF)'), + (TYPE_10GE_ER, '10GBASE-ER (10GE)'), + (TYPE_10GE_LR, '10GBASE-LR (10GE)'), + (TYPE_10GE_LRM, '10GBASE-LRM (10GE)'), + (TYPE_10GE_LX4, '10GBASE-LX4 (10GE)'), + (TYPE_10GE_SR, '10GBASE-SR (10GE)'), + (TYPE_10GE_FIXED, '10GBASE-T (10GE)'), + (TYPE_10GE_ZR, '10GBASE-ZR (10GE)'), ) ), ( _('25 Gbps Ethernet'), ( (TYPE_25GE_CR, '25GBASE-CR (25GE DAC)'), - (TYPE_25GE_ER, '25GBASE-ER (25GE SMF)'), - (TYPE_25GE_LR, '25GBASE-LR (25GE SMF)'), - (TYPE_25GE_SR, '25GBASE-SR (25GE MMF)'), - (TYPE_25GE_T, '25GBASE-T (25GE copper)'), + (TYPE_25GE_ER, '25GBASE-ER (25GE)'), + (TYPE_25GE_LR, '25GBASE-LR (25GE)'), + (TYPE_25GE_SR, '25GBASE-SR (25GE)'), + (TYPE_25GE_T, '25GBASE-T (25GE)'), ) ), ( _('40 Gbps Ethernet'), ( (TYPE_40GE_CR4, '40GBASE-CR4 (40GE DAC)'), - (TYPE_40GE_ER4, '40GBASE-ER4 (40GE SMF)'), - (TYPE_40GE_FR4, '40GBASE-FR4 (40GE SMF)'), - (TYPE_40GE_LR4, '40GBASE-LR4 (40GE SMF)'), - (TYPE_40GE_SR4, '40GBASE-SR4 (40GE MMF)'), + (TYPE_40GE_ER4, '40GBASE-ER4 (40GE)'), + (TYPE_40GE_FR4, '40GBASE-FR4 (40GE)'), + (TYPE_40GE_LR4, '40GBASE-LR4 (40GE)'), + (TYPE_40GE_SR4, '40GBASE-SR4 (40GE)'), ) ), ( _('50 Gbps Ethernet'), ( (TYPE_50GE_CR, '50GBASE-CR (50GE DAC)'), - (TYPE_50GE_ER, '50GBASE-ER (50GE SMF)'), - (TYPE_50GE_FR, '50GBASE-FR (50GE SMF)'), - (TYPE_50GE_LR, '50GBASE-LR (50GE SMF)'), - (TYPE_50GE_SR, '50GBASE-SR (50GE MMF)'), + (TYPE_50GE_ER, '50GBASE-ER (50GE)'), + (TYPE_50GE_FR, '50GBASE-FR (50GE)'), + (TYPE_50GE_LR, '50GBASE-LR (50GE)'), + (TYPE_50GE_SR, '50GBASE-SR (50GE)'), ) ), ( @@ -1235,62 +1235,62 @@ class InterfaceTypeChoices(ChoiceSet): (TYPE_100GE_CR2, '100GBASE-CR2 (100GE DAC)'), (TYPE_100GE_CR4, '100GBASE-CR4 (100GE DAC)'), (TYPE_100GE_CR10, '100GBASE-CR10 (100GE DAC)'), - (TYPE_100GE_DR, '100GBASE-DR (100GE SMF)'), - (TYPE_100GE_ER4, '100GBASE-ER4 (100GE SMF)'), - (TYPE_100GE_FR1, '100GBASE-FR1 (100GE SMF)'), - (TYPE_100GE_LR1, '100GBASE-LR1 (100GE SMF)'), - (TYPE_100GE_LR4, '100GBASE-LR4 (100GE SMF)'), - (TYPE_100GE_SR1, '100GBASE-SR1 (100GE MMF)'), - (TYPE_100GE_SR1_2, '100GBASE-SR1.2 (100GE MMF BiDi)'), - (TYPE_100GE_SR2, '100GBASE-SR2 (100GE MMF)'), - (TYPE_100GE_SR4, '100GBASE-SR4 (100GE MMF)'), - (TYPE_100GE_SR10, '100GBASE-SR10 (100GE MMF)'), - (TYPE_100GE_ZR, '100GBASE-ZR (100GE SMF)'), + (TYPE_100GE_DR, '100GBASE-DR (100GE)'), + (TYPE_100GE_ER4, '100GBASE-ER4 (100GE)'), + (TYPE_100GE_FR1, '100GBASE-FR1 (100GE)'), + (TYPE_100GE_LR1, '100GBASE-LR1 (100GE)'), + (TYPE_100GE_LR4, '100GBASE-LR4 (100GE)'), + (TYPE_100GE_SR1, '100GBASE-SR1 (100GE)'), + (TYPE_100GE_SR1_2, '100GBASE-SR1.2 (100GE BiDi)'), + (TYPE_100GE_SR2, '100GBASE-SR2 (100GE)'), + (TYPE_100GE_SR4, '100GBASE-SR4 (100GE)'), + (TYPE_100GE_SR10, '100GBASE-SR10 (100GE)'), + (TYPE_100GE_ZR, '100GBASE-ZR (100GE)'), ) ), ( _('200 Gbps Ethernet'), ( - (TYPE_200GE_CR2, '200GBASE-CR2'), - (TYPE_200GE_CR4, '200GBASE-CR4'), - (TYPE_200GE_SR2, '200GBASE-SR2'), - (TYPE_200GE_SR4, '200GBASE-SR4'), - (TYPE_200GE_DR4, '200GBASE-DR4'), - (TYPE_200GE_ER4, '200GBASE-ER4'), - (TYPE_200GE_FR4, '200GBASE-FR4'), - (TYPE_200GE_LR4, '200GBASE-LR4'), - (TYPE_200GE_VR2, '200GBASE-VR2'), + (TYPE_200GE_CR2, '200GBASE-CR2 (200GE)'), + (TYPE_200GE_CR4, '200GBASE-CR4 (200GE)'), + (TYPE_200GE_SR2, '200GBASE-SR2 (200GE)'), + (TYPE_200GE_SR4, '200GBASE-SR4 (200GE)'), + (TYPE_200GE_DR4, '200GBASE-DR4 (200GE)'), + (TYPE_200GE_ER4, '200GBASE-ER4 (200GE)'), + (TYPE_200GE_FR4, '200GBASE-FR4 (200GE)'), + (TYPE_200GE_LR4, '200GBASE-LR4 (200GE)'), + (TYPE_200GE_VR2, '200GBASE-VR2 (200GE)'), ) ), ( _('400 Gbps Ethernet'), ( - (TYPE_400GE_CR4, '400GBASE-CR4'), - (TYPE_400GE_DR4, '400GBASE-DR4'), - (TYPE_400GE_ER8, '400GBASE-ER8'), - (TYPE_400GE_FR4, '400GBASE-FR4'), - (TYPE_400GE_FR8, '400GBASE-FR8'), - (TYPE_400GE_LR4, '400GBASE-LR4'), - (TYPE_400GE_LR8, '400GBASE-LR8'), - (TYPE_400GE_SR4, '400GBASE-SR4'), - (TYPE_400GE_SR4_2, '400GBASE-SR4.2 (BiDi)'), - (TYPE_400GE_SR8, '400GBASE-SR8'), - (TYPE_400GE_SR16, '400GBASE-SR16'), - (TYPE_400GE_VR4, '400GBASE-VR4'), - (TYPE_400GE_ZR, '400GBASE-ZR'), + (TYPE_400GE_CR4, '400GBASE-CR4 (400GE)'), + (TYPE_400GE_DR4, '400GBASE-DR4 (400GE)'), + (TYPE_400GE_ER8, '400GBASE-ER8 (400GE)'), + (TYPE_400GE_FR4, '400GBASE-FR4 (400GE)'), + (TYPE_400GE_FR8, '400GBASE-FR8 (400GE)'), + (TYPE_400GE_LR4, '400GBASE-LR4 (400GE)'), + (TYPE_400GE_LR8, '400GBASE-LR8 (400GE)'), + (TYPE_400GE_SR4, '400GBASE-SR4 (400GE)'), + (TYPE_400GE_SR4_2, '400GBASE-SR4.2 (400GE BiDi)'), + (TYPE_400GE_SR8, '400GBASE-SR8 (400GE)'), + (TYPE_400GE_SR16, '400GBASE-SR16 (400GE)'), + (TYPE_400GE_VR4, '400GBASE-VR4 (400GE)'), + (TYPE_400GE_ZR, '400GBASE-ZR (400GE)'), ) ), ( _('800 Gbps Ethernet'), ( - (TYPE_800GE_CR8, '800GBASE-CR8'), - (TYPE_800GE_DR8, '800GBASE-DR8'), - (TYPE_800GE_SR8, '800GBASE-SR8'), - (TYPE_800GE_VR8, '800GBASE-VR8'), + (TYPE_800GE_CR8, '800GBASE-CR8 (800GE)'), + (TYPE_800GE_DR8, '800GBASE-DR8 (800GE)'), + (TYPE_800GE_SR8, '800GBASE-SR8 (800GE)'), + (TYPE_800GE_VR8, '800GBASE-VR8 (800GE)'), ) ), ( - _('Ethernet (modular)'), + _('Pluggable transceivers'), ( (TYPE_100ME_SFP, 'SFP (100ME)'), (TYPE_1GE_GBIC, 'GBIC (1GE)'),