From 83f7f9f0e5f1583a5e700577b96fb255af2b1674 Mon Sep 17 00:00:00 2001 From: ndom91 Date: Thu, 19 Nov 2020 23:59:51 +0100 Subject: [PATCH 1/4] add: USB power outlet/ports --- netbox/dcim/choices.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index fc5f9c12b..d9f12aa22 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -278,6 +278,15 @@ class PowerPortTypeChoices(ChoiceSet): TYPE_ITA_M = 'ita-m' TYPE_ITA_N = 'ita-n' 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' CHOICES = ( ('IEC 60320', ( @@ -367,6 +376,16 @@ class PowerPortTypeChoices(ChoiceSet): (TYPE_ITA_N, 'ITA Type N'), (TYPE_ITA_O, 'ITA Type 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.0 Micro-B'), + (TYPE_USB_C, 'USB-C'), + )), ) @@ -458,6 +477,10 @@ class PowerOutletTypeChoices(ChoiceSet): 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' CHOICES = ( ('IEC 60320', ( @@ -546,6 +569,11 @@ class PowerOutletTypeChoices(ChoiceSet): (TYPE_ITA_N, 'ITA Type N'), (TYPE_ITA_O, 'ITA Type O'), )), + ('USB', ( + (TYPE_USB_A, 'USB-A'), + (TYPE_USB_MICROB, 'USB Micro-B'), + (TYPE_USB_C, 'USB-C'), + )), ('Proprietary', ( (TYPE_HDOT_CX, 'HDOT Cx'), )), From 825cc9a86f655f9c201649aec3546408313d115b Mon Sep 17 00:00:00 2001 From: ndom91 Date: Tue, 24 Nov 2020 15:44:51 +0100 Subject: [PATCH 2/4] 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', ( From e7e63796ac6144acefe23dd071ceab8a8bda1878 Mon Sep 17 00:00:00 2001 From: ndom91 Date: Tue, 24 Nov 2020 15:50:10 +0100 Subject: [PATCH 3/4] fix: typo --- netbox/dcim/choices.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 94a80de34..a45d6c797 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -382,10 +382,10 @@ class PowerPortTypeChoices(ChoiceSet): (TYPE_USB_A, 'USB-A'), (TYPE_USB_B, 'USB-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_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.0 B'), (TYPE_USB_3_MICROB, 'USB 3.0 Micro-B'), )), From bff9bd5dbdb2b96de5ec9504b2589ee2322b0e97 Mon Sep 17 00:00:00 2001 From: ndom91 Date: Tue, 24 Nov 2020 16:07:22 +0100 Subject: [PATCH 4/4] chore: fix pep8 formatting fail --- netbox/dcim/choices.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index a45d6c797..813f27c96 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -289,7 +289,6 @@ class PowerPortTypeChoices(ChoiceSet): TYPE_USB_3_B = 'usb-3-b' TYPE_USB_3_MICROB = 'usb-3-micro-b' - CHOICES = ( ('IEC 60320', ( (TYPE_IEC_C6, 'C6'),