From 1ed56cb530ed37bdfe57e6c925f11dca37abe9e5 Mon Sep 17 00:00:00 2001 From: Daniel Anner Date: Tue, 3 Jan 2023 17:39:12 -0500 Subject: [PATCH 1/3] Adding 3 new adapter types. 100base-fx, 100base-lfx, and 100base-t1. This addition is contingent on [Netbox PR#11377](https://github.com/netbox-community/netbox/pull/11377) being completed first. This will not be merged until that is complete --- schema/components.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/schema/components.json b/schema/components.json index 8e8f78aafe..09988e695f 100644 --- a/schema/components.json +++ b/schema/components.json @@ -308,7 +308,10 @@ "virtual", "bridge", "lag", + "100base-fx", + "100base-lfx", "100base-tx", + "100base-t1", "1000base-t", "1000base-x-gbic", "1000base-x-sfp", From 6e4c2cafd07a535812b5164966f86dcde1aa292b Mon Sep 17 00:00:00 2001 From: Daniel Anner Date: Tue, 3 Jan 2023 17:41:22 -0500 Subject: [PATCH 2/3] Based on the addition of 100base-fx in the upstream netbox repo, this will allow us to correctly identify these ports --- module-types/Allied Telesis/FS201.yaml | 2 +- module-types/Allied Telesis/FS202.yaml | 2 +- module-types/Allied Telesis/FS232-1.yaml | 2 +- module-types/Allied Telesis/FS232-2.yaml | 2 +- module-types/Allied Telesis/FS232.yaml | 2 +- module-types/Allied Telesis/FS238A-1.yaml | 2 +- module-types/Allied Telesis/FS238B-1.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module-types/Allied Telesis/FS201.yaml b/module-types/Allied Telesis/FS201.yaml index 80e0554df9..a11d785c7b 100644 --- a/module-types/Allied Telesis/FS201.yaml +++ b/module-types/Allied Telesis/FS201.yaml @@ -5,6 +5,6 @@ part_number: AT-FS201 comments: 10/100TX to 100FX (ST) media and rate converter interfaces: - name: Port 1 (Slot {module} - 100Base-FX) - type: other + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS202.yaml b/module-types/Allied Telesis/FS202.yaml index 500561b18f..fa588bfdc1 100644 --- a/module-types/Allied Telesis/FS202.yaml +++ b/module-types/Allied Telesis/FS202.yaml @@ -5,6 +5,6 @@ part_number: AT-FS202 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - name: Port 1 (Slot {module} - 100Base-FX) - type: other + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS232-1.yaml b/module-types/Allied Telesis/FS232-1.yaml index 4b0a1095a3..9708584745 100644 --- a/module-types/Allied Telesis/FS232-1.yaml +++ b/module-types/Allied Telesis/FS232-1.yaml @@ -5,6 +5,6 @@ part_number: AT-FS232/1 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - name: Port 1 (Slot {module} - 100Base-FX) - type: other + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS232-2.yaml b/module-types/Allied Telesis/FS232-2.yaml index 14cf576e75..d70a2e7257 100644 --- a/module-types/Allied Telesis/FS232-2.yaml +++ b/module-types/Allied Telesis/FS232-2.yaml @@ -5,6 +5,6 @@ part_number: AT-FS232/2 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - name: Port 1 (Slot {module} - 100Base-FX) - type: other + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS232.yaml b/module-types/Allied Telesis/FS232.yaml index efe3d03553..131479385f 100644 --- a/module-types/Allied Telesis/FS232.yaml +++ b/module-types/Allied Telesis/FS232.yaml @@ -5,6 +5,6 @@ part_number: AT-FS232 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - name: Port 1 (Slot {module} - 100Base-FX) - type: other + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS238A-1.yaml b/module-types/Allied Telesis/FS238A-1.yaml index f24ed70e96..7adf616b63 100644 --- a/module-types/Allied Telesis/FS238A-1.yaml +++ b/module-types/Allied Telesis/FS238A-1.yaml @@ -5,6 +5,6 @@ part_number: AT-FS238A/1 comments: 10/100TX to 100LX (SC) BiDi media and rate converter interfaces: - name: Port 1 (Slot {module} - 100Base-FX) - type: other + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS238B-1.yaml b/module-types/Allied Telesis/FS238B-1.yaml index 1bf10aaaff..2042d081c7 100644 --- a/module-types/Allied Telesis/FS238B-1.yaml +++ b/module-types/Allied Telesis/FS238B-1.yaml @@ -5,6 +5,6 @@ part_number: AT-FS238B/1 comments: Fast Ethernet to Fiber BiDi Media and Rate Converter interfaces: - name: Port 1 (Slot {module} - 100Base-FX) - type: other + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx From 8ac0e65b3213496a794309118525e4be7d71a955 Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Fri, 20 Jan 2023 20:34:41 +0000 Subject: [PATCH 3/3] updated 100base-fx interface names --- module-types/Allied Telesis/FS201.yaml | 2 +- module-types/Allied Telesis/FS202.yaml | 2 +- module-types/Allied Telesis/FS232-1.yaml | 2 +- module-types/Allied Telesis/FS232-2.yaml | 2 +- module-types/Allied Telesis/FS232.yaml | 2 +- module-types/Allied Telesis/FS238A-1.yaml | 2 +- module-types/Allied Telesis/FS238B-1.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module-types/Allied Telesis/FS201.yaml b/module-types/Allied Telesis/FS201.yaml index a11d785c7b..1359c6ed5c 100644 --- a/module-types/Allied Telesis/FS201.yaml +++ b/module-types/Allied Telesis/FS201.yaml @@ -4,7 +4,7 @@ model: FS201 part_number: AT-FS201 comments: 10/100TX to 100FX (ST) media and rate converter interfaces: - - name: Port 1 (Slot {module} - 100Base-FX) + - name: Slot {module} - Port 1 type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS202.yaml b/module-types/Allied Telesis/FS202.yaml index fa588bfdc1..974ea4a5a3 100644 --- a/module-types/Allied Telesis/FS202.yaml +++ b/module-types/Allied Telesis/FS202.yaml @@ -4,7 +4,7 @@ model: FS202 part_number: AT-FS202 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - - name: Port 1 (Slot {module} - 100Base-FX) + - name: Slot {module} - Port 1 type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS232-1.yaml b/module-types/Allied Telesis/FS232-1.yaml index 9708584745..01ee78ce92 100644 --- a/module-types/Allied Telesis/FS232-1.yaml +++ b/module-types/Allied Telesis/FS232-1.yaml @@ -4,7 +4,7 @@ model: FS232/1 part_number: AT-FS232/1 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - - name: Port 1 (Slot {module} - 100Base-FX) + - name: Slot {module} - Port 1 type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS232-2.yaml b/module-types/Allied Telesis/FS232-2.yaml index d70a2e7257..49266d857e 100644 --- a/module-types/Allied Telesis/FS232-2.yaml +++ b/module-types/Allied Telesis/FS232-2.yaml @@ -4,7 +4,7 @@ model: FS232/2 part_number: AT-FS232/2 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - - name: Port 1 (Slot {module} - 100Base-FX) + - name: Slot {module} - Port 1 type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS232.yaml b/module-types/Allied Telesis/FS232.yaml index 131479385f..9edeea975e 100644 --- a/module-types/Allied Telesis/FS232.yaml +++ b/module-types/Allied Telesis/FS232.yaml @@ -4,7 +4,7 @@ model: FS232 part_number: AT-FS232 comments: Fast Ethernet to Fiber Media and Rate Converter interfaces: - - name: Port 1 (Slot {module} - 100Base-FX) + - name: Slot {module} - Port 1 type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS238A-1.yaml b/module-types/Allied Telesis/FS238A-1.yaml index 7adf616b63..db16971cf5 100644 --- a/module-types/Allied Telesis/FS238A-1.yaml +++ b/module-types/Allied Telesis/FS238A-1.yaml @@ -4,7 +4,7 @@ model: FS238A/1 part_number: AT-FS238A/1 comments: 10/100TX to 100LX (SC) BiDi media and rate converter interfaces: - - name: Port 1 (Slot {module} - 100Base-FX) + - name: Slot {module} - Port 1 type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/module-types/Allied Telesis/FS238B-1.yaml b/module-types/Allied Telesis/FS238B-1.yaml index 2042d081c7..4a67a118e0 100644 --- a/module-types/Allied Telesis/FS238B-1.yaml +++ b/module-types/Allied Telesis/FS238B-1.yaml @@ -4,7 +4,7 @@ model: FS238B/1 part_number: AT-FS238B/1 comments: Fast Ethernet to Fiber BiDi Media and Rate Converter interfaces: - - name: Port 1 (Slot {module} - 100Base-FX) + - name: Slot {module} - Port 1 type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx