From 4061057407966b39a9fbcbf8a19c4500a0f270e3 Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Fri, 20 Jan 2023 15:36:28 -0500 Subject: [PATCH] Add Schema Interface Types & Correctly Identify Adapters (AT FS Series) (#1024) * 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 * Based on the addition of 100base-fx in the upstream netbox repo, this will allow us to correctly identify these ports * updated 100base-fx interface names --- module-types/Allied Telesis/FS201.yaml | 4 ++-- module-types/Allied Telesis/FS202.yaml | 4 ++-- module-types/Allied Telesis/FS232-1.yaml | 4 ++-- module-types/Allied Telesis/FS232-2.yaml | 4 ++-- module-types/Allied Telesis/FS232.yaml | 4 ++-- module-types/Allied Telesis/FS238A-1.yaml | 4 ++-- module-types/Allied Telesis/FS238B-1.yaml | 4 ++-- schema/components.json | 3 +++ 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/module-types/Allied Telesis/FS201.yaml b/module-types/Allied Telesis/FS201.yaml index 80e0554df..1359c6ed5 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) - type: other + - 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 500561b18..974ea4a5a 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) - type: other + - 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 4b0a1095a..01ee78ce9 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) - type: other + - 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 14cf576e7..49266d857 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) - type: other + - 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 efe3d0355..9edeea975 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) - type: other + - 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 f24ed70e9..db16971cf 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) - type: other + - 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 1bf10aaaf..4a67a118e 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) - type: other + - name: Slot {module} - Port 1 + type: 100base-fx - name: Port 2 (Slot {module}) type: 100base-tx diff --git a/schema/components.json b/schema/components.json index 7a174372a..8cc5f979f 100644 --- a/schema/components.json +++ b/schema/components.json @@ -310,7 +310,10 @@ "virtual", "bridge", "lag", + "100base-fx", + "100base-lfx", "100base-tx", + "100base-t1", "1000base-t", "1000base-x-gbic", "1000base-x-sfp",