From f2709fed8bc7048678efb3c5f2f7cc9a2823837f Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Fri, 20 Jan 2023 19:17:02 -0500 Subject: [PATCH 1/2] Module-Types - Model Name Fixes (#1063) * Updated module types to have proper model names * Updated Aruba module-types so that the model name is accurate * fixing Broadcom part number * updated comments to description * fixed checkpoint model names * moved generic keystone modules to a generic module folder * according to FS datasheets, each item has an Item ID (unique part number) and their associated model name * fixing the other module types * removed mgmt_false definition * removed newlines * removed extra definitions * fixed description, changed to comments * fixing fs part numbers to be strings * removed extra newlines * Removed extra newlines * reemoved blank definition --- device-types/APC/ats-4421.yml | 16 ------- device-types/APC/ats-7723.yml | 12 ----- device-types/APC/epdu1016b.yml | 2 - .../SC-24-double-port_fiber_patch_panel.yaml | 5 -- ...24-double-port_fiber_patch_panel_half.yaml | 5 -- .../Generic/SC-24-port_fiber_patch_panel.yaml | 2 - .../SC-24-port_fiber_patch_panel_half.yaml | 2 - device-types/IBM/bladecenter_h.yaml | 1 - device-types/PC Engines/APU.yaml | 1 - device-types/PC Engines/APU2.yaml | 1 - device-types/PC Engines/APU4.yaml | 1 - device-types/Panduit/CDPP8RG-S.yaml | 1 - device-types/Panduit/CDPP8RG.yaml | 1 - device-types/Panduit/CP24BLY.yaml | 1 - device-types/Panduit/CP48BLY.yaml | 1 - device-types/Panduit/CP48HDBL.yaml | 1 - device-types/Panduit/CPA24BLY.yaml | 1 - device-types/Panduit/CPA48BLY.yaml | 1 - device-types/Panduit/CPA48HDBL.yaml | 1 - device-types/Panduit/CPP24FMWBLY.yaml | 1 - device-types/Panduit/CPP24WBLY.yaml | 1 - device-types/Panduit/CPP48FMWBLY.yaml | 1 - device-types/Panduit/CPP48HDEWBL.yaml | 1 - device-types/Panduit/CPP48WBLY.yaml | 1 - device-types/Panduit/CPP72FMWBLY.yaml | 1 - device-types/Panduit/CPPA24FMWBLY.yaml | 1 - device-types/Panduit/CPPA48FMWBLY.yaml | 1 - device-types/Panduit/CPPA48HDWBLY.yaml | 1 - device-types/Panduit/CPPA72FMWBLY.yaml | 1 - device-types/ZTE/ZXA10-F832-16.yaml | 2 - device-types/neousys/Nuvo-824DGC.yaml | 1 - module-types/Alcatel-Lucent/OS-XNI-U12.yaml | 12 ----- module-types/Aruba/J8712A.yaml | 3 +- module-types/Aruba/J8713A.yaml | 3 +- module-types/Aruba/J9306A.yaml | 3 +- module-types/Aruba/J9534A.yaml | 27 +---------- module-types/Aruba/J9535A.yaml | 27 +---------- module-types/Aruba/J9536A.yaml | 25 +--------- module-types/Aruba/J9537A.yaml | 27 +---------- module-types/Aruba/J9538A.yaml | 11 +---- module-types/Aruba/J9546A.yaml | 11 +---- module-types/Aruba/J9547A.yaml | 27 +---------- module-types/Aruba/J9548A.yaml | 25 +--------- module-types/Aruba/J9549A.yaml | 27 +---------- module-types/Aruba/J9550A.yaml | 27 +---------- module-types/Aruba/J9637A.yaml | 27 +---------- module-types/Aruba/J9827A.yaml | 3 +- module-types/Aruba/J9828A.yaml | 4 +- module-types/Aruba/J9829A.yaml | 4 +- module-types/Aruba/J9830B.yaml | 3 +- module-types/Aruba/J9986A.yaml | 27 +---------- .../NetXtreme-BCM5719-4P.yaml | 2 +- module-types/Check Point/2-10FSR-BP-B.yaml | 5 +- module-types/Check Point/4-10F-C.yaml | 7 +-- module-types/Check Point/4-1C-BP-B.yaml | 7 +-- module-types/Check Point/4-1F-C.yaml | 7 +-- module-types/Check Point/8-1C-C.yaml | 7 +-- module-types/Cisco/A9K-RSP440-LT.yaml | 8 ++-- module-types/Cisco/A9K-RSP440-SE.yaml | 8 ++-- module-types/Cisco/A9K-RSP440-TR.yaml | 8 ++-- module-types/Cisco/ISR4431-X-4x1GE.yaml | 3 +- module-types/Cisco/N77-F348XP-23.yaml | 1 - module-types/Cisco/RSP720-3C-GE.yaml | 2 - module-types/Cisco/UCS-FI-M-6324.yaml | 8 ---- module-types/Cisco/UCS-IOM-2204XP.yaml | 4 -- module-types/Cisco/UCS-IOM-2208XP.yaml | 8 ---- module-types/Cisco/UCS-IOM-2304.yaml | 4 -- module-types/Cisco/UCS-IOM-2408.yaml | 8 ---- module-types/Cisco/VIC2-4FXO.yaml | 6 +-- module-types/Cisco/WS-X4648-RJ45V+E.yaml | 3 +- module-types/Cisco/WS-X4748-RJ45V+E.yaml | 3 +- module-types/Cisco/WS-X6708-10GE.yaml | 8 ---- module-types/Cisco/WS-X6716-10GE.yaml | 16 ------- module-types/Cisco/WS-X6724-SFP.yaml | 24 ---------- module-types/Cisco/WS-X6748-GE-TX.yaml | 48 ------------------- module-types/Cisco/WS-X6748-SFP.yaml | 48 ------------------- module-types/Corning/ECM-UM-12-04-89G.yaml | 14 +++--- module-types/Corning/ECM-UM-12-05-93Q.yaml | 14 +++--- module-types/Corning/ECM-UM-12-05-93T.yaml | 14 +++--- module-types/Corning/ECM-UM-12-05-93V.yaml | 14 +++--- module-types/Dell/3PD98.yaml | 1 + module-types/Dell/49H29.yaml | 2 +- module-types/Eaton/EMPDT1H1C2.yaml | 8 ++-- module-types/Eaton/Network-M2.yaml | 5 +- module-types/FS/FHD-1MTP12LCDSMFA.yaml | 2 +- module-types/FS/FHD-1MTP12LCDSMFAF.yaml | 2 +- module-types/FS/FHD-1MTP6LCDSMFA.yaml | 2 +- module-types/FS/FHD-1MTP6LCDSMFAF.yaml | 2 +- module-types/FS/FHD-2MTP12LCDSMFA.yaml | 2 +- module-types/FS/FHD-2MTP12LCDSMFAF.yaml | 2 +- module-types/FS/FHD-FMP6-CAT6.yaml | 37 -------------- module-types/FS/FHD-FMP6-LC.yaml | 37 -------------- module-types/FS/FHD-FMP6.yaml | 2 +- module-types/FS/FHX-3LCQSMF73.yaml | 4 +- .../{Leviton => Generic}/LC-Keystone.yaml | 6 +-- .../{Leviton => Generic}/RJ45-Keystone.yaml | 6 +-- module-types/HPE/X361.yaml | 5 +- module-types/HPE/X362.yaml | 5 +- module-types/Juniper/MIC-3D-20GE-SFP.yaml | 20 -------- module-types/SM40-1187040G1 | 21 -------- module-types/Sophos/XGCZTCHF2.yaml | 6 +-- module-types/Sophos/XGCZTCHF8.yaml | 12 +---- module-types/TrippLite/SNMPWEBCARD.yaml | 3 +- module-types/Ubiquiti/RPS-AC-100W.yaml | 3 +- module-types/ZTE/CICK.yaml | 30 ++++++------ module-types/ZTE/SCTM.yaml | 8 ++-- 106 files changed, 150 insertions(+), 784 deletions(-) delete mode 100644 module-types/FS/FHD-FMP6-CAT6.yaml delete mode 100644 module-types/FS/FHD-FMP6-LC.yaml rename module-types/{Leviton => Generic}/LC-Keystone.yaml (66%) rename module-types/{Leviton => Generic}/RJ45-Keystone.yaml (72%) diff --git a/device-types/APC/ats-4421.yml b/device-types/APC/ats-4421.yml index 45d03b46a5..cb28901a9f 100644 --- a/device-types/APC/ats-4421.yml +++ b/device-types/APC/ats-4421.yml @@ -5,55 +5,39 @@ slug: ats-ap4421 part_number: ATS-AP4421 u_height: 1 is_full_depth: false - console-ports: - name: con 0 type: rj-45 power-ports: - name: 16A Inlet 1 type: iec-60320-c20 - - name: 16A Inlet 2 type: iec-60320-c20 - power-outlets: - name: Group 1 Outlet 1 type: iec-60320-c13 - - name: Group 1 Outlet 2 type: iec-60320-c13 - - name: Group 1 Outlet 3 type: iec-60320-c13 - - name: Group 1 Outlet 4 type: iec-60320-c13 - - name: Group 2 Outlet 1 type: iec-60320-c13 - - name: Group 2 Outlet 2 type: iec-60320-c13 - - name: Group 2 Outlet 3 type: iec-60320-c13 - - name: Group 2 Outlet 4 type: iec-60320-c13 - - name: Group 3 Outlet 1 type: iec-60320-c13 - - name: Group 3 Outlet 2 type: iec-60320-c13 - - name: Group 3 Outlet 3 type: iec-60320-c13 - - name: Group 3 Outlet 4 type: iec-60320-c13 - - interfaces: - name: eth 1 type: 1000base-t diff --git a/device-types/APC/ats-7723.yml b/device-types/APC/ats-7723.yml index c74acdaf9c..b978bfec11 100644 --- a/device-types/APC/ats-7723.yml +++ b/device-types/APC/ats-7723.yml @@ -5,45 +5,33 @@ slug: ats-ap7723 part_number: ATS-AP7723 u_height: 1 is_full_depth: false - console-ports: - name: con 0 type: rj-45 power-ports: - name: 16A Inlet 1 type: iec-60320-c20 - - name: 16A Inlet 2 type: iec-60320-c20 - power-outlets: - name: 16A Outlet type: iec-60320-c19 - name: Group 1 Outlet 1 type: iec-60320-c13 - - name: Group 1 Outlet 2 type: iec-60320-c13 - - name: Group 1 Outlet 3 type: iec-60320-c13 - - name: Group 1 Outlet 4 type: iec-60320-c13 - - name: Group 2 Outlet 1 type: iec-60320-c13 - - name: Group 2 Outlet 2 type: iec-60320-c13 - - name: Group 2 Outlet 3 type: iec-60320-c13 - - name: Group 2 Outlet 4 type: iec-60320-c13 - - interfaces: - name: eth 1 type: 1000base-t diff --git a/device-types/APC/epdu1016b.yml b/device-types/APC/epdu1016b.yml index e026eb291a..552223ec65 100644 --- a/device-types/APC/epdu1016b.yml +++ b/device-types/APC/epdu1016b.yml @@ -5,11 +5,9 @@ slug: epdu1016b part_number: EPDU1016b u_height: 1 is_full_depth: false - power-ports: - name: 16A Inlet 1 type: iec-60320-c20 - power-outlets: - name: Outlet 1 type: iec-60320-c13 diff --git a/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml b/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml index 8ec1af8a40..f0776b09f1 100644 --- a/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml +++ b/device-types/Generic/SC-24-double-port_fiber_patch_panel.yaml @@ -102,8 +102,6 @@ front-ports: type: sc rear_port: '24.1' rear_port_position: 1 - - - name: '1.2' type: sc rear_port: '1.2' @@ -200,7 +198,6 @@ front-ports: type: sc rear_port: '24.2' rear_port_position: 1 - rear-ports: - name: '1.1' type: sc @@ -274,8 +271,6 @@ rear-ports: - name: '24.1' type: sc positions: 1 - - - name: '1.2' type: sc positions: 1 diff --git a/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml b/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml index 9bbbef69c0..76c368d1c7 100644 --- a/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml +++ b/device-types/Generic/SC-24-double-port_fiber_patch_panel_half.yaml @@ -102,8 +102,6 @@ front-ports: type: sc rear_port: '24.1' rear_port_position: 1 - - - name: '1.2' type: sc rear_port: '1.2' @@ -200,7 +198,6 @@ front-ports: type: sc rear_port: '24.2' rear_port_position: 1 - rear-ports: - name: '1.1' type: sc @@ -274,8 +271,6 @@ rear-ports: - name: '24.1' type: sc positions: 1 - - - name: '1.2' type: sc positions: 1 diff --git a/device-types/Generic/SC-24-port_fiber_patch_panel.yaml b/device-types/Generic/SC-24-port_fiber_patch_panel.yaml index 5341427159..bca2c1545a 100644 --- a/device-types/Generic/SC-24-port_fiber_patch_panel.yaml +++ b/device-types/Generic/SC-24-port_fiber_patch_panel.yaml @@ -102,8 +102,6 @@ front-ports: type: sc rear_port: '24' rear_port_position: 1 - - rear-ports: - name: '1' type: sc diff --git a/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml b/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml index a90864e353..b4c145cc1a 100644 --- a/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml +++ b/device-types/Generic/SC-24-port_fiber_patch_panel_half.yaml @@ -102,8 +102,6 @@ front-ports: type: sc rear_port: '24' rear_port_position: 1 - - rear-ports: - name: '1' type: sc diff --git a/device-types/IBM/bladecenter_h.yaml b/device-types/IBM/bladecenter_h.yaml index f3f299d68c..e0bc6f69b3 100644 --- a/device-types/IBM/bladecenter_h.yaml +++ b/device-types/IBM/bladecenter_h.yaml @@ -5,7 +5,6 @@ slug: bladecenter_h u_height: 9 is_full_depth: true subdevice_role: parent - device-bays: - name: Server Bay 1 - name: Server Bay 2 diff --git a/device-types/PC Engines/APU.yaml b/device-types/PC Engines/APU.yaml index 2a548ee9b3..eac2589630 100644 --- a/device-types/PC Engines/APU.yaml +++ b/device-types/PC Engines/APU.yaml @@ -15,7 +15,6 @@ interfaces: console-ports: - name: ttyS0 type: de-9 - power-ports: - name: Input type: dc-terminal diff --git a/device-types/PC Engines/APU2.yaml b/device-types/PC Engines/APU2.yaml index ca6c1bc64e..076724d29c 100644 --- a/device-types/PC Engines/APU2.yaml +++ b/device-types/PC Engines/APU2.yaml @@ -15,7 +15,6 @@ interfaces: console-ports: - name: ttyS0 type: de-9 - power-ports: - name: Input type: dc-terminal diff --git a/device-types/PC Engines/APU4.yaml b/device-types/PC Engines/APU4.yaml index 25cd9e0285..ca9a79fa23 100644 --- a/device-types/PC Engines/APU4.yaml +++ b/device-types/PC Engines/APU4.yaml @@ -17,7 +17,6 @@ interfaces: console-ports: - name: ttyS0 type: de-9 - power-ports: - name: Input type: dc-terminal diff --git a/device-types/Panduit/CDPP8RG-S.yaml b/device-types/Panduit/CDPP8RG-S.yaml index ace041cfde..a38404e434 100644 --- a/device-types/Panduit/CDPP8RG-S.yaml +++ b/device-types/Panduit/CDPP8RG-S.yaml @@ -38,7 +38,6 @@ front-ports: type: 8p8c rear_port: 08 rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CDPP8RG.yaml b/device-types/Panduit/CDPP8RG.yaml index dba13a95dd..09cb5727e5 100644 --- a/device-types/Panduit/CDPP8RG.yaml +++ b/device-types/Panduit/CDPP8RG.yaml @@ -38,7 +38,6 @@ front-ports: type: 8p8c rear_port: 08 rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CP24BLY.yaml b/device-types/Panduit/CP24BLY.yaml index 2594b5c55f..8b15d3b61d 100644 --- a/device-types/Panduit/CP24BLY.yaml +++ b/device-types/Panduit/CP24BLY.yaml @@ -102,7 +102,6 @@ front-ports: type: 8p8c rear_port: '24' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CP48BLY.yaml b/device-types/Panduit/CP48BLY.yaml index fc1c293078..46a9d4ab58 100644 --- a/device-types/Panduit/CP48BLY.yaml +++ b/device-types/Panduit/CP48BLY.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CP48HDBL.yaml b/device-types/Panduit/CP48HDBL.yaml index 90f5caf72b..7ea9328e47 100644 --- a/device-types/Panduit/CP48HDBL.yaml +++ b/device-types/Panduit/CP48HDBL.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPA24BLY.yaml b/device-types/Panduit/CPA24BLY.yaml index e86130da30..0b39b22b40 100644 --- a/device-types/Panduit/CPA24BLY.yaml +++ b/device-types/Panduit/CPA24BLY.yaml @@ -102,7 +102,6 @@ front-ports: type: 8p8c rear_port: '24' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPA48BLY.yaml b/device-types/Panduit/CPA48BLY.yaml index 6f90976027..422693f74d 100644 --- a/device-types/Panduit/CPA48BLY.yaml +++ b/device-types/Panduit/CPA48BLY.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPA48HDBL.yaml b/device-types/Panduit/CPA48HDBL.yaml index 2da5289ae2..dd29e47ddf 100644 --- a/device-types/Panduit/CPA48HDBL.yaml +++ b/device-types/Panduit/CPA48HDBL.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPP24FMWBLY.yaml b/device-types/Panduit/CPP24FMWBLY.yaml index 1fd7d800bf..c53c348bbd 100644 --- a/device-types/Panduit/CPP24FMWBLY.yaml +++ b/device-types/Panduit/CPP24FMWBLY.yaml @@ -102,7 +102,6 @@ front-ports: type: 8p8c rear_port: '24' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPP24WBLY.yaml b/device-types/Panduit/CPP24WBLY.yaml index dd98ffeb60..8636f0272b 100644 --- a/device-types/Panduit/CPP24WBLY.yaml +++ b/device-types/Panduit/CPP24WBLY.yaml @@ -102,7 +102,6 @@ front-ports: type: 8p8c rear_port: '24' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPP48FMWBLY.yaml b/device-types/Panduit/CPP48FMWBLY.yaml index 68548e34e1..41c21da6b7 100644 --- a/device-types/Panduit/CPP48FMWBLY.yaml +++ b/device-types/Panduit/CPP48FMWBLY.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPP48HDEWBL.yaml b/device-types/Panduit/CPP48HDEWBL.yaml index 89b9fe9c84..ec413dea7f 100644 --- a/device-types/Panduit/CPP48HDEWBL.yaml +++ b/device-types/Panduit/CPP48HDEWBL.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPP48WBLY.yaml b/device-types/Panduit/CPP48WBLY.yaml index 7b8187e5e0..a1e1674ed8 100644 --- a/device-types/Panduit/CPP48WBLY.yaml +++ b/device-types/Panduit/CPP48WBLY.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPP72FMWBLY.yaml b/device-types/Panduit/CPP72FMWBLY.yaml index f5da5d62c0..695da1c488 100644 --- a/device-types/Panduit/CPP72FMWBLY.yaml +++ b/device-types/Panduit/CPP72FMWBLY.yaml @@ -294,7 +294,6 @@ front-ports: type: 8p8c rear_port: '72' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPPA24FMWBLY.yaml b/device-types/Panduit/CPPA24FMWBLY.yaml index 99f649bf1d..ba8a657385 100644 --- a/device-types/Panduit/CPPA24FMWBLY.yaml +++ b/device-types/Panduit/CPPA24FMWBLY.yaml @@ -102,7 +102,6 @@ front-ports: type: 8p8c rear_port: '24' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPPA48FMWBLY.yaml b/device-types/Panduit/CPPA48FMWBLY.yaml index 4668dfb422..6d8287e1a3 100644 --- a/device-types/Panduit/CPPA48FMWBLY.yaml +++ b/device-types/Panduit/CPPA48FMWBLY.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPPA48HDWBLY.yaml b/device-types/Panduit/CPPA48HDWBLY.yaml index 9f97765163..0e17e5eeae 100644 --- a/device-types/Panduit/CPPA48HDWBLY.yaml +++ b/device-types/Panduit/CPPA48HDWBLY.yaml @@ -198,7 +198,6 @@ front-ports: type: 8p8c rear_port: '48' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/Panduit/CPPA72FMWBLY.yaml b/device-types/Panduit/CPPA72FMWBLY.yaml index 7726d46324..c706839c52 100644 --- a/device-types/Panduit/CPPA72FMWBLY.yaml +++ b/device-types/Panduit/CPPA72FMWBLY.yaml @@ -294,7 +294,6 @@ front-ports: type: 8p8c rear_port: '72' rear_port_position: 1 - rear-ports: - name: '01' type: 110-punch diff --git a/device-types/ZTE/ZXA10-F832-16.yaml b/device-types/ZTE/ZXA10-F832-16.yaml index b6d5f3c8e3..425d794d77 100644 --- a/device-types/ZTE/ZXA10-F832-16.yaml +++ b/device-types/ZTE/ZXA10-F832-16.yaml @@ -29,8 +29,6 @@ interfaces: - name: gei_0/1/5 type: 1000base-t mgmt_only: false - - - name: gei_0/1/6 type: 1000base-t mgmt_only: false diff --git a/device-types/neousys/Nuvo-824DGC.yaml b/device-types/neousys/Nuvo-824DGC.yaml index baea86ccd3..8e0091ae95 100644 --- a/device-types/neousys/Nuvo-824DGC.yaml +++ b/device-types/neousys/Nuvo-824DGC.yaml @@ -18,7 +18,6 @@ console-ports: type: other - name: Audio 3.5m plug type: other - interfaces: - name: enp5s0 type: 1000base-t diff --git a/module-types/Alcatel-Lucent/OS-XNI-U12.yaml b/module-types/Alcatel-Lucent/OS-XNI-U12.yaml index 0db2c8042c..c83ca64c03 100644 --- a/module-types/Alcatel-Lucent/OS-XNI-U12.yaml +++ b/module-types/Alcatel-Lucent/OS-XNI-U12.yaml @@ -6,37 +6,25 @@ comments: OmniSwitch 6900 (OS6900) plug-in module with 12X 10G SFP+ ports interfaces: - name: 1/{module}/1 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/2 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/3 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/4 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/5 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/6 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/7 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/8 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/9 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/10 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/11 type: 10gbase-x-sfpp - mgmt_only: false - name: 1/{module}/12 type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Aruba/J8712A.yaml b/module-types/Aruba/J8712A.yaml index 8f0f9a7dde..60f3f68847 100644 --- a/module-types/Aruba/J8712A.yaml +++ b/module-types/Aruba/J8712A.yaml @@ -1,9 +1,10 @@ --- manufacturer: Aruba -model: 100-240v 875w J8712A PSU +model: J8712A part_number: J8712A comments: "## Electrical characteristics\r\n* Voltage: 100-127 VAC1200-240 VAC \n* Maximum current: 12 A15.7 A\r\n* Frequency range: 50160 Hz\r\n* Power:\ \ 875 W\r\n## Notes:\r\n* J8712A supplies 600 W chassis power and 273 W PoE power.\r\n* Two J8712A supplies are required to power the J8715A chassis." power-ports: - name: '{module}' type: iec-60320-c14 + maximum_draw: 875 diff --git a/module-types/Aruba/J8713A.yaml b/module-types/Aruba/J8713A.yaml index 6deef70b40..ff7d9451eb 100644 --- a/module-types/Aruba/J8713A.yaml +++ b/module-types/Aruba/J8713A.yaml @@ -1,6 +1,6 @@ --- manufacturer: Aruba -model: 220v 1500w J8713A PSU +model: J8713A part_number: J8713A comments: "## Physical characteristics\r\n* Dimensions: 6.05 x 7.45 x 5.1 in. (15.37 x 18.92 x 12.95 cm)\r\n* Weight: 7.5 lb (3.4 kg)\r\n\r\n## Electrical\ \ characteristics\r\n* Maximum current: 10A\r\n* Frequency range: 50/60 Hz\r\n* Power 1500 W \r\n* 220V Only\r\n\r\n## Notes\r\nInstallation of the J8713A\ @@ -10,3 +10,4 @@ comments: "## Physical characteristics\r\n* Dimensions: 6.05 x 7.45 x 5.1 in. (1 power-ports: - name: '{module}' type: iec-60320-c20 + maximum_draw: 1500 diff --git a/module-types/Aruba/J9306A.yaml b/module-types/Aruba/J9306A.yaml index a271e41720..f5a5178ca9 100644 --- a/module-types/Aruba/J9306A.yaml +++ b/module-types/Aruba/J9306A.yaml @@ -1,6 +1,6 @@ --- manufacturer: Aruba -model: 100-240v 1500w J9306A PSU +model: J9306A part_number: J9306A comments: "## Physical characteristics\r\n* Dimensions: 6.05(d) x 7.45(w) x 5.1(h) in. (15.37 x 18.92 x 12.95 cm)\r\n* Weight 7.5 Ib (3.2 kg)\r\n* Electrical\ \ characteristics\r\n* Voltage: 100-127 VAC/200-240 VAC\r\n* N3xIimum Current. 13 10A\r\n* Maximum power rating: 1500 W\r\n* Frequency range, 50/60 HZ\r\ @@ -10,3 +10,4 @@ comments: "## Physical characteristics\r\n* Dimensions: 6.05(d) x 7.45(w) x 5.1( power-ports: - name: '{module}' type: iec-60320-c14 + maximum_draw: 1500 diff --git a/module-types/Aruba/J9534A.yaml b/module-types/Aruba/J9534A.yaml index b5636e16b5..cd745a2f53 100644 --- a/module-types/Aruba/J9534A.yaml +++ b/module-types/Aruba/J9534A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9534A 24-port Gig-T PoE+ v2 zl Module +model: J9534A part_number: J9534A +comments: HP J9534A 24-port Gig-T PoE+ v2 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-t - mgmt_only: false - name: '{module}14' type: 1000base-t - mgmt_only: false - name: '{module}15' type: 1000base-t - mgmt_only: false - name: '{module}16' type: 1000base-t - mgmt_only: false - name: '{module}17' type: 1000base-t - mgmt_only: false - name: '{module}18' type: 1000base-t - mgmt_only: false - name: '{module}19' type: 1000base-t - mgmt_only: false - name: '{module}20' type: 1000base-t - mgmt_only: false - name: '{module}21' type: 1000base-t - mgmt_only: false - name: '{module}22' type: 1000base-t - mgmt_only: false - name: '{module}23' type: 1000base-t - mgmt_only: false - name: '{module}24' type: 1000base-t - mgmt_only: false diff --git a/module-types/Aruba/J9535A.yaml b/module-types/Aruba/J9535A.yaml index 2c5d4d3ad6..89d87b08b5 100644 --- a/module-types/Aruba/J9535A.yaml +++ b/module-types/Aruba/J9535A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9535A 20-port Gig-T PoE+/4-port SFP v2 zl Module +model: J9535A part_number: J9535A +comments: HP J9535A 20-port Gig-T PoE+/4-port SFP v2 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-t - mgmt_only: false - name: '{module}14' type: 1000base-t - mgmt_only: false - name: '{module}15' type: 1000base-t - mgmt_only: false - name: '{module}16' type: 1000base-t - mgmt_only: false - name: '{module}17' type: 1000base-t - mgmt_only: false - name: '{module}18' type: 1000base-t - mgmt_only: false - name: '{module}19' type: 1000base-t - mgmt_only: false - name: '{module}20' type: 1000base-t - mgmt_only: false - name: '{module}21' type: 1000base-x-sfp - mgmt_only: false - name: '{module}22' type: 1000base-x-sfp - mgmt_only: false - name: '{module}23' type: 1000base-x-sfp - mgmt_only: false - name: '{module}24' type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Aruba/J9536A.yaml b/module-types/Aruba/J9536A.yaml index f9e102dc16..d560858199 100644 --- a/module-types/Aruba/J9536A.yaml +++ b/module-types/Aruba/J9536A.yaml @@ -1,71 +1,50 @@ --- manufacturer: Aruba -model: HP J9536A 20-port Gig-T PoE+/2-port 10GbE SFP+ v2 zl Module +model: J9536A part_number: J9536A +comments: HP J9536A 20-port Gig-T PoE+/2-port 10GbE SFP+ v2 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-t - mgmt_only: false - name: '{module}14' type: 1000base-t - mgmt_only: false - name: '{module}15' type: 1000base-t - mgmt_only: false - name: '{module}16' type: 1000base-t - mgmt_only: false - name: '{module}17' type: 1000base-t - mgmt_only: false - name: '{module}18' type: 1000base-t - mgmt_only: false - name: '{module}19' type: 1000base-t - mgmt_only: false - name: '{module}20' type: 1000base-t - mgmt_only: false - name: '{module}21' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}22' type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Aruba/J9537A.yaml b/module-types/Aruba/J9537A.yaml index 4029375088..d5224cb738 100644 --- a/module-types/Aruba/J9537A.yaml +++ b/module-types/Aruba/J9537A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9537A 24-port SFP v2 zl Module +model: J9537A part_number: J9537A +comments: HP J9537A 24-port SFP v2 zl Module interfaces: - name: '{module}1' type: 1000base-x-sfp - mgmt_only: false - name: '{module}2' type: 1000base-x-sfp - mgmt_only: false - name: '{module}3' type: 1000base-x-sfp - mgmt_only: false - name: '{module}4' type: 1000base-x-sfp - mgmt_only: false - name: '{module}5' type: 1000base-x-sfp - mgmt_only: false - name: '{module}6' type: 1000base-x-sfp - mgmt_only: false - name: '{module}7' type: 1000base-x-sfp - mgmt_only: false - name: '{module}8' type: 1000base-x-sfp - mgmt_only: false - name: '{module}9' type: 1000base-x-sfp - mgmt_only: false - name: '{module}10' type: 1000base-x-sfp - mgmt_only: false - name: '{module}11' type: 1000base-x-sfp - mgmt_only: false - name: '{module}12' type: 1000base-x-sfp - mgmt_only: false - name: '{module}13' type: 1000base-x-sfp - mgmt_only: false - name: '{module}14' type: 1000base-x-sfp - mgmt_only: false - name: '{module}15' type: 1000base-x-sfp - mgmt_only: false - name: '{module}16' type: 1000base-x-sfp - mgmt_only: false - name: '{module}17' type: 1000base-x-sfp - mgmt_only: false - name: '{module}18' type: 1000base-x-sfp - mgmt_only: false - name: '{module}19' type: 1000base-x-sfp - mgmt_only: false - name: '{module}20' type: 1000base-x-sfp - mgmt_only: false - name: '{module}21' type: 1000base-x-sfp - mgmt_only: false - name: '{module}22' type: 1000base-x-sfp - mgmt_only: false - name: '{module}23' type: 1000base-x-sfp - mgmt_only: false - name: '{module}24' type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Aruba/J9538A.yaml b/module-types/Aruba/J9538A.yaml index 828ca6cc5f..109d8f4c76 100644 --- a/module-types/Aruba/J9538A.yaml +++ b/module-types/Aruba/J9538A.yaml @@ -1,29 +1,22 @@ --- manufacturer: Aruba -model: HP J9538A 8p 10G-GbE SFP+ v2 zl Module +model: J9538A part_number: J9538A +comments: HP J9538A 8p 10G-GbE SFP+ v2 zl Module interfaces: - name: '{module}1' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}2' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}3' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}4' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}5' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}6' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}7' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}8' type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Aruba/J9546A.yaml b/module-types/Aruba/J9546A.yaml index d1f5a38139..4d7303bbb0 100644 --- a/module-types/Aruba/J9546A.yaml +++ b/module-types/Aruba/J9546A.yaml @@ -1,29 +1,22 @@ --- manufacturer: Aruba -model: HP J9546A 8-port 10GBASE-T v2 zl Module +model: J9546A part_number: J9546A +comments: HP J9546A 8-port 10GBASE-T v2 zl Module interfaces: - name: '{module}1' type: 10gbase-t - mgmt_only: false - name: '{module}2' type: 10gbase-t - mgmt_only: false - name: '{module}3' type: 10gbase-t - mgmt_only: false - name: '{module}4' type: 10gbase-t - mgmt_only: false - name: '{module}5' type: 10gbase-t - mgmt_only: false - name: '{module}6' type: 10gbase-t - mgmt_only: false - name: '{module}7' type: 10gbase-t - mgmt_only: false - name: '{module}8' type: 10gbase-t - mgmt_only: false diff --git a/module-types/Aruba/J9547A.yaml b/module-types/Aruba/J9547A.yaml index b39b5244d0..ad831a2d0a 100644 --- a/module-types/Aruba/J9547A.yaml +++ b/module-types/Aruba/J9547A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9547A 24-port 10/100 PoE+ v2 zl Module +model: J9547A part_number: J9547A +comments: HP J9547A 24-port 10/100 PoE+ v2 zl Module interfaces: - name: '{module}1' type: 100base-tx - mgmt_only: false - name: '{module}2' type: 100base-tx - mgmt_only: false - name: '{module}3' type: 100base-tx - mgmt_only: false - name: '{module}4' type: 100base-tx - mgmt_only: false - name: '{module}5' type: 100base-tx - mgmt_only: false - name: '{module}6' type: 100base-tx - mgmt_only: false - name: '{module}7' type: 100base-tx - mgmt_only: false - name: '{module}8' type: 100base-tx - mgmt_only: false - name: '{module}9' type: 100base-tx - mgmt_only: false - name: '{module}10' type: 100base-tx - mgmt_only: false - name: '{module}11' type: 100base-tx - mgmt_only: false - name: '{module}12' type: 100base-tx - mgmt_only: false - name: '{module}13' type: 100base-tx - mgmt_only: false - name: '{module}14' type: 100base-tx - mgmt_only: false - name: '{module}15' type: 100base-tx - mgmt_only: false - name: '{module}16' type: 100base-tx - mgmt_only: false - name: '{module}17' type: 100base-tx - mgmt_only: false - name: '{module}18' type: 100base-tx - mgmt_only: false - name: '{module}19' type: 100base-tx - mgmt_only: false - name: '{module}20' type: 100base-tx - mgmt_only: false - name: '{module}21' type: 100base-tx - mgmt_only: false - name: '{module}22' type: 100base-tx - mgmt_only: false - name: '{module}23' type: 100base-tx - mgmt_only: false - name: '{module}24' type: 100base-tx - mgmt_only: false diff --git a/module-types/Aruba/J9548A.yaml b/module-types/Aruba/J9548A.yaml index 2d486fd21d..879952366b 100644 --- a/module-types/Aruba/J9548A.yaml +++ b/module-types/Aruba/J9548A.yaml @@ -1,71 +1,50 @@ --- manufacturer: Aruba -model: HP J9548A 20-port Gig-T/2-port 10GbE SFP+ v2 zl Module +model: J9548A part_number: J9548A +comments: HP J9548A 20-port Gig-T/2-port 10GbE SFP+ v2 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-t - mgmt_only: false - name: '{module}14' type: 1000base-t - mgmt_only: false - name: '{module}15' type: 1000base-t - mgmt_only: false - name: '{module}16' type: 1000base-t - mgmt_only: false - name: '{module}17' type: 1000base-t - mgmt_only: false - name: '{module}18' type: 1000base-t - mgmt_only: false - name: '{module}19' type: 1000base-t - mgmt_only: false - name: '{module}20' type: 1000base-t - mgmt_only: false - name: '{module}21' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}22' type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Aruba/J9549A.yaml b/module-types/Aruba/J9549A.yaml index d5c6ca96f1..60c8a50943 100644 --- a/module-types/Aruba/J9549A.yaml +++ b/module-types/Aruba/J9549A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9549A 20-port Gig-T/4-port SFP v2 zl Module +model: J9549A part_number: J9549A +comments: HP J9549A 20-port Gig-T/4-port SFP v2 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-t - mgmt_only: false - name: '{module}14' type: 1000base-t - mgmt_only: false - name: '{module}15' type: 1000base-t - mgmt_only: false - name: '{module}16' type: 1000base-t - mgmt_only: false - name: '{module}17' type: 1000base-t - mgmt_only: false - name: '{module}18' type: 1000base-t - mgmt_only: false - name: '{module}19' type: 1000base-t - mgmt_only: false - name: '{module}20' type: 1000base-t - mgmt_only: false - name: '{module}21' type: 1000base-x-sfp - mgmt_only: false - name: '{module}22' type: 1000base-x-sfp - mgmt_only: false - name: '{module}23' type: 1000base-x-sfp - mgmt_only: false - name: '{module}24' type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Aruba/J9550A.yaml b/module-types/Aruba/J9550A.yaml index 434f344945..d307b44604 100644 --- a/module-types/Aruba/J9550A.yaml +++ b/module-types/Aruba/J9550A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9550A 24-port Gig-T v2 zl Module +model: J9550A part_number: J9550A +comments: HP J9550A 24-port Gig-T v2 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-t - mgmt_only: false - name: '{module}14' type: 1000base-t - mgmt_only: false - name: '{module}15' type: 1000base-t - mgmt_only: false - name: '{module}16' type: 1000base-t - mgmt_only: false - name: '{module}17' type: 1000base-t - mgmt_only: false - name: '{module}18' type: 1000base-t - mgmt_only: false - name: '{module}19' type: 1000base-t - mgmt_only: false - name: '{module}20' type: 1000base-t - mgmt_only: false - name: '{module}21' type: 1000base-t - mgmt_only: false - name: '{module}22' type: 1000base-t - mgmt_only: false - name: '{module}23' type: 1000base-t - mgmt_only: false - name: '{module}24' type: 1000base-t - mgmt_only: false diff --git a/module-types/Aruba/J9637A.yaml b/module-types/Aruba/J9637A.yaml index d947f4671e..378691b3be 100644 --- a/module-types/Aruba/J9637A.yaml +++ b/module-types/Aruba/J9637A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9637A 12-port Gig-T PoE+/12-port SFP v2 zl Module +model: J9637A part_number: J9637A +comments: HP J9637A 12-port Gig-T PoE+/12-port SFP v2 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-x-sfp - mgmt_only: false - name: '{module}14' type: 1000base-x-sfp - mgmt_only: false - name: '{module}15' type: 1000base-x-sfp - mgmt_only: false - name: '{module}16' type: 1000base-x-sfp - mgmt_only: false - name: '{module}17' type: 1000base-x-sfp - mgmt_only: false - name: '{module}18' type: 1000base-x-sfp - mgmt_only: false - name: '{module}19' type: 1000base-x-sfp - mgmt_only: false - name: '{module}20' type: 1000base-x-sfp - mgmt_only: false - name: '{module}21' type: 1000base-x-sfp - mgmt_only: false - name: '{module}22' type: 1000base-x-sfp - mgmt_only: false - name: '{module}23' type: 1000base-x-sfp - mgmt_only: false - name: '{module}24' type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Aruba/J9827A.yaml b/module-types/Aruba/J9827A.yaml index c839dc5536..40d628f405 100644 --- a/module-types/Aruba/J9827A.yaml +++ b/module-types/Aruba/J9827A.yaml @@ -1,7 +1,8 @@ --- manufacturer: Aruba -model: HP J9827A Management Module 5400Rzl2 +model: J9827A part_number: J9827A +comments: HP J9827A Management Module 5400Rzl2 console-ports: - name: Auxiliary Port type: usb-a diff --git a/module-types/Aruba/J9828A.yaml b/module-types/Aruba/J9828A.yaml index 00bd288cd0..a486007df5 100644 --- a/module-types/Aruba/J9828A.yaml +++ b/module-types/Aruba/J9828A.yaml @@ -1,7 +1,9 @@ --- manufacturer: Aruba -model: 5400R 700W PoE+ zl2 Power Supply (J9828A) +model: J9828A part_number: J9828A +comments: 5400R 700W PoE+ zl2 Power Supply (J9828A) power-ports: - name: '{module}-1' type: iec-60320-c14 + maximum_draw: 700 diff --git a/module-types/Aruba/J9829A.yaml b/module-types/Aruba/J9829A.yaml index a2afe29136..aed79f5f5b 100644 --- a/module-types/Aruba/J9829A.yaml +++ b/module-types/Aruba/J9829A.yaml @@ -1,7 +1,9 @@ --- manufacturer: Aruba -model: 5400R 1100W PoE+ zl2 Power Supply (J9829A) +model: J9829A part_number: J9829A +comments: 5400R 1100W PoE+ zl2 Power Supply (J9829A) power-ports: - name: '{module}-1' type: iec-60320-c14 + maximum_draw: 1100 diff --git a/module-types/Aruba/J9830B.yaml b/module-types/Aruba/J9830B.yaml index 386e77cae8..f7fa03b13e 100644 --- a/module-types/Aruba/J9830B.yaml +++ b/module-types/Aruba/J9830B.yaml @@ -1,7 +1,8 @@ --- manufacturer: Aruba -model: 5400R 2750W PoE+ zl2 Power Supply (J9830B) +model: J9830B part_number: J9830B +comments: 5400R 2750W PoE+ zl2 Power Supply (J9830B) power-ports: - name: '{module}-1' type: iec-60320-c20 diff --git a/module-types/Aruba/J9986A.yaml b/module-types/Aruba/J9986A.yaml index 54f1d4de14..aef7cd5289 100644 --- a/module-types/Aruba/J9986A.yaml +++ b/module-types/Aruba/J9986A.yaml @@ -1,77 +1,54 @@ --- manufacturer: Aruba -model: HP J9986A 24p 10/100/1000BASE-T PoE+ V3 zl Module +model: J9986A part_number: J9986A +comments: HP J9986A 24p 10/100/1000BASE-T PoE+ V3 zl Module interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false - name: '{module}9' type: 1000base-t - mgmt_only: false - name: '{module}10' type: 1000base-t - mgmt_only: false - name: '{module}11' type: 1000base-t - mgmt_only: false - name: '{module}12' type: 1000base-t - mgmt_only: false - name: '{module}13' type: 1000base-t - mgmt_only: false - name: '{module}14' type: 1000base-t - mgmt_only: false - name: '{module}15' type: 1000base-t - mgmt_only: false - name: '{module}16' type: 1000base-t - mgmt_only: false - name: '{module}17' type: 1000base-t - mgmt_only: false - name: '{module}18' type: 1000base-t - mgmt_only: false - name: '{module}19' type: 1000base-t - mgmt_only: false - name: '{module}20' type: 1000base-t - mgmt_only: false - name: '{module}21' type: 1000base-t - mgmt_only: false - name: '{module}22' type: 1000base-t - mgmt_only: false - name: '{module}23' type: 1000base-t - mgmt_only: false - name: '{module}24' type: 1000base-t - mgmt_only: false diff --git a/module-types/Broadcom Corporation/NetXtreme-BCM5719-4P.yaml b/module-types/Broadcom Corporation/NetXtreme-BCM5719-4P.yaml index 100b51a9b9..a594e0de91 100644 --- a/module-types/Broadcom Corporation/NetXtreme-BCM5719-4P.yaml +++ b/module-types/Broadcom Corporation/NetXtreme-BCM5719-4P.yaml @@ -1,7 +1,7 @@ --- manufacturer: Broadcom Corporation model: NetXtreme BCM5719-4P -part_number: BCM5719-4P +part_number: BCM95719A1904AC comments: '[BCM5719-4P - 4 x 1GbE PCIe NIC](https://www.broadcom.com/products/ethernet-connectivity/network-adapters/bcm5719-4p)' interfaces: - name: pcie{module}.nic1 diff --git a/module-types/Check Point/2-10FSR-BP-B.yaml b/module-types/Check Point/2-10FSR-BP-B.yaml index 4e71890025..83d7401db4 100644 --- a/module-types/Check Point/2-10FSR-BP-B.yaml +++ b/module-types/Check Point/2-10FSR-BP-B.yaml @@ -1,13 +1,12 @@ --- manufacturer: Check Point -model: 2 Port 10G Base-SFP+ fail-open network I/O module interface card +model: CPAC-2-10FSR-BP-B part_number: CPAC-2-10FSR-BP-B +comments: 2 Port 10G Base-SFP+ fail-open network I/O module interface card interfaces: - name: eth{module}-01 label: '1' type: 10gbase-x-sfpp - mgmt_only: false - name: eth{module}-02 label: '2' type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Check Point/4-10F-C.yaml b/module-types/Check Point/4-10F-C.yaml index e59d408fff..be01e7500c 100644 --- a/module-types/Check Point/4-10F-C.yaml +++ b/module-types/Check Point/4-10F-C.yaml @@ -1,21 +1,18 @@ --- manufacturer: Check Point -model: 4 Port 10GBase-F SFP+ interface card +model: CPAC-4-10F-C part_number: CPAC-4-10F-C +comments: 4 Port 10GBase-F SFP+ interface card interfaces: - name: eth{module}-01 label: '1' type: 10gbase-x-sfpp - mgmt_only: false - name: eth{module}-02 label: '2' type: 10gbase-x-sfpp - mgmt_only: false - name: eth{module}-03 label: '3' type: 10gbase-x-sfpp - mgmt_only: false - name: eth{module}-04 label: '4' type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Check Point/4-1C-BP-B.yaml b/module-types/Check Point/4-1C-BP-B.yaml index 123773e0ff..0808749e36 100644 --- a/module-types/Check Point/4-1C-BP-B.yaml +++ b/module-types/Check Point/4-1C-BP-B.yaml @@ -1,21 +1,18 @@ --- manufacturer: Check Point -model: 4 Port 10/100/1000 Base-T RJ45 fail-open network I/O module interface card +model: CPAC-4-1C-BP-B part_number: CPAC-4-1C-BP-B +comments: 4 Port 10/100/1000 Base-T RJ45 fail-open network I/O module interface card interfaces: - name: eth{module}-01 label: '1' type: 1000base-t - mgmt_only: false - name: eth{module}-02 label: '2' type: 1000base-t - mgmt_only: false - name: eth{module}-03 label: '3' type: 1000base-t - mgmt_only: false - name: eth{module}-04 label: '4' type: 1000base-t - mgmt_only: false diff --git a/module-types/Check Point/4-1F-C.yaml b/module-types/Check Point/4-1F-C.yaml index 05fe373c6c..450c333f53 100644 --- a/module-types/Check Point/4-1F-C.yaml +++ b/module-types/Check Point/4-1F-C.yaml @@ -1,21 +1,18 @@ --- manufacturer: Check Point -model: 4 Port 1000Base-F SFP interface card +model: CPAC-4-1F-C part_number: CPAC-4-1F-C +comments: 4 Port 1000Base-F SFP interface card interfaces: - name: eth{module}-01 label: '1' type: 1000base-x-sfp - mgmt_only: false - name: eth{module}-02 label: '2' type: 1000base-x-sfp - mgmt_only: false - name: eth{module}-03 label: '3' type: 1000base-x-sfp - mgmt_only: false - name: eth{module}-04 label: '4' type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Check Point/8-1C-C.yaml b/module-types/Check Point/8-1C-C.yaml index a2837d69cf..8b939e2f5d 100644 --- a/module-types/Check Point/8-1C-C.yaml +++ b/module-types/Check Point/8-1C-C.yaml @@ -1,21 +1,18 @@ --- manufacturer: Check Point -model: 8 Port 10/100/1000 Base-T RJ45 interface card +model: CPAC-8-1C-C part_number: CPAC-8-1C-C +comments: 8 Port 10/100/1000 Base-T RJ45 interface card interfaces: - name: eth{module}-01 label: '1' type: 1000base-t - mgmt_only: false - name: eth{module}-02 label: '2' type: 1000base-t - mgmt_only: false - name: eth{module}-03 label: '3' type: 1000base-t - mgmt_only: false - name: eth{module}-04 label: '4' type: 1000base-t - mgmt_only: false diff --git a/module-types/Cisco/A9K-RSP440-LT.yaml b/module-types/Cisco/A9K-RSP440-LT.yaml index 7afdc0cdc7..0e4996e9b0 100644 --- a/module-types/Cisco/A9K-RSP440-LT.yaml +++ b/module-types/Cisco/A9K-RSP440-LT.yaml @@ -7,22 +7,22 @@ interfaces: - name: MgmtEth0/RSP{module}/CPU0/0 type: 1000base-t mgmt_only: true - description: Out-of-Band Management Interface + comments: Out-of-Band Management Interface - name: MgmtEth0/RSP{module}/CPU0/1 type: 1000base-t mgmt_only: true - description: Out-of-Band Management Interface + comments: Out-of-Band Management Interface - name: External USB2 class-A port type: other mgmt_only: true - name: SFP+_00_10GE type: 10gbase-x-sfpp - description: Virtualization Cluster Port + comments: Virtualization Cluster Port mgmt_only: true - name: SFP+_01_10GE type: 10gbase-x-sfpp mgmt_only: true - description: Virtualization Cluster Port + comments: Virtualization Cluster Port console-ports: - name: Console type: rj-45 diff --git a/module-types/Cisco/A9K-RSP440-SE.yaml b/module-types/Cisco/A9K-RSP440-SE.yaml index 4f5ace7e34..6a8f23da7b 100644 --- a/module-types/Cisco/A9K-RSP440-SE.yaml +++ b/module-types/Cisco/A9K-RSP440-SE.yaml @@ -7,22 +7,22 @@ interfaces: - name: MgmtEth0/RSP{module}/CPU0/0 type: 1000base-t mgmt_only: true - description: Out-of-Band Management Interface + comments: Out-of-Band Management Interface - name: MgmtEth0/RSP{module}/CPU0/1 type: 1000base-t mgmt_only: true - description: Out-of-Band Management Interface + comments: Out-of-Band Management Interface - name: External USB2 class-A port type: other mgmt_only: true - name: SFP+_00_10GE type: 10gbase-x-sfpp - description: Virtualization Cluster Port + comments: Virtualization Cluster Port mgmt_only: true - name: SFP+_01_10GE type: 10gbase-x-sfpp mgmt_only: true - description: Virtualization Cluster Port + comments: Virtualization Cluster Port console-ports: - name: Console type: rj-45 diff --git a/module-types/Cisco/A9K-RSP440-TR.yaml b/module-types/Cisco/A9K-RSP440-TR.yaml index 3315614eba..ee0a0d9edd 100644 --- a/module-types/Cisco/A9K-RSP440-TR.yaml +++ b/module-types/Cisco/A9K-RSP440-TR.yaml @@ -7,22 +7,22 @@ interfaces: - name: MgmtEth0/RSP{module}/CPU0/0 type: 1000base-t mgmt_only: true - description: Out-of-Band Management Interface + comments: Out-of-Band Management Interface - name: MgmtEth0/RSP{module}/CPU0/1 type: 1000base-t mgmt_only: true - description: Out-of-Band Management Interface + comments: Out-of-Band Management Interface - name: External USB2 class-A port type: other mgmt_only: true - name: SFP+_00_10GE type: 10gbase-x-sfpp - description: Virtualization Cluster Port + comments: Virtualization Cluster Port mgmt_only: true - name: SFP+_01_10GE type: 10gbase-x-sfpp mgmt_only: true - description: Virtualization Cluster Port + comments: Virtualization Cluster Port console-ports: - name: Console type: rj-45 diff --git a/module-types/Cisco/ISR4431-X-4x1GE.yaml b/module-types/Cisco/ISR4431-X-4x1GE.yaml index 0d038f4046..d0ab3c3b0f 100644 --- a/module-types/Cisco/ISR4431-X-4x1GE.yaml +++ b/module-types/Cisco/ISR4431-X-4x1GE.yaml @@ -1,7 +1,8 @@ --- manufacturer: Cisco part_number: ISR4431-X-4x1GE -model: Front Panel 4 ports Gigabitethernet Module +model: ISR4431-X-4x1GE +comments: Front Panel 4 ports Gigabitethernet Module interfaces: - name: GigabitEthernet{module}/0/0 type: 1000base-t diff --git a/module-types/Cisco/N77-F348XP-23.yaml b/module-types/Cisco/N77-F348XP-23.yaml index 3fe85c83cd..1093ce9f4f 100644 --- a/module-types/Cisco/N77-F348XP-23.yaml +++ b/module-types/Cisco/N77-F348XP-23.yaml @@ -2,7 +2,6 @@ manufacturer: Cisco model: N77-F348XP-23 part_number: N77-F348XP-23 - interfaces: - name: Ethernet{module}/1 type: 10gbase-x-sfpp diff --git a/module-types/Cisco/RSP720-3C-GE.yaml b/module-types/Cisco/RSP720-3C-GE.yaml index 91744b07e9..920d4c3cb9 100644 --- a/module-types/Cisco/RSP720-3C-GE.yaml +++ b/module-types/Cisco/RSP720-3C-GE.yaml @@ -8,7 +8,5 @@ console-ports: interfaces: - name: Gi{module}/1 type: 1000base-x-sfp - mgmt_only: false - name: Gi{module}/2 type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Cisco/UCS-FI-M-6324.yaml b/module-types/Cisco/UCS-FI-M-6324.yaml index 7fe80f848c..ed0dd787c1 100644 --- a/module-types/Cisco/UCS-FI-M-6324.yaml +++ b/module-types/Cisco/UCS-FI-M-6324.yaml @@ -10,28 +10,20 @@ console-ports: interfaces: - name: Fabric {module}/5/1 type: 40gbase-x-qsfpp - mgmt_only: false - name: Fabric {module}/5/2 type: 40gbase-x-qsfpp - mgmt_only: false - name: Fabric {module}/5/3 type: 40gbase-x-qsfpp - mgmt_only: false - name: Fabric {module}/5/4 type: 40gbase-x-qsfpp - mgmt_only: false - name: Fabric {module}/1 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/2 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/3 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/4 type: 10gbase-x-sfpp - mgmt_only: false - name: IOM {module} Mgmt0 type: 1000base-t mgmt_only: true diff --git a/module-types/Cisco/UCS-IOM-2204XP.yaml b/module-types/Cisco/UCS-IOM-2204XP.yaml index b55f02056e..23a8b9c4a3 100644 --- a/module-types/Cisco/UCS-IOM-2204XP.yaml +++ b/module-types/Cisco/UCS-IOM-2204XP.yaml @@ -5,13 +5,9 @@ part_number: UCS-IOM-2204XP interfaces: - name: Fabric {module}/1 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/2 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/3 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/4 type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Cisco/UCS-IOM-2208XP.yaml b/module-types/Cisco/UCS-IOM-2208XP.yaml index 9b1b19b1c8..bff5d124e2 100644 --- a/module-types/Cisco/UCS-IOM-2208XP.yaml +++ b/module-types/Cisco/UCS-IOM-2208XP.yaml @@ -5,25 +5,17 @@ part_number: UCS-IOM-2208XP interfaces: - name: Fabric {module}/1 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/2 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/3 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/4 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/5 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/6 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/7 type: 10gbase-x-sfpp - mgmt_only: false - name: Fabric {module}/8 type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Cisco/UCS-IOM-2304.yaml b/module-types/Cisco/UCS-IOM-2304.yaml index c38c159ec7..736e1cdbbf 100644 --- a/module-types/Cisco/UCS-IOM-2304.yaml +++ b/module-types/Cisco/UCS-IOM-2304.yaml @@ -5,13 +5,9 @@ part_number: UCS-IOM-2304 interfaces: - name: Fabric {module}/1 type: 40gbase-x-qsfpp - mgmt_only: false - name: Fabric {module}/2 type: 40gbase-x-qsfpp - mgmt_only: false - name: Fabric {module}/3 type: 40gbase-x-qsfpp - mgmt_only: false - name: Fabric {module}/4 type: 40gbase-x-qsfpp - mgmt_only: false diff --git a/module-types/Cisco/UCS-IOM-2408.yaml b/module-types/Cisco/UCS-IOM-2408.yaml index 2c9fa95bb3..97d6d2cb0d 100644 --- a/module-types/Cisco/UCS-IOM-2408.yaml +++ b/module-types/Cisco/UCS-IOM-2408.yaml @@ -5,25 +5,17 @@ part_number: UCS-IOM-2408 interfaces: - name: Fabric {module}/1 type: 25gbase-x-sfp28 - mgmt_only: false - name: Fabric {module}/2 type: 25gbase-x-sfp28 - mgmt_only: false - name: Fabric {module}/3 type: 25gbase-x-sfp28 - mgmt_only: false - name: Fabric {module}/4 type: 25gbase-x-sfp28 - mgmt_only: false - name: Fabric {module}/5 type: 25gbase-x-sfp28 - mgmt_only: false - name: Fabric {module}/6 type: 25gbase-x-sfp28 - mgmt_only: false - name: Fabric {module}/7 type: 25gbase-x-sfp28 - mgmt_only: false - name: Fabric {module}/8 type: 25gbase-x-sfp28 - mgmt_only: false diff --git a/module-types/Cisco/VIC2-4FXO.yaml b/module-types/Cisco/VIC2-4FXO.yaml index c53ef85879..3eee43ee03 100644 --- a/module-types/Cisco/VIC2-4FXO.yaml +++ b/module-types/Cisco/VIC2-4FXO.yaml @@ -2,21 +2,17 @@ manufacturer: Cisco model: VIC2-4FXO part_number: VIC2-4FXO -comments: 'Description: 2nd generation four port FXO voice interface daughtercard' +comments: 2nd generation four port FXO voice interface daughtercard interfaces: - name: voice-port {module}/0 type: other - mgmt_only: false label: '0' - name: voice-port {module}/1 type: other - mgmt_only: false label: '1' - name: voice-port {module}/2 type: other - mgmt_only: false label: '2' - name: voice-port {module}/3 type: other - mgmt_only: false label: '3' diff --git a/module-types/Cisco/WS-X4648-RJ45V+E.yaml b/module-types/Cisco/WS-X4648-RJ45V+E.yaml index 29d99d03b5..3948aa5abd 100644 --- a/module-types/Cisco/WS-X4648-RJ45V+E.yaml +++ b/module-types/Cisco/WS-X4648-RJ45V+E.yaml @@ -1,7 +1,8 @@ --- manufacturer: Cisco part_number: WS-X4648-RJ45V+E -model: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports +model: WS-X4648-RJ45V+E +comments: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports interfaces: - name: GigabitEthernet{module}/1 type: 1000base-t diff --git a/module-types/Cisco/WS-X4748-RJ45V+E.yaml b/module-types/Cisco/WS-X4748-RJ45V+E.yaml index 25f150afed..a946f3ab4c 100644 --- a/module-types/Cisco/WS-X4748-RJ45V+E.yaml +++ b/module-types/Cisco/WS-X4748-RJ45V+E.yaml @@ -1,7 +1,8 @@ --- manufacturer: Cisco part_number: WS-X4748-RJ45V+E -model: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports +model: WS-X4748-RJ45V+E +comments: 10/100/1000BaseT (RJ45)+V E Series with 48 10/100/1000 baseT Premium PoE ports interfaces: - name: GigabitEthernet{module}/1 type: 1000base-t diff --git a/module-types/Cisco/WS-X6708-10GE.yaml b/module-types/Cisco/WS-X6708-10GE.yaml index fee8da725d..0ea0126853 100644 --- a/module-types/Cisco/WS-X6708-10GE.yaml +++ b/module-types/Cisco/WS-X6708-10GE.yaml @@ -5,25 +5,17 @@ part_number: WS-X6708-10GE interfaces: - name: TenGigabitEthernet{module}/1 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/2 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/3 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/4 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/5 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/6 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/7 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/8 type: 10gbase-x-x2 - mgmt_only: false diff --git a/module-types/Cisco/WS-X6716-10GE.yaml b/module-types/Cisco/WS-X6716-10GE.yaml index 912487e28a..c16d3f40d5 100644 --- a/module-types/Cisco/WS-X6716-10GE.yaml +++ b/module-types/Cisco/WS-X6716-10GE.yaml @@ -5,49 +5,33 @@ part_number: WS-X6716-10GE interfaces: - name: TenGigabitEthernet{module}/1 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/2 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/3 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/4 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/5 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/6 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/7 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/8 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/9 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/10 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/11 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/12 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/13 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/14 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/15 type: 10gbase-x-x2 - mgmt_only: false - name: TenGigabitEthernet{module}/16 type: 10gbase-x-x2 - mgmt_only: false diff --git a/module-types/Cisco/WS-X6724-SFP.yaml b/module-types/Cisco/WS-X6724-SFP.yaml index a3d3f80c0d..30520e836d 100644 --- a/module-types/Cisco/WS-X6724-SFP.yaml +++ b/module-types/Cisco/WS-X6724-SFP.yaml @@ -5,73 +5,49 @@ part_number: WS-X6724-SFP interfaces: - name: GigabitEthernet{module}/1 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/2 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/3 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/4 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/5 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/6 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/7 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/8 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/9 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/10 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/11 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/12 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/13 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/14 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/15 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/16 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/17 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/18 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/19 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/20 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/21 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/22 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/23 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/24 type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Cisco/WS-X6748-GE-TX.yaml b/module-types/Cisco/WS-X6748-GE-TX.yaml index 7982408d89..493d8277f3 100644 --- a/module-types/Cisco/WS-X6748-GE-TX.yaml +++ b/module-types/Cisco/WS-X6748-GE-TX.yaml @@ -5,145 +5,97 @@ part_number: WS-X6748-GE-TX interfaces: - name: GigabitEthernet{module}/1 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/2 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/3 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/4 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/5 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/6 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/7 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/8 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/9 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/10 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/11 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/12 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/13 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/14 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/15 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/16 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/17 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/18 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/19 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/20 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/21 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/22 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/23 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/24 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/25 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/26 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/27 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/28 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/29 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/30 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/31 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/32 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/33 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/34 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/35 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/36 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/37 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/38 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/39 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/40 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/41 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/42 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/43 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/44 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/45 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/46 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/47 type: 1000base-t - mgmt_only: false - name: GigabitEthernet{module}/48 type: 1000base-t - mgmt_only: false diff --git a/module-types/Cisco/WS-X6748-SFP.yaml b/module-types/Cisco/WS-X6748-SFP.yaml index 9f42c74930..616b8b878f 100644 --- a/module-types/Cisco/WS-X6748-SFP.yaml +++ b/module-types/Cisco/WS-X6748-SFP.yaml @@ -5,145 +5,97 @@ part_number: WS-X6748-SFP interfaces: - name: GigabitEthernet{module}/1 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/2 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/3 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/4 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/5 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/6 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/7 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/8 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/9 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/10 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/11 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/12 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/13 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/14 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/15 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/16 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/17 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/18 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/19 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/20 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/21 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/22 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/23 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/24 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/25 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/26 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/27 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/28 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/29 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/30 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/31 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/32 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/33 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/34 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/35 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/36 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/37 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/38 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/39 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/40 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/41 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/42 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/43 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/44 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/45 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/46 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/47 type: 1000base-x-sfp - mgmt_only: false - name: GigabitEthernet{module}/48 type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/Corning/ECM-UM-12-04-89G.yaml b/module-types/Corning/ECM-UM-12-04-89G.yaml index ab4dfeb1fd..2a0c775a4d 100644 --- a/module-types/Corning/ECM-UM-12-04-89G.yaml +++ b/module-types/Corning/ECM-UM-12-04-89G.yaml @@ -9,34 +9,34 @@ front-ports: type: lc rear_port: '{module}1-6' rear_port_position: 1 - description: Front Port 1 (Strands 1-2) + comments: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - description: Front Port 2 (Strands 3-4) + comments: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - description: Front Port 3 (Strands 5-6) + comments: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - description: Front Port 4 (Strands 7-8) + comments: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - description: Front Port 5 (Strands 9-10) + comments: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - description: Front Port 6 (Strands 11-12) + comments: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - description: Rear Port MPO connector ports 1-6 (strands 1-12) + comments: Rear Port MPO connector ports 1-6 (strands 1-12) diff --git a/module-types/Corning/ECM-UM-12-05-93Q.yaml b/module-types/Corning/ECM-UM-12-05-93Q.yaml index f8cfa83ed8..47ff1a5a2b 100644 --- a/module-types/Corning/ECM-UM-12-05-93Q.yaml +++ b/module-types/Corning/ECM-UM-12-05-93Q.yaml @@ -9,34 +9,34 @@ front-ports: type: lc rear_port: '{module}1-6' rear_port_position: 1 - description: Front Port 1 (Strands 1-2) + comments: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - description: Front Port 2 (Strands 3-4) + comments: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - description: Front Port 3 (Strands 5-6) + comments: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - description: Front Port 4 (Strands 7-8) + comments: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - description: Front Port 5 (Strands 9-10) + comments: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - description: Front Port 6 (Strands 11-12) + comments: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - description: Rear Port MPO connector ports 1-6 (strands 1-12) + comments: Rear Port MPO connector ports 1-6 (strands 1-12) diff --git a/module-types/Corning/ECM-UM-12-05-93T.yaml b/module-types/Corning/ECM-UM-12-05-93T.yaml index 6bf4a027dd..9e27ff844a 100644 --- a/module-types/Corning/ECM-UM-12-05-93T.yaml +++ b/module-types/Corning/ECM-UM-12-05-93T.yaml @@ -9,34 +9,34 @@ front-ports: type: lc rear_port: '{module}1-6' rear_port_position: 1 - description: Front Port 1 (Strands 1-2) + comments: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - description: Front Port 2 (Strands 3-4) + comments: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - description: Front Port 3 (Strands 5-6) + comments: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - description: Front Port 4 (Strands 7-8) + comments: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - description: Front Port 5 (Strands 9-10) + comments: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - description: Front Port 6 (Strands 11-12) + comments: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - description: Rear Port MPO connector ports 1-6 (strands 1-12) + comments: Rear Port MPO connector ports 1-6 (strands 1-12) diff --git a/module-types/Corning/ECM-UM-12-05-93V.yaml b/module-types/Corning/ECM-UM-12-05-93V.yaml index beed5ba731..5298fa5d29 100644 --- a/module-types/Corning/ECM-UM-12-05-93V.yaml +++ b/module-types/Corning/ECM-UM-12-05-93V.yaml @@ -9,34 +9,34 @@ front-ports: type: lc rear_port: '{module}1-6' rear_port_position: 1 - description: Front Port 1 (Strands 1-2) + comments: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - description: Front Port 2 (Strands 3-4) + comments: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - description: Front Port 3 (Strands 5-6) + comments: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - description: Front Port 4 (Strands 7-8) + comments: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - description: Front Port 5 (Strands 9-10) + comments: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - description: Front Port 6 (Strands 11-12) + comments: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - description: Rear Port MPO connector ports 1-6 (strands 1-12) + comments: Rear Port MPO connector ports 1-6 (strands 1-12) diff --git a/module-types/Dell/3PD98.yaml b/module-types/Dell/3PD98.yaml index f86f452f30..c39906fe35 100644 --- a/module-types/Dell/3PD98.yaml +++ b/module-types/Dell/3PD98.yaml @@ -6,3 +6,4 @@ comments: Dell 3PD98 PV ME412 ME424 ME4012 ME4024 ME5012 ME5024 C13 580W AC Powe power-ports: - name: PSU{module} type: iec-60320-c14 + maximum_draw: 580 diff --git a/module-types/Dell/49H29.yaml b/module-types/Dell/49H29.yaml index 3a714f1d1c..0a4052bf5b 100644 --- a/module-types/Dell/49H29.yaml +++ b/module-types/Dell/49H29.yaml @@ -2,7 +2,7 @@ manufacturer: Dell model: 49H29 part_number: 49H29 -comments: SAS 4 Port Controller for use in the Dell ME4012 and Dell ME4024 +comments: PowerVault ME4012 ME4024 SAS 4 Port Controller interfaces: - name: mgmtport_{module} type: 1000base-t diff --git a/module-types/Eaton/EMPDT1H1C2.yaml b/module-types/Eaton/EMPDT1H1C2.yaml index 2463579e2f..de4c23717e 100644 --- a/module-types/Eaton/EMPDT1H1C2.yaml +++ b/module-types/Eaton/EMPDT1H1C2.yaml @@ -1,16 +1,14 @@ --- manufacturer: Eaton -model: Environmental Monitoring Probe Gen 2 +model: EMPDT1H1C2 part_number: EMPDT1H1C2 comments: Environmental Monitoring Probe Gen 2 [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/power-management-software-connectivity/eaton-environmental-monitoring-probe-gen-2/eaton-emp-gen-2-manual.pdf) interfaces: - name: EMP{module}/Device type: other - mgmt_only: false label: from device - description: RJ45 connector for RS485/Modbus connection + comments: RJ45 connector for RS485/Modbus connection - name: EMP{module}/Sensors type: other - mgmt_only: false label: to sensors - description: RJ45 connector for RS485/Modbus connection + comments: RJ45 connector for RS485/Modbus connection diff --git a/module-types/Eaton/Network-M2.yaml b/module-types/Eaton/Network-M2.yaml index caf0e53d64..2c68851bd7 100644 --- a/module-types/Eaton/Network-M2.yaml +++ b/module-types/Eaton/Network-M2.yaml @@ -8,12 +8,11 @@ interfaces: type: other mgmt_only: true label: Settings - description: RNDIS (Ethernet over USB) connection with USB Micro-B connector + comments: RNDIS (Ethernet over USB) connection with USB Micro-B connector - name: Sensors type: other - mgmt_only: false label: AUX - description: USB-A connection for USB to RS485/Modbus connection to environmental sensors + comments: USB-A connection for USB to RS485/Modbus connection to environmental sensors - name: mgmt type: 1000base-t mgmt_only: true diff --git a/module-types/FS/FHD-1MTP12LCDSMFA.yaml b/module-types/FS/FHD-1MTP12LCDSMFA.yaml index 1ad7de5025..ea8c712e93 100644 --- a/module-types/FS/FHD-1MTP12LCDSMFA.yaml +++ b/module-types/FS/FHD-1MTP12LCDSMFA.yaml @@ -1,7 +1,7 @@ --- manufacturer: FS model: FHD-1MTP12LCDSMFA -part_number: FHD-1MTP12LCDSMFA (#57023) +part_number: '57023' comments: FHD MTP-24 Cassette, 24 Fibers OS2 Single Mode, Type A, MTP to 12 x LC Duplex front-ports: - name: '{module}:1-2' diff --git a/module-types/FS/FHD-1MTP12LCDSMFAF.yaml b/module-types/FS/FHD-1MTP12LCDSMFAF.yaml index c009d94f9c..7ed7c499d4 100644 --- a/module-types/FS/FHD-1MTP12LCDSMFAF.yaml +++ b/module-types/FS/FHD-1MTP12LCDSMFAF.yaml @@ -1,7 +1,7 @@ --- manufacturer: FS model: FHD-1MTP12LCDSMFAF -part_number: FHD-1MTP12LCDSMFAF (#68549) +part_number: '68549' comments: FHD MTP-24 Cassette, 24 Fibers OS2 Single Mode, Type AF, MTP to 12 x LC Duplex front-ports: - name: '{module}:1-2' diff --git a/module-types/FS/FHD-1MTP6LCDSMFA.yaml b/module-types/FS/FHD-1MTP6LCDSMFA.yaml index 0c06028337..2e90dcdaa6 100644 --- a/module-types/FS/FHD-1MTP6LCDSMFA.yaml +++ b/module-types/FS/FHD-1MTP6LCDSMFA.yaml @@ -1,8 +1,8 @@ --- manufacturer: FS model: FHD-1MTP6LCDSMFA +part_number: '57016' comments: FHD MTP-12 Cassette, 12 Fibers OS2 Single Mode, Type AF, MTP to 6 x LC Duplex (Blue), 0.35dB max -part_number: FHD-1MTP6LCDSMFA (#57016) front-ports: - name: '{module}:1-2' type: lc diff --git a/module-types/FS/FHD-1MTP6LCDSMFAF.yaml b/module-types/FS/FHD-1MTP6LCDSMFAF.yaml index 8422113d6d..d8cf9bbc90 100644 --- a/module-types/FS/FHD-1MTP6LCDSMFAF.yaml +++ b/module-types/FS/FHD-1MTP6LCDSMFAF.yaml @@ -1,8 +1,8 @@ --- manufacturer: FS model: FHD-1MTP6LCDSMFAF +part_number: '57037' comments: FHD MTP-12 Cassette, 12 Fibers OS2 Single Mode, Type AF, MTP to 6 x LC Duplex (Blue), 0.35dB max -part_number: FHD-1MTP6LCDSMFAF (#57037) front-ports: - name: '{module}:1-2' type: lc diff --git a/module-types/FS/FHD-2MTP12LCDSMFA.yaml b/module-types/FS/FHD-2MTP12LCDSMFA.yaml index 94df3a73bc..03a59dd61e 100644 --- a/module-types/FS/FHD-2MTP12LCDSMFA.yaml +++ b/module-types/FS/FHD-2MTP12LCDSMFA.yaml @@ -1,8 +1,8 @@ --- manufacturer: FS model: FHD-2MTP12LCDSMFA +part_number: '57341' comments: FHD 2 x MTP-12 Cassette, 24 Fibers OS2 Single Mode, Type A, 2 x 12F MTP to 12 x LC Duplex (Blue), 0.35dB max -part_number: FHD-2MTP12LCDSMFA (#57341) front-ports: - name: '{module}:1-2' type: lc diff --git a/module-types/FS/FHD-2MTP12LCDSMFAF.yaml b/module-types/FS/FHD-2MTP12LCDSMFAF.yaml index 8b4dddee6d..e5f1d2faa7 100644 --- a/module-types/FS/FHD-2MTP12LCDSMFAF.yaml +++ b/module-types/FS/FHD-2MTP12LCDSMFAF.yaml @@ -1,8 +1,8 @@ --- manufacturer: FS model: FHD-2MTP12LCDSMFAF +part_number: '68540' comments: FHD 2 x MTP-12 Cassette, 24 Fibers OS2 Single Mode, Type AF, 2 x 12F MTP to 12 x LC Duplex (Blue), 0.35dB max -part_number: FHD-2MTP12LCDSMFAF (#68540) front-ports: - name: '{module}:1-2' type: lc diff --git a/module-types/FS/FHD-FMP6-CAT6.yaml b/module-types/FS/FHD-FMP6-CAT6.yaml deleted file mode 100644 index 0e8b488353..0000000000 --- a/module-types/FS/FHD-FMP6-CAT6.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -manufacturer: FS -model: FHD-FMP6 + CAT6 -comments: FHD 6-Port Multimedia Copper/Fiber Modular Panel with 6 x Plastic Clips + CAT6 Jacks -part_number: FHD-FMP6 (#66602) + CAT6 Jacks -front-ports: - - name: '{module}:1' - type: 8p8c - rear_port: '{module}:1' - - name: '{module}:2' - type: 8p8c - rear_port: '{module}:2' - - name: '{module}:3' - type: 8p8c - rear_port: '{module}:3' - - name: '{module}:4' - type: 8p8c - rear_port: '{module}:4' - - name: '{module}:5' - type: 8p8c - rear_port: '{module}:5' - - name: '{module}:6' - type: 8p8c - rear_port: '{module}:6' -rear-ports: - - name: '{module}:1' - type: 8p8c - - name: '{module}:2' - type: 8p8c - - name: '{module}:3' - type: 8p8c - - name: '{module}:4' - type: 8p8c - - name: '{module}:5' - type: 8p8c - - name: '{module}:6' - type: 8p8c diff --git a/module-types/FS/FHD-FMP6-LC.yaml b/module-types/FS/FHD-FMP6-LC.yaml deleted file mode 100644 index fb38e27ebe..0000000000 --- a/module-types/FS/FHD-FMP6-LC.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -manufacturer: FS -model: FHD-FMP6 + LC -comments: FHD 6-Port Multimedia Copper/Fiber Modular Panel with 6 x Plastic Clips + LC Adapter -part_number: FHD-FMP6 (#66602) + LC Adapter -front-ports: - - name: '{module}:1' - type: lc - rear_port: '{module}:1' - - name: '{module}:2' - type: lc - rear_port: '{module}:2' - - name: '{module}:3' - type: lc - rear_port: '{module}:3' - - name: '{module}:4' - type: lc - rear_port: '{module}:4' - - name: '{module}:5' - type: lc - rear_port: '{module}:5' - - name: '{module}:6' - type: lc - rear_port: '{module}:6' -rear-ports: - - name: '{module}:1' - type: lc - - name: '{module}:2' - type: lc - - name: '{module}:3' - type: lc - - name: '{module}:4' - type: lc - - name: '{module}:5' - type: lc - - name: '{module}:6' - type: lc diff --git a/module-types/FS/FHD-FMP6.yaml b/module-types/FS/FHD-FMP6.yaml index 940faada78..9fe022d289 100644 --- a/module-types/FS/FHD-FMP6.yaml +++ b/module-types/FS/FHD-FMP6.yaml @@ -1,5 +1,5 @@ --- manufacturer: FS model: FHD-FMP6 +part_number: '66602' comments: FHD 6-Port Multimedia Copper/Fiber Modular Panel with 6 x Plastic Clips -part_number: FHD-FMP6 (#66602) diff --git a/module-types/FS/FHX-3LCQSMF73.yaml b/module-types/FS/FHX-3LCQSMF73.yaml index 6f273bc6e6..7d712f1ea7 100644 --- a/module-types/FS/FHX-3LCQSMF73.yaml +++ b/module-types/FS/FHX-3LCQSMF73.yaml @@ -1,8 +1,8 @@ --- manufacturer: FS model: FHX-3LCQSMF73 -part_number: FHX-3LCQSMF73 (#73676) (discontinued) -comments: 3x LC Quad, 12 Fibers OS2 Single Mode FHX TAP Cassette, 70/30 Split Ratio (Live/Tap), 1/10/40/100G +part_number: '73676' +comments: (discontinued) 3x LC Quad, 12 Fibers OS2 Single Mode FHX TAP Cassette, 70/30 Split Ratio (Live/Tap), 1/10/40/100G front-ports: - name: '{module}:1' type: lc diff --git a/module-types/Leviton/LC-Keystone.yaml b/module-types/Generic/LC-Keystone.yaml similarity index 66% rename from module-types/Leviton/LC-Keystone.yaml rename to module-types/Generic/LC-Keystone.yaml index 1edb07a81a..e10f547167 100644 --- a/module-types/Leviton/LC-Keystone.yaml +++ b/module-types/Generic/LC-Keystone.yaml @@ -1,7 +1,7 @@ --- -manufacturer: Leviton -model: KeyStone LC Fiber Pair -part_number: KeyStone-LC-Fiber-Pair +manufacturer: Generic +model: Keystone LC Fiber +part_number: Keystone-LC-Fiber front-ports: - name: '{module}-LC' type: lc diff --git a/module-types/Leviton/RJ45-Keystone.yaml b/module-types/Generic/RJ45-Keystone.yaml similarity index 72% rename from module-types/Leviton/RJ45-Keystone.yaml rename to module-types/Generic/RJ45-Keystone.yaml index 4992ef55b0..bbf814930c 100644 --- a/module-types/Leviton/RJ45-Keystone.yaml +++ b/module-types/Generic/RJ45-Keystone.yaml @@ -1,7 +1,7 @@ --- -manufacturer: Leviton -model: KeyStone RJ45 -part_number: KeyStone-RJ45 +manufacturer: Generic +model: Keystone RJ45 +part_number: Keystone-RJ45 front-ports: - name: '{module}-RJ45' type: 8p8c diff --git a/module-types/HPE/X361.yaml b/module-types/HPE/X361.yaml index abcb7b59df..32910547c3 100644 --- a/module-types/HPE/X361.yaml +++ b/module-types/HPE/X361.yaml @@ -1,7 +1,8 @@ --- manufacturer: HPE -model: X361 150W AC Power Supply -part_number: JD362B +model: JD362B +part_number: JD362B#B2B +comments: X361 150W AC Power Supply power-ports: - name: Power {module} type: iec-60320-c14 diff --git a/module-types/HPE/X362.yaml b/module-types/HPE/X362.yaml index 66898edcb6..7c3517e3d1 100644 --- a/module-types/HPE/X362.yaml +++ b/module-types/HPE/X362.yaml @@ -1,7 +1,8 @@ --- manufacturer: HPE -model: X362 720W AC PoE Power Supply -part_number: JG544A +model: JG544A +part_number: JG544A#ABA +comments: X362 720W AC PoE Power Supply power-ports: - name: Power {module} type: iec-60320-c16 diff --git a/module-types/Juniper/MIC-3D-20GE-SFP.yaml b/module-types/Juniper/MIC-3D-20GE-SFP.yaml index a5b9ff5ab6..08337643aa 100644 --- a/module-types/Juniper/MIC-3D-20GE-SFP.yaml +++ b/module-types/Juniper/MIC-3D-20GE-SFP.yaml @@ -5,61 +5,41 @@ part_number: MIC-3D-20GE-SFP interfaces: - name: ge-{module}/0/0 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/1 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/2 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/3 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/4 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/5 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/6 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/7 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/8 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/0/9 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/0 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/1 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/2 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/3 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/4 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/5 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/6 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/7 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/8 type: 1000base-x-sfp - mgmt_only: false - name: ge-{module}/1/9 type: 1000base-x-sfp - mgmt_only: false diff --git a/module-types/SM40-1187040G1 b/module-types/SM40-1187040G1 index 8f353f539d..a9fbf723bd 100644 --- a/module-types/SM40-1187040G1 +++ b/module-types/SM40-1187040G1 @@ -2,33 +2,12 @@ manufacturer: Adtran model: SM40 part_number: 1187040G1 -comments: '' interfaces: - name: Te 1/{module}/1 type: 10gbase-x-sfpp - mgmt_only: false - label: '' - description: '' - poe_mode: '' - poe_type: '' - name: Te 1/{module}/2 type: 10gbase-x-sfpp - mgmt_only: false - label: '' - description: '' - poe_mode: '' - poe_type: '' - name: Te 1/{module}/3 type: 10gbase-x-sfpp - mgmt_only: false - label: '' - description: '' - poe_mode: '' - poe_type: '' - name: Te 1/{module}/4 type: 10gbase-x-sfpp - mgmt_only: false - label: '' - description: '' - poe_mode: '' - poe_type: '' diff --git a/module-types/Sophos/XGCZTCHF2.yaml b/module-types/Sophos/XGCZTCHF2.yaml index fc90d42f6f..246553c011 100644 --- a/module-types/Sophos/XGCZTCHF2.yaml +++ b/module-types/Sophos/XGCZTCHF2.yaml @@ -1,12 +1,10 @@ --- manufacturer: Sophos -model: 2 port 10GbE SFP+ Flexi Port module +model: XGCZTCHF2 part_number: XGCZTCHF2 -comments: For XG 750 and SG/XG 550/650 rev.2 only +comments: 2 port 10GbE SFP+ Flexi Port module - For XG 750 and SG/XG 550/650 rev.2 only interfaces: - name: '{module}-1' type: 10gbase-x-sfpp - mgmt_only: false - name: '{module}-2' type: 10gbase-x-sfpp - mgmt_only: false diff --git a/module-types/Sophos/XGCZTCHF8.yaml b/module-types/Sophos/XGCZTCHF8.yaml index c8015e6c2d..a8dc193f97 100644 --- a/module-types/Sophos/XGCZTCHF8.yaml +++ b/module-types/Sophos/XGCZTCHF8.yaml @@ -1,30 +1,22 @@ --- manufacturer: Sophos -model: 8 port GbE copper Flexi Port module +model: XGCZTCHF8 part_number: XGCZTCHF8 -comments: For XG 750 and SG/XG 550/650 rev.2 only +comments: 8 port GbE copper Flexi Port module - For XG 750 and SG/XG 550/650 rev.2 only interfaces: - name: '{module}1' type: 1000base-t - mgmt_only: false - name: '{module}2' type: 1000base-t - mgmt_only: false - name: '{module}3' type: 1000base-t - mgmt_only: false - name: '{module}4' type: 1000base-t - mgmt_only: false - name: '{module}5' type: 1000base-t - mgmt_only: false - name: '{module}6' type: 1000base-t - mgmt_only: false - name: '{module}7' type: 1000base-t - mgmt_only: false - name: '{module}8' type: 1000base-t - mgmt_only: false diff --git a/module-types/TrippLite/SNMPWEBCARD.yaml b/module-types/TrippLite/SNMPWEBCARD.yaml index b15e62e8bd..2b6795e4a7 100644 --- a/module-types/TrippLite/SNMPWEBCARD.yaml +++ b/module-types/TrippLite/SNMPWEBCARD.yaml @@ -10,6 +10,5 @@ interfaces: console-ports: - name: CONFIG type: other - mgmt_only: false label: CONFIG - description: Use this port to provide a direct terminal connection to a computer with a terminal emulation program. + comments: Use this port to provide a direct terminal connection to a computer with a terminal emulation program. diff --git a/module-types/Ubiquiti/RPS-AC-100W.yaml b/module-types/Ubiquiti/RPS-AC-100W.yaml index b83e6e228a..eac69256c5 100644 --- a/module-types/Ubiquiti/RPS-AC-100W.yaml +++ b/module-types/Ubiquiti/RPS-AC-100W.yaml @@ -2,8 +2,7 @@ manufacturer: Ubiquiti model: RPS-AC-100W part_number: RPS-AC-100W -comments: | - [Ubiquiti RPS-AC-100W](https://dl.ui.com/ds/uf_gpon) Page 5 +comments: '[Ubiquiti RPS-AC-100W](https://dl.ui.com/ds/uf_gpon) Page 5' power-ports: - name: PSU {module} type: iec-60320-c14 diff --git a/module-types/ZTE/CICK.yaml b/module-types/ZTE/CICK.yaml index 473b89004c..38967ce138 100644 --- a/module-types/ZTE/CICK.yaml +++ b/module-types/ZTE/CICK.yaml @@ -5,62 +5,62 @@ comments: The power card PRWG card uses–48 V DC power and provides power suppl of two power supplies is equal, the two PRWG cards work in load-balance mode. console-ports: - name: CLKI1 {module} - description: The first BITS clock input interface, 75ohm + comments: The first BITS clock input interface, 75ohm type: rj-45 mgmt_only: true - name: CLKI2 {module} - description: The second BITS clock input interface, 75ohm + comments: The second BITS clock input interface, 75ohm type: rj-45 mgmt_only: true - name: CLKO/1PPSO {module} - description: BITS/1PPS+TOD clock output interface, 75ohm + comments: BITS/1PPS+TOD clock output interface, 75ohm type: rj-45 mgmt_only: true - name: CLKI1/TIMI1 {module} - description: The first BITS/1PPS+TOD clock input interface, 120ohm + comments: The first BITS/1PPS+TOD clock input interface, 120ohm type: rj-45 mgmt_only: true - name: CLKI2/TIMI2 {module} - description: The second BITS/1PPS+TOD clock input interface, 120ohm + comments: The second BITS/1PPS+TOD clock input interface, 120ohm type: rj-45 mgmt_only: true - name: CLKO/TIMO {module} - description: BITS/1PPS+TOD clock output interface, 120ohm + comments: BITS/1PPS+TOD clock output interface, 120ohm type: rj-45 mgmt_only: true - name: ETH {module} - description: Out-of-band maintenance network interface + comments: Out-of-band maintenance network interface type: rj-45 mgmt_only: true - name: COM {module} - description: Public serial port + comments: Public serial port type: rj-45 mgmt_only: true - name: TEM {module} - description: Temperature sensor interface + comments: Temperature sensor interface type: rj-45 mgmt_only: true - name: HUM - description: Humid sensor interface + comments: Humid sensor interface type: rj-45 mgmt_only: true - name: SMO {module} - description: Smog sensor interface + comments: Smog sensor interface type: rj-45 mgmt_only: true - name: LIQ {module} - description: Liquid sensor interface + comments: Liquid sensor interface type: rj-45 mgmt_only: true - name: DOR {module} - description: Entrance control sensor interface + comments: Entrance control sensor interface type: rj-45 mgmt_only: true - name: DIN {module} - description: Digit input interface, four channels + comments: Digit input interface, four channels type: rj-45 mgmt_only: true - name: DOT {module} - description: Digit input interface, four channels + comments: Digit input interface, four channels type: rj-45 mgmt_only: true diff --git a/module-types/ZTE/SCTM.yaml b/module-types/ZTE/SCTM.yaml index 2afa0f9cd0..ae003cc29b 100644 --- a/module-types/ZTE/SCTM.yaml +++ b/module-types/ZTE/SCTM.yaml @@ -11,18 +11,16 @@ interfaces: type: 10gbase-x-sfpp - name: xgei_1/{module}/4 type: 10gbase-x-sfpp - - name: gei_1/{module}/5 - description: For out-of-band network management + comments: For out-of-band network management type: 1000base-t mgmt_only: true - name: gei_1/{module}/6 - description: For mirroring service traffic + comments: For mirroring service traffic type: 1000base-t mgmt_only: true - console-ports: - name: CLI {module} - description: RS-232 port,for local debugging + comments: RS-232 port,for local debugging type: rj-45 mgmt_only: true From fe7844e861db0397014b63049f0b1dc236dbe005 Mon Sep 17 00:00:00 2001 From: Rimpei Kunimoto <19310909+nxzz@users.noreply.github.com> Date: Sat, 21 Jan 2023 14:14:36 +0900 Subject: [PATCH 2/2] add Lenovo Servers SR530/SR550/X3250M6 and fix SR650 (#1062) * fix SR650 unit height , add comments * add Lenovo SR530 SR550 X3250M6 * Update system_x3250_M6.yaml * remove VGA port * Update SR530.yaml Added ThinkSystem to model name * Update SR550.yaml Added ThinkSystem to model name * Update SR650.yaml Added ThinkSystem to model name Co-authored-by: Daniel W. Anner --- device-types/Lenovo/SR530.yaml | 22 ++++++++++++++++++++++ device-types/Lenovo/SR550.yaml | 22 ++++++++++++++++++++++ device-types/Lenovo/SR650.yaml | 4 +++- device-types/Lenovo/system_x3250_M6.yaml | 18 ++++++++++++++++++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 device-types/Lenovo/SR530.yaml create mode 100644 device-types/Lenovo/SR550.yaml create mode 100644 device-types/Lenovo/system_x3250_M6.yaml diff --git a/device-types/Lenovo/SR530.yaml b/device-types/Lenovo/SR530.yaml new file mode 100644 index 0000000000..64cd683cb2 --- /dev/null +++ b/device-types/Lenovo/SR530.yaml @@ -0,0 +1,22 @@ +--- +manufacturer: Lenovo +model: ThinkSystem SR530 +slug: SR530 +part_number: 7X07 +u_height: 1 +is_full_depth: true +subdevice_role: parent +comments: '[Lenovo ThinkSystem SR530 product guide](https://lenovopress.lenovo.com/lp1045.pdf)' +power-ports: + - name: PSU0 + type: iec-60320-c14 + - name: PSU1 + type: iec-60320-c14 +interfaces: + - name: Ethernet 1 + type: 1000base-t + - name: Ethernet 2 + type: 1000base-t + - name: XCC + type: 1000base-t + mgmt_only: true diff --git a/device-types/Lenovo/SR550.yaml b/device-types/Lenovo/SR550.yaml new file mode 100644 index 0000000000..17aebb13ee --- /dev/null +++ b/device-types/Lenovo/SR550.yaml @@ -0,0 +1,22 @@ +--- +manufacturer: Lenovo +model: ThinkSystem SR550 +slug: SR550 +part_number: 7X04 +u_height: 2 +is_full_depth: true +subdevice_role: parent +comments: '[Lenovo ThinkSystem SR550 product guide](https://lenovopress.lenovo.com/lp1046.pdf)' +power-ports: + - name: PSU0 + type: iec-60320-c14 + - name: PSU1 + type: iec-60320-c14 +interfaces: + - name: Ethernet 1 + type: 1000base-t + - name: Ethernet 2 + type: 1000base-t + - name: XCC + type: 1000base-t + mgmt_only: true diff --git a/device-types/Lenovo/SR650.yaml b/device-types/Lenovo/SR650.yaml index a924450954..e75d0a0cdb 100644 --- a/device-types/Lenovo/SR650.yaml +++ b/device-types/Lenovo/SR650.yaml @@ -1,9 +1,11 @@ --- manufacturer: Lenovo -model: SR650 +model: ThinkSystem SR650 slug: SR650 part_number: 7X06 +u_height: 2 is_full_depth: true +comments: '[Lenovo System SR650 product guide](https://lenovopress.lenovo.com/lp1050.pdf)' subdevice_role: parent interfaces: - name: XCC diff --git a/device-types/Lenovo/system_x3250_M6.yaml b/device-types/Lenovo/system_x3250_M6.yaml new file mode 100644 index 0000000000..2537628e8d --- /dev/null +++ b/device-types/Lenovo/system_x3250_M6.yaml @@ -0,0 +1,18 @@ +--- +manufacturer: Lenovo +model: System x3250 M6 +slug: system_x3250_m6 +part_number: '3633' +u_height: 1 +is_full_depth: true +comments: '[Lenovo System x3250 M6 product guide](https://lenovopress.lenovo.com/lp0096.pdf)' +power-ports: + - name: PSU 1 + type: iec-60320-c14 + - name: PSU 2 + type: iec-60320-c14 +interfaces: + - name: Ethernet 1 + type: 1000base-t + - name: Ethernet 2 + type: 1000base-t