From 1c7ef73d1fcff334ff34dba2fff073c934a06c99 Mon Sep 17 00:00:00 2001 From: Dorian Bourgeoisat Date: Tue, 9 Aug 2022 14:20:42 +0200 Subject: [PATCH 1/2] Closes #8595: Added new PON interface types --- netbox/dcim/choices.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 2e96f9c67..c91faf3da 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -814,6 +814,14 @@ class InterfaceTypeChoices(ChoiceSet): # ATM/DSL TYPE_XDSL = 'xdsl' + # PON + TYPE_GPON = 'gpon' + TYPE_XG_PON = 'xg-pon' + TYPE_XGS_PON = 'xgs-pon' + TYPE_TWDM_PON = 'twdm-pon' + TYPE_EPON = 'epon' + TYPE_10G_EPON = '10g-epon' + # Stacking TYPE_STACKWISE = 'cisco-stackwise' TYPE_STACKWISE_PLUS = 'cisco-stackwise-plus' @@ -950,6 +958,17 @@ class InterfaceTypeChoices(ChoiceSet): (TYPE_XDSL, 'xDSL'), ) ), + ( + 'PON', + ( + (TYPE_GPON, 'GPON (2.5 Gbps / 1.25 Gps)'), + (TYPE_XG_PON, 'XG-PON (10 Gbps / 2.5 Gbps)'), + (TYPE_XGS_PON, 'XGS-PON (10 Gbps)'), + (TYPE_TWDM_PON, 'TWDM-PON (NG-PON2) (4x10 Gbps)'), + (TYPE_EPON, 'EPON (1 Gbps)'), + (TYPE_10G_EPON, '10G-EPON (10 Gbps)'), + ) + ), ( 'Stacking', ( From 693ad700e83a49f8f9852bc4a952ed57811c10d4 Mon Sep 17 00:00:00 2001 From: Dorian Bourgeoisat <33571477+DorianXGH@users.noreply.github.com> Date: Fri, 12 Aug 2022 00:49:13 +0200 Subject: [PATCH 2/2] Swapping NG-PON2 as main name instead of TWDM-PON --- 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 c91faf3da..1831ee8ae 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -818,7 +818,7 @@ class InterfaceTypeChoices(ChoiceSet): TYPE_GPON = 'gpon' TYPE_XG_PON = 'xg-pon' TYPE_XGS_PON = 'xgs-pon' - TYPE_TWDM_PON = 'twdm-pon' + TYPE_NG_PON2 = 'ng-pon2' TYPE_EPON = 'epon' TYPE_10G_EPON = '10g-epon' @@ -964,7 +964,7 @@ class InterfaceTypeChoices(ChoiceSet): (TYPE_GPON, 'GPON (2.5 Gbps / 1.25 Gps)'), (TYPE_XG_PON, 'XG-PON (10 Gbps / 2.5 Gbps)'), (TYPE_XGS_PON, 'XGS-PON (10 Gbps)'), - (TYPE_TWDM_PON, 'TWDM-PON (NG-PON2) (4x10 Gbps)'), + (TYPE_NG_PON2, 'NG-PON2 (TWDM-PON) (4x10 Gbps)'), (TYPE_EPON, 'EPON (1 Gbps)'), (TYPE_10G_EPON, '10G-EPON (10 Gbps)'), )