From 825cc9a86f655f9c201649aec3546408313d115b Mon Sep 17 00:00:00 2001 From: ndom91 Date: Tue, 24 Nov 2020 15:44:51 +0100 Subject: [PATCH] update: ordering / completeness of usb connectors --- netbox/dcim/choices.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index d9f12aa22..94a80de34 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -280,13 +280,15 @@ class PowerPortTypeChoices(ChoiceSet): TYPE_ITA_O = 'ita-o' # USB TYPE_USB_A = 'usb-a' - TYPE_USB_MINIA = 'usb-mini-a' - TYPE_USB_MICROA = 'usb-micro-a' TYPE_USB_B = 'usb-b' - TYPE_USB_MINIB = 'usb-mini-b' - TYPE_USB_MICROB = 'usb-micro-b' - TYPE_USB_3_MICROB = 'usb-3-micro-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_3_B = 'usb-3-b' + TYPE_USB_3_MICROB = 'usb-3-micro-b' + CHOICES = ( ('IEC 60320', ( @@ -378,13 +380,14 @@ class PowerPortTypeChoices(ChoiceSet): )), ('USB', ( (TYPE_USB_A, 'USB-A'), - (TYPE_USB_MINIA, 'USB Mini-A'), - (TYPE_USB_MICROA, 'USB Micro-A'), (TYPE_USB_B, 'USB-B'), - (TYPE_USB_MINIB, 'USB Mini-B'), - (TYPE_USB_MICROB, 'USB Micro-B'), - (TYPE_USB_3_MICROB, 'USB 3.0 Micro-B'), (TYPE_USB_C, 'USB-C'), + (TYPE_USB_MINIA, 'USB Mini-A'), + (TYPE_USB_MINIB, 'USB Mini-B'), + (TYPE_USB_MICROA, 'USB Micro-A'), + (TYPE_USB_MICROB, 'USB Micro-B'), + (TYPE_USB_3_B, 'USB 3.0 B'), + (TYPE_USB_3_MICROB, 'USB 3.0 Micro-B'), )), ) @@ -475,12 +478,12 @@ class PowerOutletTypeChoices(ChoiceSet): TYPE_ITA_M = 'ita-m' TYPE_ITA_N = 'ita-n' TYPE_ITA_O = 'ita-o' - # Proprietary - TYPE_HDOT_CX = 'hdot-cx' # USB TYPE_USB_A = 'usb-a' TYPE_USB_MICROB = 'usb-micro-b' TYPE_USB_C = 'usb-c' + # Proprietary + TYPE_HDOT_CX = 'hdot-cx' CHOICES = ( ('IEC 60320', (