From 47784044dccbfc29a7bf24ac18dad8477f57bac7 Mon Sep 17 00:00:00 2001 From: Brian Chow <10820756+Brian-Chow@users.noreply.github.com> Date: Fri, 19 Jul 2024 15:44:36 -0700 Subject: [PATCH 1/3] Closes #16926 Adds various USB cable types to front/rear ports and cable choices --- netbox/dcim/choices.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index fe8d8a158f6..1e09c574e38 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1315,6 +1315,14 @@ class PortTypeChoices(ChoiceSet): TYPE_URM_P2 = 'urm-p2' TYPE_URM_P4 = 'urm-p4' TYPE_URM_P8 = 'urm-p8' + TYPE_USB_A = 'usb-a' + TYPE_USB_B = 'usb-b' + TYPE_USB_C = 'usb-c' + TYPE_USB_MINI_A = 'usb-mini-a' + TYPE_USB_MINI_B = 'usb-mini-b' + TYPE_USB_MICRO_A = 'usb-micro-a' + TYPE_USB_MICRO_B = 'usb-micro-b' + TYPE_USB_MICRO_AB = 'usb-micro-ab' TYPE_OTHER = 'other' CHOICES = ( @@ -1374,6 +1382,19 @@ class PortTypeChoices(ChoiceSet): (TYPE_SPLICE, 'Splice'), ), ), + ( + _('USB'), + ( + (TYPE_USB_A, 'USB-A'), + (TYPE_USB_B, 'USB-B'), + (TYPE_USB_C, 'USB-C'), + (TYPE_USB_MINI_A, 'USB-Mini-A'), + (TYPE_USB_MINI_B, 'USB-Mini-B'), + (TYPE_USB_MICRO_A, 'USB-Micro-A'), + (TYPE_USB_MICRO_B, 'USB-Micro-B'), + (TYPE_USB_MICRO_AB, 'USB-Micro-AB'), + ), + ), ( _('Other'), ( @@ -1412,6 +1433,14 @@ class CableTypeChoices(ChoiceSet): TYPE_SMF_OS2 = 'smf-os2' TYPE_AOC = 'aoc' TYPE_POWER = 'power' + TYPE_USB_A = 'usb-a' + TYPE_USB_B = 'usb-b' + TYPE_USB_C = 'usb-c' + TYPE_USB_MINI_A = 'usb-mini-a' + TYPE_USB_MINI_B = 'usb-mini-b' + TYPE_USB_MICRO_A = 'usb-micro-a' + TYPE_USB_MICRO_B = 'usb-micro-b' + TYPE_USB_MICRO_AB = 'usb-micro-ab' CHOICES = ( ( @@ -1444,6 +1473,18 @@ class CableTypeChoices(ChoiceSet): (TYPE_AOC, 'Active Optical Cabling (AOC)'), ), ), + ( + _('USB'), ( + (TYPE_USB_A, 'USB-A'), + (TYPE_USB_B, 'USB-B'), + (TYPE_USB_C, 'USB-C'), + (TYPE_USB_MINI_A, 'USB-Mini-A'), + (TYPE_USB_MINI_B, 'USB-Mini-B'), + (TYPE_USB_MICRO_A, 'USB-Micro-A'), + (TYPE_USB_MICRO_B, 'USB-Micro-B'), + (TYPE_USB_MICRO_AB, 'USB-Micro-AB'), + ), + ), (TYPE_POWER, _('Power')), ) From 4dd7e6fba26eeee46e7bc2f938554b537d89dd8f Mon Sep 17 00:00:00 2001 From: Brian Chow <10820756+Brian-Chow@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:17:21 -0700 Subject: [PATCH 2/3] Closes #16926 Changes USB cable types to reflect versions-physical differences. Updated human readable labels on USB front/rear ports to match style of usb console ports --- netbox/dcim/choices.py | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 1e09c574e38..931d1614453 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1385,14 +1385,14 @@ class PortTypeChoices(ChoiceSet): ( _('USB'), ( - (TYPE_USB_A, 'USB-A'), - (TYPE_USB_B, 'USB-B'), - (TYPE_USB_C, 'USB-C'), - (TYPE_USB_MINI_A, 'USB-Mini-A'), - (TYPE_USB_MINI_B, 'USB-Mini-B'), - (TYPE_USB_MICRO_A, 'USB-Micro-A'), - (TYPE_USB_MICRO_B, 'USB-Micro-B'), - (TYPE_USB_MICRO_AB, 'USB-Micro-AB'), + (TYPE_USB_A, 'USB Type A'), + (TYPE_USB_B, 'USB Type B'), + (TYPE_USB_C, 'USB Type C'), + (TYPE_USB_MINI_A, 'USB Mini A'), + (TYPE_USB_MINI_B, 'USB Mini B'), + (TYPE_USB_MICRO_A, 'USB Micro A'), + (TYPE_USB_MICRO_B, 'USB Micro B'), + (TYPE_USB_MICRO_AB, 'USB Micro AB'), ), ), ( @@ -1433,14 +1433,14 @@ class CableTypeChoices(ChoiceSet): TYPE_SMF_OS2 = 'smf-os2' TYPE_AOC = 'aoc' TYPE_POWER = 'power' - TYPE_USB_A = 'usb-a' - TYPE_USB_B = 'usb-b' - TYPE_USB_C = 'usb-c' - TYPE_USB_MINI_A = 'usb-mini-a' - TYPE_USB_MINI_B = 'usb-mini-b' - TYPE_USB_MICRO_A = 'usb-micro-a' - TYPE_USB_MICRO_B = 'usb-micro-b' - TYPE_USB_MICRO_AB = 'usb-micro-ab' + TYPE_USB_1 = 'usb-1' + TYPE_USB_1_1 = 'usb-1-1' + TYPE_USB_2 = 'usb-2' + TYPE_USB_3 = 'usb-3' + TYPE_USB_3_1 = 'usb-3-1' + TYPE_USB_3_2 = 'usb-3-2' + TYPE_USB_4 = 'usb-4' + TYPE_USB_4_2 = 'usb-4-2' CHOICES = ( ( @@ -1475,14 +1475,14 @@ class CableTypeChoices(ChoiceSet): ), ( _('USB'), ( - (TYPE_USB_A, 'USB-A'), - (TYPE_USB_B, 'USB-B'), - (TYPE_USB_C, 'USB-C'), - (TYPE_USB_MINI_A, 'USB-Mini-A'), - (TYPE_USB_MINI_B, 'USB-Mini-B'), - (TYPE_USB_MICRO_A, 'USB-Micro-A'), - (TYPE_USB_MICRO_B, 'USB-Micro-B'), - (TYPE_USB_MICRO_AB, 'USB-Micro-AB'), + (TYPE_USB_1, 'USB 1.0'), + (TYPE_USB_1_1, 'USB 1.1'), + (TYPE_USB_2, 'USB 2.0'), + (TYPE_USB_3, 'USB 3.0'), + (TYPE_USB_3_1, 'USB 3.1'), + (TYPE_USB_3_2, 'USB 3.2'), + (TYPE_USB_4, 'USB 4'), + (TYPE_USB_4_2, 'USB 4 2.0'), ), ), (TYPE_POWER, _('Power')), From e3812e648906a486d5da84044114e36a2fa6edc6 Mon Sep 17 00:00:00 2001 From: Brian Chow <10820756+Brian-Chow@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:21:02 -0700 Subject: [PATCH 3/3] Closes #16926 Removes USB cable type choices in favor of single, generic 'USB' cable --- netbox/dcim/choices.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 931d1614453..472cb6f11ee 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1433,14 +1433,7 @@ class CableTypeChoices(ChoiceSet): TYPE_SMF_OS2 = 'smf-os2' TYPE_AOC = 'aoc' TYPE_POWER = 'power' - TYPE_USB_1 = 'usb-1' - TYPE_USB_1_1 = 'usb-1-1' - TYPE_USB_2 = 'usb-2' - TYPE_USB_3 = 'usb-3' - TYPE_USB_3_1 = 'usb-3-1' - TYPE_USB_3_2 = 'usb-3-2' - TYPE_USB_4 = 'usb-4' - TYPE_USB_4_2 = 'usb-4-2' + TYPE_USB = 'usb' CHOICES = ( ( @@ -1473,18 +1466,7 @@ class CableTypeChoices(ChoiceSet): (TYPE_AOC, 'Active Optical Cabling (AOC)'), ), ), - ( - _('USB'), ( - (TYPE_USB_1, 'USB 1.0'), - (TYPE_USB_1_1, 'USB 1.1'), - (TYPE_USB_2, 'USB 2.0'), - (TYPE_USB_3, 'USB 3.0'), - (TYPE_USB_3_1, 'USB 3.1'), - (TYPE_USB_3_2, 'USB 3.2'), - (TYPE_USB_4, 'USB 4'), - (TYPE_USB_4_2, 'USB 4 2.0'), - ), - ), + (TYPE_USB, _('USB')), (TYPE_POWER, _('Power')), )