From 9a9b94fec98c946667a3bffa4f1035513b6c1328 Mon Sep 17 00:00:00 2001 From: Patrick Hurrelmann Date: Mon, 26 Sep 2022 16:09:03 +0200 Subject: [PATCH 1/6] Fixes: #10356 Add interface type and cable for backplane connections --- netbox/dcim/choices.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 7d35a40f9c6..9dc7ac16033 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -783,6 +783,17 @@ class InterfaceTypeChoices(ChoiceSet): TYPE_400GE_QSFP_DD = '400gbase-x-qsfpdd' TYPE_400GE_OSFP = '400gbase-x-osfp' + # Ethernet Backplane + TYPE_1GE_KX = '1000base-kx' + TYPE_10GE_KR = '10gbase-kr' + TYPE_10GE_KX4 = '10gbase-kx4' + TYPE_25GE_KR = '25gbase-kr' + TYPE_40GE_KR4 = '40gbase-kr4' + TYPE_50GE_KR = '50gbase-kr' + TYPE_100GE_KP4 = '100gbase-kp4' + TYPE_100GE_KR2 = '100gbase-kr2' + TYPE_100GE_KR4 = '100gbase-kr4' + # Wireless TYPE_80211A = 'ieee802.11a' TYPE_80211G = 'ieee802.11g' @@ -911,6 +922,20 @@ class InterfaceTypeChoices(ChoiceSet): (TYPE_400GE_OSFP, 'OSFP (400GE)'), ) ), + ( + 'Ethernet (backplane)', + ( + (TYPE_1GE_KX, '1000BASE-KX (1GE)'), + (TYPE_10GE_KR, '10GBASE-KR (10GE)'), + (TYPE_10GE_KX4, '10GBASE-KX4 (10GE)'), + (TYPE_25GE_KR, '25GBASE-KR (25GE)'), + (TYPE_40GE_KR4, '40GBASE-KR4 (40GE)'), + (TYPE_50GE_KR, '50GBASE-KR (50GE)'), + (TYPE_100GE_KP4, '100GBASE-KP4 (100GE)'), + (TYPE_100GE_KR2, '100GBASE-KR2 (100GE)'), + (TYPE_100GE_KR4, '100GBASE-KR4 (100GE)'), + ) + ), ( 'Wireless', ( @@ -1243,6 +1268,7 @@ class CableTypeChoices(ChoiceSet): TYPE_SMF_OS2 = 'smf-os2' TYPE_AOC = 'aoc' TYPE_POWER = 'power' + TYPE_BACKPLAME = 'backplane' CHOICES = ( ( @@ -1259,6 +1285,7 @@ class CableTypeChoices(ChoiceSet): (TYPE_DAC_PASSIVE, 'Direct Attach Copper (Passive)'), (TYPE_MRJ21_TRUNK, 'MRJ21 Trunk'), (TYPE_COAXIAL, 'Coaxial'), + (TYPE_BACKPLANE, 'Backplane'), ), ), ( From c159b45a754abe9c0781a41bd1725263ae9f3956 Mon Sep 17 00:00:00 2001 From: Patrick Hurrelmann Date: Mon, 26 Sep 2022 17:58:40 +0200 Subject: [PATCH 2/6] Allow Backplone for front and readports , too. --- netbox/dcim/choices.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 9dc7ac16033..6c37975c7c8 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1176,6 +1176,8 @@ class PortTypeChoices(ChoiceSet): TYPE_URM_P4 = 'urm-p4' TYPE_URM_P8 = 'urm-p8' TYPE_OTHER = 'other' + TYPE_BACKPLAME = 'backplane' + CHOICES = ( ( @@ -1199,6 +1201,7 @@ class PortTypeChoices(ChoiceSet): (TYPE_F, 'F Connector'), (TYPE_N, 'N Connector'), (TYPE_MRJ21, 'MRJ21'), + (TYPE_BACKPLANE, 'Backplane'), ), ), ( From 949be3ec4867d550c584154456a4bfaf2cfcf2b1 Mon Sep 17 00:00:00 2001 From: Patrick Hurrelmann Date: Wed, 28 Sep 2022 09:12:16 +0200 Subject: [PATCH 3/6] Correct tyo in port definition --- netbox/dcim/choices.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 6c37975c7c8..62d5b5fc0b5 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1176,7 +1176,7 @@ class PortTypeChoices(ChoiceSet): TYPE_URM_P4 = 'urm-p4' TYPE_URM_P8 = 'urm-p8' TYPE_OTHER = 'other' - TYPE_BACKPLAME = 'backplane' + TYPE_BACKPLANE = 'backplane' CHOICES = ( @@ -1271,7 +1271,7 @@ class CableTypeChoices(ChoiceSet): TYPE_SMF_OS2 = 'smf-os2' TYPE_AOC = 'aoc' TYPE_POWER = 'power' - TYPE_BACKPLAME = 'backplane' + TYPE_BACKPLANE = 'backplane' CHOICES = ( ( From 743fc934c2c7ad5778b52c5e23a1bdbd7901c5dd Mon Sep 17 00:00:00 2001 From: Patrick Hurrelmann Date: Tue, 4 Oct 2022 15:30:21 +0200 Subject: [PATCH 4/6] pep8 fix (blank lines) --- netbox/dcim/choices.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 62d5b5fc0b5..c2508f30a54 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1178,7 +1178,6 @@ class PortTypeChoices(ChoiceSet): TYPE_OTHER = 'other' TYPE_BACKPLANE = 'backplane' - CHOICES = ( ( 'Copper', From 5319666c23f48e8f9ba067f6c6e2f9c5e77c5b81 Mon Sep 17 00:00:00 2001 From: Patrick Hurrelmann Date: Tue, 18 Oct 2022 09:41:08 +0200 Subject: [PATCH 5/6] Remove port type and changed name/description of backplane cable --- netbox/dcim/choices.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index c2508f30a54..d8907673181 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1176,7 +1176,6 @@ class PortTypeChoices(ChoiceSet): TYPE_URM_P4 = 'urm-p4' TYPE_URM_P8 = 'urm-p8' TYPE_OTHER = 'other' - TYPE_BACKPLANE = 'backplane' CHOICES = ( ( @@ -1200,7 +1199,6 @@ class PortTypeChoices(ChoiceSet): (TYPE_F, 'F Connector'), (TYPE_N, 'N Connector'), (TYPE_MRJ21, 'MRJ21'), - (TYPE_BACKPLANE, 'Backplane'), ), ), ( @@ -1287,7 +1285,7 @@ class CableTypeChoices(ChoiceSet): (TYPE_DAC_PASSIVE, 'Direct Attach Copper (Passive)'), (TYPE_MRJ21_TRUNK, 'MRJ21 Trunk'), (TYPE_COAXIAL, 'Coaxial'), - (TYPE_BACKPLANE, 'Backplane'), + (TYPE_BACKPLANE, 'Directly connected (Backplane)'), ), ), ( From dd4d1aa43c0dcf4b36154bb5853635ded17e1e0a Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 16 Nov 2022 10:23:29 -0500 Subject: [PATCH 6/6] Omit backplane cable type --- netbox/dcim/choices.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index d8907673181..14ddc9930e9 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1268,7 +1268,6 @@ class CableTypeChoices(ChoiceSet): TYPE_SMF_OS2 = 'smf-os2' TYPE_AOC = 'aoc' TYPE_POWER = 'power' - TYPE_BACKPLANE = 'backplane' CHOICES = ( ( @@ -1285,7 +1284,6 @@ class CableTypeChoices(ChoiceSet): (TYPE_DAC_PASSIVE, 'Direct Attach Copper (Passive)'), (TYPE_MRJ21_TRUNK, 'MRJ21 Trunk'), (TYPE_COAXIAL, 'Coaxial'), - (TYPE_BACKPLANE, 'Directly connected (Backplane)'), ), ), (