From 9e6cf8d017299970592ddfa01d522e43e3674248 Mon Sep 17 00:00:00 2001 From: m-hau Date: Fri, 8 Aug 2025 23:10:01 +0200 Subject: [PATCH] Enforce component properties (#3391) * Disable additional properties for components It is not a global option, it needs to be set per-definition. Enabling it produces a lot of validation errors. * Update json schema Add missing fields and value constraints. The `rf_role` enum is currently not included in the `generated_schema.json` from upstream, so I "faked" it for now by added it manually. * Rework custom power source marker While you could technically have a device that does PoE and serial console on the same port, this is just one very specific scenario. Rename the custom property from `poe` to `_is_power_source` to be more general and better reflect its intention, and properly document it in the json schema. Remove the property from device types where it is false, and where it's unneeded because power-ports exist. * Fix power draw In NetBox the PSU modules have a power draw, but not the module-bays you can put them into; so remove it from those. Plus some minor corrections. * Fix PoE Basically fix the casing by renaming from the wrong kebab-case to the correct snake_case. * Turn invalid comments into description Only device types can have `comments`, everything else is limited to `description`. So turn all invalid comments into descriptions. * Fix mgmt_only Console port in NetBox don't have a `mgmt_only` property, because they are by definition management-only. * Fix position(s) Device bays don't have a position, because the child devices are completely separate and don't share any naming/numbering. * Miscellaneous fixes Everything that didn't fit into the prior larger error categories. Validation now passes again. --- device-types/APC/AP6031A.yaml | 2 +- device-types/APC/AP6037A.yaml | 2 +- device-types/APC/AP9560.yaml | 2 +- device-types/APC/AP9562.yaml | 2 +- device-types/APC/AP9563.yaml | 2 +- device-types/APC/AP9564.yaml | 2 +- device-types/APC/AP9570.yaml | 2 +- device-types/APC/AP9571A.yaml | 2 +- device-types/Arista/DCS-7130-16G3S-F.yaml | 2 - device-types/Arista/DCS-7130-16G3S-R.yaml | 2 - device-types/Arista/DCS-7130-48G3S-F.yaml | 2 - device-types/Arista/DCS-7130-48G3S-R.yaml | 2 - device-types/Arista/DCS-7130-48LAS-F.yaml | 2 - device-types/Arista/DCS-7130-48LAS-R.yaml | 2 - device-types/Arista/DCS-7130-48LBAS-F.yaml | 2 - device-types/Arista/DCS-7130-48LBAS-R.yaml | 2 - device-types/Arista/DCS-7130-48LBS-F.yaml | 2 - device-types/Arista/DCS-7130-48LBS-R.yaml | 2 - device-types/Arista/DCS-7130-48LS-F.yaml | 2 - device-types/Arista/DCS-7130-48LS-R.yaml | 2 - device-types/Arista/DCS-7130-96G3S-F.yaml | 2 - device-types/Arista/DCS-7130-96G3S-R.yaml | 2 - device-types/Arista/DCS-7130-96LAS-F.yaml | 2 - device-types/Arista/DCS-7130-96LAS-R.yaml | 2 - device-types/Arista/DCS-7130-96LBAS-F.yaml | 2 - device-types/Arista/DCS-7130-96LBAS-R.yaml | 2 - device-types/Arista/DCS-7130-96LBS-F.yaml | 2 - device-types/Arista/DCS-7130-96LBS-R.yaml | 2 - device-types/Arista/DCS-7130-96LS-F.yaml | 2 - device-types/Arista/DCS-7130-96LS-R.yaml | 2 - device-types/Arista/DCS-7132LB-48Y4C-F.yaml | 4 - device-types/Arista/DCS-7132LB-48Y4C-R.yaml | 4 - device-types/Arista/DCS-7135LB-48Y4C-F.yaml | 4 - device-types/Arista/DCS-7135LB-48Y4C-R.yaml | 4 - device-types/Avocent/DSRIQ-PS2.yaml | 2 +- device-types/Avocent/DSRIQ-USB.yaml | 2 +- device-types/Avocent/DSRIQ-VSN.yaml | 2 +- device-types/Avocent/MPUIQ-SRL.yaml | 2 +- device-types/Avocent/MPUIQ-VMCHS.yaml | 2 +- device-types/Brocade/ICX-7450-32ZP.yaml | 10 +- device-types/Ciena/3926-tdm.yaml | 3 - device-types/Ciena/3926.yaml | 3 - device-types/Ciena/3984-ac.yaml | 4 - device-types/Ciena/3984-dc.yaml | 4 - device-types/Ciena/5130-ac.yaml | 5 - device-types/Ciena/5130-dc.yaml | 5 - device-types/Ciena/5142.yaml | 4 - device-types/Ciena/5144-ac.yaml | 5 - device-types/Ciena/5144-dc.yaml | 5 - device-types/Ciena/5162.yaml | 10 +- device-types/Ciena/5164-ac-qsfp56.yaml | 5 - device-types/Ciena/5164-dc-qsfp56.yaml | 5 - device-types/Ciena/5166-ac-qsfpdd.yaml | 5 - device-types/Ciena/5166-dc-qsfpdd.yaml | 5 - device-types/Ciena/5170.yaml | 9 +- device-types/Ciena/5171-platform.yaml | 14 +- device-types/Ciena/5171-router.yaml | 13 +- device-types/Ciena/6500-R2.yaml | 4 +- device-types/Ciena/6500-R4.yaml | 4 +- device-types/Ciena/8110.yaml | 13 +- device-types/Ciena/8114.yaml | 5 - device-types/Ciena/8140.yaml | 10 +- device-types/Ciena/8180.yaml | 17 +- device-types/Ciena/8190.yaml | 10 +- device-types/Ciena/8192.yaml | 10 +- device-types/Ciena/FLA1-10-A8-AC.yaml | 2 - device-types/Ciena/FLA1-10-B8-AC.yaml | 2 - device-types/Ciena/FLA2-10-E8-AC.yaml | 2 - device-types/Ciena/FLA2-48-M-AC.yaml | 2 - device-types/Ciena/waveserver-5.yaml | 12 +- device-types/Ciena/waveserver-ai.yaml | 10 +- device-types/Cisco/C881-K9.yaml | 1 - device-types/Cisco/C887VA-K9.yaml | 1 - device-types/Cisco/C921-4PLTEGB.yaml | 1 - device-types/Cisco/C9500X-28C8D.yaml | 39 ---- device-types/Cisco/ISR897VA.yaml | 1 - device-types/Cisco/SX550X-16FT.yaml | 2 +- .../CCM-Patchpanel-1HE-SLITE-HD-Right.yaml | 121 ++++++----- device-types/DEPO/Race-SR518.yaml | 2 +- .../SFA200NVX2-Enclosure.yaml | 2 - device-types/Datacom/VS-1124-F.yaml | 2 - device-types/Dell/PowerScale-A300.yaml | 2 - device-types/Dell/PowerScale-A3000.yaml | 2 - device-types/Dell/PowerSwitch-N1524P.yaml | 96 ++++----- device-types/Dell/PowerSwitch-N1548P.yaml | 192 +++++++++--------- device-types/Dell/PowerSwitch-N2024P.yaml | 96 ++++----- device-types/Dell/PowerSwitch-N2048P.yaml | 192 +++++++++--------- device-types/Dell/PowerSwitch-N3248P-ON.yaml | 192 +++++++++--------- device-types/Fortinet/FG-900G.yaml | 8 +- device-types/Fortinet/FS-648F-FPOE.yaml | 2 - device-types/GL-iNet/GL-AXT1800.yaml | 2 +- device-types/HPE/MSA-2050-Enclosure.yaml | 2 - device-types/HPE/Nimble-HF40.yaml | 2 - device-types/HPE/Primera-2U-Enclosure.yaml | 2 - device-types/HPE/Primera-4U-Enclosure.yaml | 4 - device-types/HPE/ProLiant-DL325-Gen11.yaml | 6 +- ...Connect-SE-40Gb-F8-Module-for-Synergy.yaml | 4 +- .../Huawei/Dorado-5000-v6-enclosure.yaml | 2 - device-types/Juniper/ACX7024-AC.yaml | 2 - device-types/Juniper/ACX7024X.yaml | 2 - device-types/Juniper/ACX7100-32C-AC-AO.yaml | 2 - device-types/Juniper/ACX7100-32C-DC-AO.yaml | 2 - device-types/Juniper/ACX7100-48L-AC-AI.yaml | 2 - device-types/Juniper/ACX7100-48L-AC-AO.yaml | 2 - device-types/Juniper/ACX7100-48L-DC-AI.yaml | 2 - device-types/Juniper/ACX7100-48L-DC-AO.yaml | 2 - device-types/Juniper/ACX7332.yaml | 2 - device-types/Minisforum/Minisforum-MS-01.yml | 2 +- device-types/Moxa/EDS-P510.yaml | 12 +- device-types/Nozomi Networks/nsg-m-1000.yaml | 24 +-- device-types/Nozomi Networks/nsg-m-750.yaml | 24 +-- device-types/Sangoma/PBXact-2001.yaml | 2 - .../SpaceLogic-AS-P-NL.yaml | 2 +- .../SEL-587-Current-Differential-Relay.yaml | 1 - .../Server Technology/C2WG24SN-4PJN5D.yaml | 1 - .../Server Technology/C2WG24SN-YCLN5D6.yaml | 1 - .../Server Technology/C2XG24SN-4PJN5D.yaml | 1 - .../Server Technology/C2XG24SN-YCLN5D6.yaml | 1 - .../PRO3X-C3WG36RL-DQJE2NT2.yaml | 2 - device-types/Supermicro/AS-2124BT-HNTR.yaml | 2 - device-types/Supermicro/AS-2124BT-HTR.yml | 2 - device-types/Supermicro/AS-3015MR-H8TNR.yaml | 2 - device-types/Supermicro/SSG-6029P-E1CR12T.yml | 2 +- device-types/Supermicro/SSG-640P-E1CR24H.yml | 2 +- device-types/Supermicro/SYS-5019P-MTR.yaml | 2 - device-types/Supermicro/SYS-530MT-H8TNR.yaml | 8 - device-types/Supermicro/SYS-6028TR-HTR.yaml | 2 - .../Supermicro/SuperChassis-826-BE1C4.yaml | 2 - device-types/Synology/RS2416RP+.yaml | 1 - device-types/Synology/RS2418+.yaml | 1 - device-types/Synology/RS2418RP+.yaml | 1 - device-types/Synology/RS3614xs+.yaml | 1 - device-types/Synology/RS3617RPxs.yaml | 1 - device-types/Synology/RS3621xs+.yaml | 1 - device-types/Synology/RS815+.yaml | 1 - device-types/Synology/RS820+.yaml | 1 - device-types/Teltonika/RUT955.yaml | 6 +- device-types/Teltonika/RUTX09.yaml | 2 +- device-types/Ubiquiti/ECS-Aggregation.yaml | 2 - device-types/Ubiquiti/EFG.yaml | 2 - device-types/Ubiquiti/ER-8-XG.yaml | 2 - device-types/Ubiquiti/INS-3AF-O-G.yaml | 2 +- device-types/Ubiquiti/Surge-Protector.yaml | 2 +- device-types/Ubiquiti/UACC-AI-Port-RM.yaml | 6 - device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml | 2 +- .../Bladerunner-1.0-20-blade.yaml | 20 -- device-types/Vertiv/MPUIQ-VMCHS.yaml | 2 +- .../Ciena/waveserver-5-control-processor.yaml | 2 - .../Ciena/waveserver-ai-access-panel.yaml | 2 - module-types/Cisco/A9K-RSP440-LT.yaml | 10 +- module-types/Cisco/A9K-RSP440-SE.yaml | 10 +- module-types/Cisco/A9K-RSP440-TR.yaml | 10 +- module-types/Cisco/A9K-RSP880-TR.yaml | 6 +- 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 +- .../Corning/ECM-UM08-04-E8GF-ULL.yaml | 10 +- module-types/Corning/EDGE-CP48-90.yaml | 16 +- module-types/Dell/450-BCGR.yaml | 4 +- module-types/Eaton/EMPDT1H1C2.yaml | 4 +- module-types/Eaton/Network-M2.yaml | 4 +- module-types/Eaton/TrippLite-SNMPWEBCARD.yaml | 2 +- .../sel-2243-power-coupler.yml | 2 +- module-types/ZTE/CICK.yaml | 45 ++-- module-types/ZTE/PRWH.yaml | 2 - module-types/ZTE/SCTM.yaml | 7 +- schema/components.json | 103 +++++++--- schema/devicetype.json | 10 +- schema/generated_schema.json | 7 + schema/moduletype.json | 9 +- schema/reusable.json | 6 + tests/device_types.py | 10 +- 173 files changed, 752 insertions(+), 1037 deletions(-) diff --git a/device-types/APC/AP6031A.yaml b/device-types/APC/AP6031A.yaml index c719dbe1..02dd5c3d 100644 --- a/device-types/APC/AP6031A.yaml +++ b/device-types/APC/AP6031A.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 0U/1U, 208V, 30A, (4) C19 power-ports: - name: Source type: nema-l6-30p - comments: 12f cord + description: 12f cord power-outlets: - name: Outlet 1 type: iec-60320-c19 diff --git a/device-types/APC/AP6037A.yaml b/device-types/APC/AP6037A.yaml index 8218fe0b..7691a515 100644 --- a/device-types/APC/AP6037A.yaml +++ b/device-types/APC/AP6037A.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 0U/1U, 208V, 8.6kW, (3) C19 power-ports: - name: Source type: nema-l15-30p - comments: 12f cord + description: 12f cord power-outlets: - name: Outlet 1 type: iec-60320-c19 diff --git a/device-types/APC/AP9560.yaml b/device-types/APC/AP9560.yaml index 1e8ffd96..b2440ea1 100644 --- a/device-types/APC/AP9560.yaml +++ b/device-types/APC/AP9560.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 1U, 30A, 120V, (10)5-20 power-ports: - name: Source type: nema-l5-30p - comments: 12ft cord + description: 12ft cord power-outlets: - name: Outlet 1 type: nema-5-20r diff --git a/device-types/APC/AP9562.yaml b/device-types/APC/AP9562.yaml index 4e80ab83..7490e518 100644 --- a/device-types/APC/AP9562.yaml +++ b/device-types/APC/AP9562.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 1U, 15A, 120V, (10)5-15 power-ports: - name: Source type: nema-5-15p - comments: 12ft cord + description: 12ft cord power-outlets: - name: Outlet 1 type: nema-5-15r diff --git a/device-types/APC/AP9563.yaml b/device-types/APC/AP9563.yaml index 846eb835..6bdb4e0e 100644 --- a/device-types/APC/AP9563.yaml +++ b/device-types/APC/AP9563.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 1U, 20A, 120V, (10)5-20, 5-20P power-ports: - name: Source type: nema-5-20p - comments: 12ft cord + description: 12ft cord power-outlets: - name: Outlet 1 type: nema-5-20r diff --git a/device-types/APC/AP9564.yaml b/device-types/APC/AP9564.yaml index 1e2efe9b..8a6b9b59 100644 --- a/device-types/APC/AP9564.yaml +++ b/device-types/APC/AP9564.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 1U, 20A, 120V, (10)5-20; L5-20P power-ports: - name: Source type: nema-l5-20p - comments: 12ft cord + description: 12ft cord power-outlets: - name: Outlet 1 type: nema-5-20r diff --git a/device-types/APC/AP9570.yaml b/device-types/APC/AP9570.yaml index 7312ca76..3bbd92d9 100644 --- a/device-types/APC/AP9570.yaml +++ b/device-types/APC/AP9570.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 1U, 30A, 208V, (4) C19s power-ports: - name: Source type: nema-l6-30p - comments: 10ft cord + description: 10ft cord power-outlets: - name: Outlet 1 type: iec-60320-c19 diff --git a/device-types/APC/AP9571A.yaml b/device-types/APC/AP9571A.yaml index 6774e212..cff16fe3 100644 --- a/device-types/APC/AP9571A.yaml +++ b/device-types/APC/AP9571A.yaml @@ -14,7 +14,7 @@ comments: Rack PDU, Basic, 1U, 30A, 208V, (10) C13 power-ports: - name: Source type: nema-l6-30p - comments: 12ft cord + description: 12ft cord power-outlets: - name: Outlet 1 type: iec-60320-c13 diff --git a/device-types/Arista/DCS-7130-16G3S-F.yaml b/device-types/Arista/DCS-7130-16G3S-F.yaml index 65189ce7..1f1bbda9 100644 --- a/device-types/Arista/DCS-7130-16G3S-F.yaml +++ b/device-types/Arista/DCS-7130-16G3S-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-16G3S-R.yaml b/device-types/Arista/DCS-7130-16G3S-R.yaml index 7a2d3d23..aef11de2 100644 --- a/device-types/Arista/DCS-7130-16G3S-R.yaml +++ b/device-types/Arista/DCS-7130-16G3S-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48G3S-F.yaml b/device-types/Arista/DCS-7130-48G3S-F.yaml index f660cd96..ba513981 100644 --- a/device-types/Arista/DCS-7130-48G3S-F.yaml +++ b/device-types/Arista/DCS-7130-48G3S-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48G3S-R.yaml b/device-types/Arista/DCS-7130-48G3S-R.yaml index af26c0ab..f044c519 100644 --- a/device-types/Arista/DCS-7130-48G3S-R.yaml +++ b/device-types/Arista/DCS-7130-48G3S-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LAS-F.yaml b/device-types/Arista/DCS-7130-48LAS-F.yaml index f57680c4..4d01d3d0 100644 --- a/device-types/Arista/DCS-7130-48LAS-F.yaml +++ b/device-types/Arista/DCS-7130-48LAS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LAS-R.yaml b/device-types/Arista/DCS-7130-48LAS-R.yaml index da548bab..03de5656 100644 --- a/device-types/Arista/DCS-7130-48LAS-R.yaml +++ b/device-types/Arista/DCS-7130-48LAS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LBAS-F.yaml b/device-types/Arista/DCS-7130-48LBAS-F.yaml index 60e1d944..aa113076 100644 --- a/device-types/Arista/DCS-7130-48LBAS-F.yaml +++ b/device-types/Arista/DCS-7130-48LBAS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LBAS-R.yaml b/device-types/Arista/DCS-7130-48LBAS-R.yaml index 7dc01341..a3cf2fa4 100644 --- a/device-types/Arista/DCS-7130-48LBAS-R.yaml +++ b/device-types/Arista/DCS-7130-48LBAS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LBS-F.yaml b/device-types/Arista/DCS-7130-48LBS-F.yaml index 4cb6d1bb..9129c8b4 100644 --- a/device-types/Arista/DCS-7130-48LBS-F.yaml +++ b/device-types/Arista/DCS-7130-48LBS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LBS-R.yaml b/device-types/Arista/DCS-7130-48LBS-R.yaml index dbe87140..f7dfbf37 100644 --- a/device-types/Arista/DCS-7130-48LBS-R.yaml +++ b/device-types/Arista/DCS-7130-48LBS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LS-F.yaml b/device-types/Arista/DCS-7130-48LS-F.yaml index a5b480a0..5e12e222 100644 --- a/device-types/Arista/DCS-7130-48LS-F.yaml +++ b/device-types/Arista/DCS-7130-48LS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-48LS-R.yaml b/device-types/Arista/DCS-7130-48LS-R.yaml index a3899228..76beba09 100644 --- a/device-types/Arista/DCS-7130-48LS-R.yaml +++ b/device-types/Arista/DCS-7130-48LS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 190 - name: PS2 position: '1' - maximum_draw: 190 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96G3S-F.yaml b/device-types/Arista/DCS-7130-96G3S-F.yaml index 0ef9d8d2..009a29d3 100644 --- a/device-types/Arista/DCS-7130-96G3S-F.yaml +++ b/device-types/Arista/DCS-7130-96G3S-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96G3S-R.yaml b/device-types/Arista/DCS-7130-96G3S-R.yaml index cc1d1940..dc655c3e 100644 --- a/device-types/Arista/DCS-7130-96G3S-R.yaml +++ b/device-types/Arista/DCS-7130-96G3S-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LAS-F.yaml b/device-types/Arista/DCS-7130-96LAS-F.yaml index 95612726..660aa8b3 100644 --- a/device-types/Arista/DCS-7130-96LAS-F.yaml +++ b/device-types/Arista/DCS-7130-96LAS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LAS-R.yaml b/device-types/Arista/DCS-7130-96LAS-R.yaml index 561c608f..84b106e7 100644 --- a/device-types/Arista/DCS-7130-96LAS-R.yaml +++ b/device-types/Arista/DCS-7130-96LAS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LBAS-F.yaml b/device-types/Arista/DCS-7130-96LBAS-F.yaml index ef3e2f9e..d560ceeb 100644 --- a/device-types/Arista/DCS-7130-96LBAS-F.yaml +++ b/device-types/Arista/DCS-7130-96LBAS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LBAS-R.yaml b/device-types/Arista/DCS-7130-96LBAS-R.yaml index fd439f73..2010121a 100644 --- a/device-types/Arista/DCS-7130-96LBAS-R.yaml +++ b/device-types/Arista/DCS-7130-96LBAS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LBS-F.yaml b/device-types/Arista/DCS-7130-96LBS-F.yaml index 7042532c..bae7f11a 100644 --- a/device-types/Arista/DCS-7130-96LBS-F.yaml +++ b/device-types/Arista/DCS-7130-96LBS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LBS-R.yaml b/device-types/Arista/DCS-7130-96LBS-R.yaml index c0a2f255..127bbd3d 100644 --- a/device-types/Arista/DCS-7130-96LBS-R.yaml +++ b/device-types/Arista/DCS-7130-96LBS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LS-F.yaml b/device-types/Arista/DCS-7130-96LS-F.yaml index d31aacec..ffb052e8 100644 --- a/device-types/Arista/DCS-7130-96LS-F.yaml +++ b/device-types/Arista/DCS-7130-96LS-F.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7130-96LS-R.yaml b/device-types/Arista/DCS-7130-96LS-R.yaml index 2bbc853d..fbd98d19 100644 --- a/device-types/Arista/DCS-7130-96LS-R.yaml +++ b/device-types/Arista/DCS-7130-96LS-R.yaml @@ -17,10 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - maximum_draw: 388 - name: PS2 position: '1' - maximum_draw: 388 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp diff --git a/device-types/Arista/DCS-7132LB-48Y4C-F.yaml b/device-types/Arista/DCS-7132LB-48Y4C-F.yaml index dc34dd63..4d105222 100644 --- a/device-types/Arista/DCS-7132LB-48Y4C-F.yaml +++ b/device-types/Arista/DCS-7132LB-48Y4C-F.yaml @@ -17,12 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - allocated_draw: 367 - maximum_draw: 550 - name: PS2 position: '1' - allocated_draw: 367 - maximum_draw: 550 front_image: true rear_image: true interfaces: diff --git a/device-types/Arista/DCS-7132LB-48Y4C-R.yaml b/device-types/Arista/DCS-7132LB-48Y4C-R.yaml index c6b71f0e..846a1339 100644 --- a/device-types/Arista/DCS-7132LB-48Y4C-R.yaml +++ b/device-types/Arista/DCS-7132LB-48Y4C-R.yaml @@ -17,12 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - allocated_draw: 367 - maximum_draw: 550 - name: PS2 position: '1' - allocated_draw: 367 - maximum_draw: 550 front_image: true rear_image: false interfaces: diff --git a/device-types/Arista/DCS-7135LB-48Y4C-F.yaml b/device-types/Arista/DCS-7135LB-48Y4C-F.yaml index a09c4596..935625c5 100644 --- a/device-types/Arista/DCS-7135LB-48Y4C-F.yaml +++ b/device-types/Arista/DCS-7135LB-48Y4C-F.yaml @@ -17,12 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - allocated_draw: 667 - maximum_draw: 1000 - name: PS2 position: '1' - allocated_draw: 667 - maximum_draw: 1000 interfaces: - name: Ethernet1 type: 25gbase-x-sfp28 diff --git a/device-types/Arista/DCS-7135LB-48Y4C-R.yaml b/device-types/Arista/DCS-7135LB-48Y4C-R.yaml index 1838f347..8c957a98 100644 --- a/device-types/Arista/DCS-7135LB-48Y4C-R.yaml +++ b/device-types/Arista/DCS-7135LB-48Y4C-R.yaml @@ -17,12 +17,8 @@ console-ports: module-bays: - name: PS1 position: '0' - allocated_draw: 667 - maximum_draw: 1000 - name: PS2 position: '1' - allocated_draw: 667 - maximum_draw: 1000 interfaces: - name: Ethernet1 type: 25gbase-x-sfp28 diff --git a/device-types/Avocent/DSRIQ-PS2.yaml b/device-types/Avocent/DSRIQ-PS2.yaml index 31ebf082..88b0976a 100644 --- a/device-types/Avocent/DSRIQ-PS2.yaml +++ b/device-types/Avocent/DSRIQ-PS2.yaml @@ -7,7 +7,7 @@ is_full_depth: false console-ports: - name: DSR type: rj-45 - poe: true + _is_power_source: true console-server-ports: - name: Keyboard type: other diff --git a/device-types/Avocent/DSRIQ-USB.yaml b/device-types/Avocent/DSRIQ-USB.yaml index b6220a7a..a8e2fd06 100644 --- a/device-types/Avocent/DSRIQ-USB.yaml +++ b/device-types/Avocent/DSRIQ-USB.yaml @@ -7,7 +7,7 @@ is_full_depth: false console-ports: - name: DSR type: rj-45 - poe: true + _is_power_source: true console-server-ports: - name: USB type: usb-a diff --git a/device-types/Avocent/DSRIQ-VSN.yaml b/device-types/Avocent/DSRIQ-VSN.yaml index ff035eb6..8608b0a0 100644 --- a/device-types/Avocent/DSRIQ-VSN.yaml +++ b/device-types/Avocent/DSRIQ-VSN.yaml @@ -7,7 +7,7 @@ is_full_depth: false console-ports: - name: DSR type: rj-45 - poe: true + _is_power_source: true console-server-ports: - name: SUN type: other diff --git a/device-types/Avocent/MPUIQ-SRL.yaml b/device-types/Avocent/MPUIQ-SRL.yaml index 1f43a9e3..a77d027b 100644 --- a/device-types/Avocent/MPUIQ-SRL.yaml +++ b/device-types/Avocent/MPUIQ-SRL.yaml @@ -10,7 +10,7 @@ comments: MPU IQ Serial Adapter console-ports: - name: KVM type: rj-45 - poe: true + _is_power_source: true console-server-ports: - name: con0 type: rj-45 diff --git a/device-types/Avocent/MPUIQ-VMCHS.yaml b/device-types/Avocent/MPUIQ-VMCHS.yaml index adaba0ea..325fb45e 100644 --- a/device-types/Avocent/MPUIQ-VMCHS.yaml +++ b/device-types/Avocent/MPUIQ-VMCHS.yaml @@ -10,7 +10,7 @@ comments: MPU IQ Serial Adapter console-ports: - name: KVM type: rj-45 - poe: true + _is_power_source: true console-server-ports: - name: usb0 type: usb-a diff --git a/device-types/Brocade/ICX-7450-32ZP.yaml b/device-types/Brocade/ICX-7450-32ZP.yaml index 289fd836..609c0890 100644 --- a/device-types/Brocade/ICX-7450-32ZP.yaml +++ b/device-types/Brocade/ICX-7450-32ZP.yaml @@ -146,16 +146,16 @@ console-ports: module-bays: - name: PSU0 position: '0' - type: power-supply + description: power-supply - name: PSU1 position: '1' - type: power-supply + description: power-supply - name: M2 - type: stacking position: '2' + description: stacking - name: M3 - type: stacking position: '3' + description: stacking - name: M4 - type: stacking position: '4' + description: stacking diff --git a/device-types/Ciena/3926-tdm.yaml b/device-types/Ciena/3926-tdm.yaml index 7b20e766..87606d60 100644 --- a/device-types/Ciena/3926-tdm.yaml +++ b/device-types/Ciena/3926-tdm.yaml @@ -12,15 +12,12 @@ weight_unit: kg console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: 1PPS description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: SYNC type: rj-45 description: RJ45 interface G.703 1PPS & ToD input/output - mgmt_only: true module-bays: - name: PS A position: A diff --git a/device-types/Ciena/3926.yaml b/device-types/Ciena/3926.yaml index fb7929a9..e80b2260 100644 --- a/device-types/Ciena/3926.yaml +++ b/device-types/Ciena/3926.yaml @@ -12,15 +12,12 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: 1PPS description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: SYNC type: rj-45 description: RJ45 interface G.703 1PPS & ToD input/output - mgmt_only: true module-bays: - name: PS A position: A diff --git a/device-types/Ciena/3984-ac.yaml b/device-types/Ciena/3984-ac.yaml index b34028c5..a56d68ac 100644 --- a/device-types/Ciena/3984-ac.yaml +++ b/device-types/Ciena/3984-ac.yaml @@ -12,20 +12,16 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port power-ports: - name: PSU-A diff --git a/device-types/Ciena/3984-dc.yaml b/device-types/Ciena/3984-dc.yaml index 97638357..e0e3e8b7 100644 --- a/device-types/Ciena/3984-dc.yaml +++ b/device-types/Ciena/3984-dc.yaml @@ -12,20 +12,16 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port power-ports: - name: PS-A diff --git a/device-types/Ciena/5130-ac.yaml b/device-types/Ciena/5130-ac.yaml index 2d6f364b..f7b392f4 100644 --- a/device-types/Ciena/5130-ac.yaml +++ b/device-types/Ciena/5130-ac.yaml @@ -12,21 +12,16 @@ weight_unit: kg console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port interfaces: - name: '1' diff --git a/device-types/Ciena/5130-dc.yaml b/device-types/Ciena/5130-dc.yaml index 76a045ef..9e3a9d24 100644 --- a/device-types/Ciena/5130-dc.yaml +++ b/device-types/Ciena/5130-dc.yaml @@ -11,21 +11,16 @@ weight_unit: kg console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port interfaces: - name: '1' diff --git a/device-types/Ciena/5142.yaml b/device-types/Ciena/5142.yaml index 5e0ce0fb..f6d306db 100644 --- a/device-types/Ciena/5142.yaml +++ b/device-types/Ciena/5142.yaml @@ -11,19 +11,15 @@ weight_unit: kg console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port - name: 1PPS description: 1PPS. SMB connector type: other - mgmt_only: true - name: 10MHZ description: SMB connector type: other - mgmt_only: true module-bays: - name: PS A position: A diff --git a/device-types/Ciena/5144-ac.yaml b/device-types/Ciena/5144-ac.yaml index cb528d18..741032e8 100644 --- a/device-types/Ciena/5144-ac.yaml +++ b/device-types/Ciena/5144-ac.yaml @@ -12,21 +12,16 @@ weight_unit: kg console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port interfaces: - name: '1' diff --git a/device-types/Ciena/5144-dc.yaml b/device-types/Ciena/5144-dc.yaml index 61ae3d42..94c64c72 100644 --- a/device-types/Ciena/5144-dc.yaml +++ b/device-types/Ciena/5144-dc.yaml @@ -12,21 +12,16 @@ weight_unit: kg console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port interfaces: - name: '1' diff --git a/device-types/Ciena/5162.yaml b/device-types/Ciena/5162.yaml index 10b5a80d..ebf507ff 100644 --- a/device-types/Ciena/5162.yaml +++ b/device-types/Ciena/5162.yaml @@ -11,25 +11,19 @@ weight_unit: kg console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: CLK type: other - mgmt_only: true description: Mini SMB GPS (10 MHz) coax connector, in or out, (SW selectable) - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port - name: BITS type: rj-45 - mgmt_only: true description: RJ-45 BITS in or out. interfaces: - name: '1' @@ -122,11 +116,11 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 170-0092-900 5162/5170,DC PLUGGABLE POWER SUPPLY, -48V 170-0093-900 5162/5170,AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: PS B position: B - comments: | + description: | 170-0092-900 5162/5170,DC PLUGGABLE POWER SUPPLY, -48V 170-0093-900 5162/5170,AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V diff --git a/device-types/Ciena/5164-ac-qsfp56.yaml b/device-types/Ciena/5164-ac-qsfp56.yaml index e19e9c95..da937675 100644 --- a/device-types/Ciena/5164-ac-qsfp56.yaml +++ b/device-types/Ciena/5164-ac-qsfp56.yaml @@ -11,21 +11,16 @@ weight_unit: kg console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: Mini-COAX GPS antenna port. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port interfaces: - name: '1' diff --git a/device-types/Ciena/5164-dc-qsfp56.yaml b/device-types/Ciena/5164-dc-qsfp56.yaml index 4c289753..f8e2a41d 100644 --- a/device-types/Ciena/5164-dc-qsfp56.yaml +++ b/device-types/Ciena/5164-dc-qsfp56.yaml @@ -10,21 +10,16 @@ is_full_depth: false console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: Mini-COAX GPS antenna port. - name: SYNC type: rj-45 - mgmt_only: true description: RJ-45 sync port interfaces: - name: '1' diff --git a/device-types/Ciena/5166-ac-qsfpdd.yaml b/device-types/Ciena/5166-ac-qsfpdd.yaml index e01e97c1..ffb6ff3d 100644 --- a/device-types/Ciena/5166-ac-qsfpdd.yaml +++ b/device-types/Ciena/5166-ac-qsfpdd.yaml @@ -11,21 +11,16 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB - name: SYNC type: rj-45 - mgmt_only: true description: 1 RJ45 BITS in or out, ToD in or out, or 1 PPS in or out (software selectable) interfaces: - name: '1' diff --git a/device-types/Ciena/5166-dc-qsfpdd.yaml b/device-types/Ciena/5166-dc-qsfpdd.yaml index 827b7f03..b90e9b2a 100644 --- a/device-types/Ciena/5166-dc-qsfpdd.yaml +++ b/device-types/Ciena/5166-dc-qsfpdd.yaml @@ -11,21 +11,16 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: GNSS/GPS antenna mini SMB - name: SYNC type: rj-45 - mgmt_only: true description: 1 RJ45 BITS in or out, ToD in or out, or 1 PPS in or out (software selectable) interfaces: - name: '1' diff --git a/device-types/Ciena/5170.yaml b/device-types/Ciena/5170.yaml index 5f0fbbc5..e11ec858 100644 --- a/device-types/Ciena/5170.yaml +++ b/device-types/Ciena/5170.yaml @@ -11,31 +11,26 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: CLK type: other - mgmt_only: true description: 1 Mini SMB GPS (10 MHz) coax connector, in or out, (SW selectable) - name: BITS type: rj-45 - mgmt_only: true description: RJ45 BITS in or out, ToD in or out, or 1PPS in or out (software selectable) module-bays: - name: PS A position: A - comments: | + description: | 170-0092-900 5162/5170,DC PLUGGABLE POWER SUPPLY, -48V 170-0093-900 5162/5170,AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: PS B position: B - comments: | + description: | 170-0092-900 5162/5170,DC PLUGGABLE POWER SUPPLY, -48V 170-0093-900 5162/5170,AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V interfaces: diff --git a/device-types/Ciena/5171-platform.yaml b/device-types/Ciena/5171-platform.yaml index 93bbe23f..db0d6728 100644 --- a/device-types/Ciena/5171-platform.yaml +++ b/device-types/Ciena/5171-platform.yaml @@ -12,25 +12,19 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: CLK type: other - mgmt_only: true description: 1 Mini SMB GPS (10 MHz) coax connector, in or out, (SW selectable) - name: SYNC type: rj-45 - mgmt_only: true description: RJ45 Synchronous Ethernet (SyncE) G.8261 and IEEE 1588v2 port. - name: BITS type: rj-45 - mgmt_only: true description: RJ-45 BITS in or out, ToD in or out, or 1PPS in or out (software selectable). interfaces: - name: '1' @@ -119,17 +113,17 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 170-0310-900 5171, DC PLUGGABLE POWER SUPPLY, -48V 170-0311-900 5171, AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: PS B position: B - comments: | + description: | 170-0310-900 5171, DC PLUGGABLE POWER SUPPLY, -48V 170-0311-900 5171, AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: Module 1 position: '1' - comments: | + description: | Accepts: * 170-0312-900 2x100G QSFP28 FRU supporting up to 100GbE * 170-0313-900 2x100G CFP2-DCO FRU supporting up to 100GbE @@ -137,7 +131,7 @@ module-bays: * 170-0315-900 CFP2/QSFP28 combo FRU supporting up to 100GbE - name: Module 2 position: '2' - comments: | + description: | Accepts: * 170-0312-900 2x100G QSFP28 FRU supporting up to 100GbE * 170-0313-900 2x100G CFP2-DCO FRU supporting up to 100GbE diff --git a/device-types/Ciena/5171-router.yaml b/device-types/Ciena/5171-router.yaml index b02154c4..7d28000b 100644 --- a/device-types/Ciena/5171-router.yaml +++ b/device-types/Ciena/5171-router.yaml @@ -12,21 +12,16 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1PPS / 10MHZ description: 1PPS / G.703 ToD port in or out (software selectable). SMB connector type: other - mgmt_only: true - name: ANT type: other - mgmt_only: true description: Mini-COAX SMB GPS antenna port - name: SYNC type: rj-45 - mgmt_only: true description: RJ45 interface G.703 1PPS and ToD/10MHz input/output (software selectable) interfaces: - name: '1' @@ -115,19 +110,19 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 170-0310-900 5171, DC PLUGGABLE POWER SUPPLY, -48V 170-0311-900 5171, AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: PS B position: B - comments: | + description: | 170-0310-900 5171, DC PLUGGABLE POWER SUPPLY, -48V 170-0311-900 5171, AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: Module 1 position: '1' - comments: | + description: | 170-0460-900 5171-ROUTER, MODULE, (1)200/100G/40G QSFPDD, (1)100/40G QSFP-DD 2xQSFP DD - name: Module 2 position: '2' - comments: | + description: | 170-0460-900 5171-ROUTER, MODULE, (1)200/100G/40G QSFPDD, (1)100/40G QSFP-DD 2xQSFP DD diff --git a/device-types/Ciena/6500-R2.yaml b/device-types/Ciena/6500-R2.yaml index 03de4006..a668e96b 100644 --- a/device-types/Ciena/6500-R2.yaml +++ b/device-types/Ciena/6500-R2.yaml @@ -24,11 +24,11 @@ module-bays: position: '4' - name: Power Input Module 1 position: '61' - comments: | + description: | NTK805SA AC NTK805DA DC - name: Power Input Module 2 position: '62' - comments: | + description: | NTK805SA AC NTK805DA DC diff --git a/device-types/Ciena/6500-R4.yaml b/device-types/Ciena/6500-R4.yaml index e7cb221f..b9a6566d 100644 --- a/device-types/Ciena/6500-R4.yaml +++ b/device-types/Ciena/6500-R4.yaml @@ -37,11 +37,11 @@ module-bays: position: '8' - name: Power Input Module 1 position: '61' - comments: | + description: | NTK805RA AC NTK805FA DC - name: Power Input Module 2 position: '62' - comments: | + description: | NTK805RA AC NTK805FA DC diff --git a/device-types/Ciena/8110.yaml b/device-types/Ciena/8110.yaml index 7df6ccc6..11a70a33 100644 --- a/device-types/Ciena/8110.yaml +++ b/device-types/Ciena/8110.yaml @@ -12,22 +12,17 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1 PPS/10 MHz description: Mini-COAX 1PPS/ToD SMB interface in or out (software selectable). type: other - mgmt_only: true - name: ANT description: GNSS/GPS antenna mini SMB. type: other - mgmt_only: true - name: SYNC type: rj-45 description: RJ-45 sync port - mgmt_only: true interfaces: - name: MGMT type: 1000base-t @@ -87,17 +82,17 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 170-0336-900 8110/8114,DC PLUGGABLE POWER SUPPLY 48V 170-0337-900 8110/8114,AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: PS B position: B - comments: | + description: | 170-0336-900 8110/8114,DC PLUGGABLE POWER SUPPLY 48V 170-0337-900 8110/8114,AC PLUGGABLE POWER SUPPLY, WIDE RANGE 120/240V - name: Module 1 position: '1' - comments: | + description: | * 170-0339-900 2x400G QSFP-DD * 170-0339-901 2x400G QSFP-DD-macsec * 170-0340-900 8x100G QSFP28 @@ -105,7 +100,7 @@ module-bays: * 170-0404-900 12x25G SFP28 - name: Module 2 position: '2' - comments: | + description: | * 170-0339-900 2x400G QSFP-DD * 170-0339-901 2x400G QSFP-DD-macsec * 170-0340-900 8x100G QSFP28 diff --git a/device-types/Ciena/8114.yaml b/device-types/Ciena/8114.yaml index 713f060d..5fb92c78 100644 --- a/device-types/Ciena/8114.yaml +++ b/device-types/Ciena/8114.yaml @@ -12,22 +12,17 @@ airflow: front-to-rear console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1 PPS/10 MHz description: Mini-COAX 1PPS/ToD SMB interface in or out (software selectable). type: other - mgmt_only: true - name: ANT description: GNSS/GPS antenna mini SMB. type: other - mgmt_only: true - name: SYNC type: rj-45 description: RJ-45 sync port - mgmt_only: true interfaces: - name: MGMT type: 1000base-t diff --git a/device-types/Ciena/8140.yaml b/device-types/Ciena/8140.yaml index 7ef0b0a5..d8f44552 100644 --- a/device-types/Ciena/8140.yaml +++ b/device-types/Ciena/8140.yaml @@ -12,26 +12,20 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1PPS / 10MHz A description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: 1PPS / 10MHz B description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: ANT description: GNSS/GPS antenna mini SMB. type: other - mgmt_only: true - name: SYNC type: rj-45 description: RJ45 interface G.703 1PPS & ToD input/output - mgmt_only: true interfaces: - name: M1 type: 10gbase-x-sfpp @@ -151,11 +145,11 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 170-0372-900 8140/8190, DC PLUGGABLE POWER SUPPLY -48V 170-0373-900 8140/8190, AC PLUGGABLE POWER SUPPLY - name: PS B position: B - comments: | + description: | 170-0372-900 8140/8190, DC PLUGGABLE POWER SUPPLY -48V 170-0373-900 8140/8190, AC PLUGGABLE POWER SUPPLY diff --git a/device-types/Ciena/8180.yaml b/device-types/Ciena/8180.yaml index 7a5bdd9f..85851f4d 100644 --- a/device-types/Ciena/8180.yaml +++ b/device-types/Ciena/8180.yaml @@ -12,22 +12,17 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-a - mgmt_only: true - name: 1PPS description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: CLK description: Mini SMB GPS (10 MHz) coax connector, in or out, (SW selectable) type: other - mgmt_only: true - name: BITS type: rj-45 description: RJ45 BITS in or out, ToD in or out, or 1PPS in or out - mgmt_only: true interfaces: - name: ILAN1 type: 100base-tx @@ -106,31 +101,31 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 192-0002-900 8180, DC PLUGGABLE POWER SUPPLY, 2200W 192-0003-900 8180, AC PLUGGABLE POWER SUPPLY, 2200W - name: PS B position: B - comments: | + description: | 192-0002-900 8180, DC PLUGGABLE POWER SUPPLY, 2200W 192-0003-900 8180, AC PLUGGABLE POWER SUPPLY, 2200W - name: Module 1 position: '1' - comments: | + description: | * 192-0001-900 1xWAVELOGIC AI 35G/56GBAUD C-BAND FRU MODULE * 192-0050-900 4x100G CFP2-DCO - name: Module 2 position: '2' - comments: | + description: | * 192-0001-900 1xWAVELOGIC AI 35G/56GBAUD C-BAND FRU MODULE * 192-0050-900 4x100G CFP2-DCO - name: Module 3 position: '3' - comments: | + description: | * 192-0001-900 1xWAVELOGIC AI 35G/56GBAUD C-BAND FRU MODULE * 192-0050-900 4x100G CFP2-DCO - name: Module 4 position: '4' - comments: | + description: | * 192-0001-900 1xWAVELOGIC AI 35G/56GBAUD C-BAND FRU MODULE * 192-0050-900 4x100G CFP2-DCO diff --git a/device-types/Ciena/8190.yaml b/device-types/Ciena/8190.yaml index 0871dae4..0db50153 100644 --- a/device-types/Ciena/8190.yaml +++ b/device-types/Ciena/8190.yaml @@ -12,26 +12,20 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1PPS / 10MHz A description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: 1PPS / 10MHz B description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: ANT description: GNSS/GPS antenna mini SMB. type: other - mgmt_only: true - name: SYNC type: rj-45 description: RJ45 interface G.703 1PPS & ToD input/output - mgmt_only: true interfaces: - name: M1 type: 10gbase-x-sfpp @@ -127,11 +121,11 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 170-0372-900 8140/8190, DC PLUGGABLE POWER SUPPLY -48V 170-0373-900 8140/8190, AC PLUGGABLE POWER SUPPLY - name: PS B position: B - comments: | + description: | 170-0372-900 8140/8190, DC PLUGGABLE POWER SUPPLY -48V 170-0373-900 8140/8190, AC PLUGGABLE POWER SUPPLY diff --git a/device-types/Ciena/8192.yaml b/device-types/Ciena/8192.yaml index 6f5f12e9..b5635042 100644 --- a/device-types/Ciena/8192.yaml +++ b/device-types/Ciena/8192.yaml @@ -12,26 +12,20 @@ front_image: true console-ports: - name: CONSOLE type: usb-c - mgmt_only: true - name: USB type: usb-c - mgmt_only: true - name: 1PPS / 10MHz A description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: 1PPS / 10MHz B description: Mini SMB interface for 1PPS/ToD in/out (software selectable) type: other - mgmt_only: true - name: ANT description: GNSS/GPS antenna mini SMB. type: other - mgmt_only: true - name: SYNC type: rj-45 description: RJ45 interface G.703 1PPS & ToD input/output - mgmt_only: true interfaces: - name: M1 type: 10gbase-x-sfpp @@ -127,11 +121,11 @@ interfaces: module-bays: - name: PS A position: A - comments: | + description: | 170-0372-900 8140/8190, DC PLUGGABLE POWER SUPPLY -48V 170-0373-900 8140/8190, AC PLUGGABLE POWER SUPPLY - name: PS B position: B - comments: | + description: | 170-0372-900 8140/8190, DC PLUGGABLE POWER SUPPLY -48V 170-0373-900 8140/8190, AC PLUGGABLE POWER SUPPLY diff --git a/device-types/Ciena/FLA1-10-A8-AC.yaml b/device-types/Ciena/FLA1-10-A8-AC.yaml index 944319ef..5755e40e 100644 --- a/device-types/Ciena/FLA1-10-A8-AC.yaml +++ b/device-types/Ciena/FLA1-10-A8-AC.yaml @@ -12,10 +12,8 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-c - mgmt_only: true power-ports: - name: Power A type: iec-60320-c14 diff --git a/device-types/Ciena/FLA1-10-B8-AC.yaml b/device-types/Ciena/FLA1-10-B8-AC.yaml index ea6acb0f..079adbca 100644 --- a/device-types/Ciena/FLA1-10-B8-AC.yaml +++ b/device-types/Ciena/FLA1-10-B8-AC.yaml @@ -12,10 +12,8 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-c - mgmt_only: true power-ports: - name: Power A type: iec-60320-c14 diff --git a/device-types/Ciena/FLA2-10-E8-AC.yaml b/device-types/Ciena/FLA2-10-E8-AC.yaml index 7a5be0ff..02baa375 100644 --- a/device-types/Ciena/FLA2-10-E8-AC.yaml +++ b/device-types/Ciena/FLA2-10-E8-AC.yaml @@ -12,10 +12,8 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-c - mgmt_only: true power-ports: - name: Power A type: iec-60320-c14 diff --git a/device-types/Ciena/FLA2-48-M-AC.yaml b/device-types/Ciena/FLA2-48-M-AC.yaml index 2bb6786e..7917ac17 100644 --- a/device-types/Ciena/FLA2-48-M-AC.yaml +++ b/device-types/Ciena/FLA2-48-M-AC.yaml @@ -12,10 +12,8 @@ front_image: true console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-c - mgmt_only: true power-ports: - name: Power A type: iec-60320-c14 diff --git a/device-types/Ciena/waveserver-5.yaml b/device-types/Ciena/waveserver-5.yaml index 9860a467..7b273559 100644 --- a/device-types/Ciena/waveserver-5.yaml +++ b/device-types/Ciena/waveserver-5.yaml @@ -19,7 +19,7 @@ module-bays: description: 186-3010-900 or 186-3011-900 - name: Module 1 position: '1' - comments: | + description: | * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-900) * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-901) * Waveserver WL5e 2x800G L-Band Submarine 16xQSFP28/QSFP-DD Module (186-3110-901) @@ -36,7 +36,7 @@ module-bays: * Waveserver WL5e 2x800G Encryption L-Band Enhanced 16xQSFP28/QSFP-DD Module (186-3172-900) - name: Module 3 position: '3' - comments: | + description: | * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-900) * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-901) * Waveserver WL5e 2x800G L-Band Submarine 16xQSFP28/QSFP-DD Module (186-3110-901) @@ -53,7 +53,7 @@ module-bays: * Waveserver WL5e 2x800G Encryption L-Band Enhanced 16xQSFP28/QSFP-DD Module (186-3172-900) - name: Module 5 position: '5' - comments: | + description: | * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-900) * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-901) * Waveserver WL5e 2x800G L-Band Submarine 16xQSFP28/QSFP-DD Module (186-3110-901) @@ -70,7 +70,7 @@ module-bays: * Waveserver WL5e 2x800G Encryption L-Band Enhanced 16xQSFP28/QSFP-DD Module (186-3172-900) - name: Module 7 position: '7' - comments: | + description: | * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-900) * Waveserver WL5e 2x800G C-Band Submarine 16xQSFP28/QSFP-DD Module (186-3100-901) * Waveserver WL5e 2x800G L-Band Submarine 16xQSFP28/QSFP-DD Module (186-3110-901) @@ -87,11 +87,11 @@ module-bays: * Waveserver WL5e 2x800G Encryption L-Band Enhanced 16xQSFP28/QSFP-DD Module (186-3172-900) - name: PSU-1 position: PSU-1 - comments: | + description: | 186-3040-900 AC 186-3041-900 DC - name: PSU-2 position: PSU-2 - comments: | + description: | 186-3040-900 AC 186-3041-900 DC diff --git a/device-types/Ciena/waveserver-ai.yaml b/device-types/Ciena/waveserver-ai.yaml index 0081f869..597b59b7 100644 --- a/device-types/Ciena/waveserver-ai.yaml +++ b/device-types/Ciena/waveserver-ai.yaml @@ -16,7 +16,7 @@ module-bays: description: 186-1031-900 - name: Module 1 position: '1' - comments: | + description: | * Waveserver Ai 2x400G 56GBaud EDFA L-Band 8xQSFP28 Module (186-1800-900) * Waveserver Ai 2x400G 35/56GBaud EDFA C-Band 8xQSFP28 Module (186-1601-900) * Waveserver Ai 2x400G 35/56GBaud EDFA C-Band Standard 8xQSFP28 Module (186-1601-902) @@ -25,7 +25,7 @@ module-bays: * Waveserver Ai 2x400G 35/56 GBaud EDFA L-Band 8xQSFP28 Module (186-1801-900) - name: Module 2 position: '2' - comments: | + description: | * Waveserver Ai 2x400G 56GBaud EDFA L-Band 8xQSFP28 Module (186-1800-900) * Waveserver Ai 2x400G 35/56GBaud EDFA C-Band 8xQSFP28 Module (186-1601-900) * Waveserver Ai 2x400G 35/56GBaud EDFA C-Band Standard 8xQSFP28 Module (186-1601-902) @@ -34,7 +34,7 @@ module-bays: * Waveserver Ai 2x400G 35/56 GBaud EDFA L-Band 8xQSFP28 Module (186-1801-900) - name: Module 3 position: '3' - comments: | + description: | * Waveserver Ai 2x400G 56GBaud EDFA L-Band 8xQSFP28 Module (186-1800-900) * Waveserver Ai 2x400G 35/56GBaud EDFA C-Band 8xQSFP28 Module (186-1601-900) * Waveserver Ai 2x400G 35/56GBaud EDFA C-Band Standard 8xQSFP28 Module (186-1601-902) @@ -43,11 +43,11 @@ module-bays: * Waveserver Ai 2x400G 35/56 GBaud EDFA L-Band 8xQSFP28 Module (186-1801-900) - name: PSU-1 position: PSU-1 - comments: | + description: | 186-1510-900 AC 186-1511-900 DC - name: PSU-2 position: PSU-2 - comments: | + description: | 186-1510-900 AC 186-1511-900 DC diff --git a/device-types/Cisco/C881-K9.yaml b/device-types/Cisco/C881-K9.yaml index 21c15353..4d6080ec 100644 --- a/device-types/Cisco/C881-K9.yaml +++ b/device-types/Cisco/C881-K9.yaml @@ -12,7 +12,6 @@ airflow: passive console-ports: - name: con0 type: rj-45 - mgmt_only: true interfaces: - name: Ethernet0 type: 100base-tx diff --git a/device-types/Cisco/C887VA-K9.yaml b/device-types/Cisco/C887VA-K9.yaml index 3ba8ff7d..0c19b523 100644 --- a/device-types/Cisco/C887VA-K9.yaml +++ b/device-types/Cisco/C887VA-K9.yaml @@ -11,7 +11,6 @@ weight_unit: kg console-ports: - name: con0 type: rj-45 - mgmt_only: true interfaces: - name: Ethernet0 type: 100base-tx diff --git a/device-types/Cisco/C921-4PLTEGB.yaml b/device-types/Cisco/C921-4PLTEGB.yaml index 37acb907..f44dc3ea 100644 --- a/device-types/Cisco/C921-4PLTEGB.yaml +++ b/device-types/Cisco/C921-4PLTEGB.yaml @@ -12,7 +12,6 @@ airflow: passive console-ports: - name: con0 type: rj-45 - mgmt_only: true interfaces: - name: Cellular0 type: lte diff --git a/device-types/Cisco/C9500X-28C8D.yaml b/device-types/Cisco/C9500X-28C8D.yaml index 13d2964c..4836633c 100644 --- a/device-types/Cisco/C9500X-28C8D.yaml +++ b/device-types/Cisco/C9500X-28C8D.yaml @@ -19,198 +19,159 @@ console-ports: interfaces: - name: GigabitEthernet0/0 type: 1000base-t - speed: 1000000 mgmt_only: true - name: HundredGigE1/0/1 label: Hu1/0/1 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/2 label: Hu1/0/2 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/3 label: Hu1/0/3 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/4 label: Hu1/0/4 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/5 label: Hu1/0/5 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/6 label: Hu1/0/6 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/7 label: Hu1/0/7 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/8 label: Hu1/0/8 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/9 label: Hu1/0/9 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/10 label: Hu1/0/10 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/11 label: Hu1/0/11 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/12 label: Hu1/0/12 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/13 label: Hu1/0/13 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/14 label: Hu1/0/14 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: FourHundredGigE1/0/15 label: Fou1/0/15 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: FourHundredGigE1/0/16 label: Fou1/0/16 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: FourHundredGigE1/0/17 label: Fou1/0/17 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: FourHundredGigE1/0/18 label: Fou1/0/18 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: FourHundredGigE1/0/19 label: Fou1/0/19 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: FourHundredGigE1/0/20 label: Fou1/0/20 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: FourHundredGigE1/0/21 label: Fou1/0/21 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: FourHundredGigE1/0/22 label: Fou1/0/22 type: 400gbase-x-qsfpdd - speed: 400000000 mgmt_only: false - name: HundredGigE1/0/23 label: Hu1/0/23 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/24 label: Hu1/0/24 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/25 label: Hu1/0/25 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/26 label: Hu1/0/26 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/27 label: Hu1/0/27 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/28 label: Hu1/0/28 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/29 label: Hu1/0/29 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/30 label: Hu1/0/30 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/31 label: Hu1/0/31 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/32 label: Hu1/0/32 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/33 label: Hu1/0/33 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/34 label: Hu1/0/34 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/35 label: Hu1/0/35 type: 100gbase-x-qsfp28 - speed: 100000000 mgmt_only: false - name: HundredGigE1/0/36 label: Hu1/0/36 type: 100gbase-x-qsfp28 - speed: 10000000 mgmt_only: false - name: appGigabitEthernet1/0/1 label: Ap1/0/1 type: virtual - speed: 10000000 mgmt_only: false description: App-hosting Gigabit Ethernet - name: appGigabitEthernet1/0/2 label: Ap1/0/2 type: virtual - speed: 10000000 mgmt_only: false description: App-hosting Gigabit Ethernet module-bays: diff --git a/device-types/Cisco/ISR897VA.yaml b/device-types/Cisco/ISR897VA.yaml index 2c4e1ebf..c31bae5b 100644 --- a/device-types/Cisco/ISR897VA.yaml +++ b/device-types/Cisco/ISR897VA.yaml @@ -33,7 +33,6 @@ interfaces: console-ports: - name: con 0 type: rj-45 - mgmt_only: true - name: usb type: usb-a power-ports: diff --git a/device-types/Cisco/SX550X-16FT.yaml b/device-types/Cisco/SX550X-16FT.yaml index 12a02176..720eba5a 100644 --- a/device-types/Cisco/SX550X-16FT.yaml +++ b/device-types/Cisco/SX550X-16FT.yaml @@ -51,7 +51,7 @@ interfaces: type: 10gbase-x-sfpp - name: oob type: 1000base-t - management-only: true + mgmt_only: true - name: Port-channel1 type: lag - name: Port-channel2 diff --git a/device-types/ConnectCom/CCM-Patchpanel-1HE-SLITE-HD-Right.yaml b/device-types/ConnectCom/CCM-Patchpanel-1HE-SLITE-HD-Right.yaml index 1e471414..4a6e32cd 100644 --- a/device-types/ConnectCom/CCM-Patchpanel-1HE-SLITE-HD-Right.yaml +++ b/device-types/ConnectCom/CCM-Patchpanel-1HE-SLITE-HD-Right.yaml @@ -300,7 +300,6 @@ front-ports: type: lc-apc rear_port: Rear Port 72 rear_port_position: 1 - rear-ports: lc-apc rear-ports: - name: Rear Port 1 type: splice @@ -340,181 +339,181 @@ rear-ports: positions: 1 - name: Rear Port 13 type: splice - position: 1 + positions: 1 - name: Rear Port 14 type: splice - position: 1 + positions: 1 - name: Rear Port 15 type: splice - position: 1 + positions: 1 - name: Rear Port 16 type: splice - position: 1 + positions: 1 - name: Rear Port 17 type: splice - position: 1 + positions: 1 - name: Rear Port 18 type: splice - position: 1 + positions: 1 - name: Rear Port 19 type: splice - position: 1 + positions: 1 - name: Rear Port 20 type: splice - position: 1 + positions: 1 - name: Rear Port 21 type: splice - position: 1 + positions: 1 - name: Rear Port 22 type: splice - position: 1 + positions: 1 - name: Rear Port 23 type: splice - position: 1 + positions: 1 - name: Rear Port 24 type: splice - position: 1 + positions: 1 - name: Rear Port 25 type: splice - position: 1 + positions: 1 - name: Rear Port 26 type: splice - position: 1 + positions: 1 - name: Rear Port 27 type: splice - position: 1 + positions: 1 - name: Rear Port 28 type: splice - position: 1 + positions: 1 - name: Rear Port 29 type: splice - position: 1 + positions: 1 - name: Rear Port 30 type: splice - position: 1 + positions: 1 - name: Rear Port 31 type: splice - position: 1 + positions: 1 - name: Rear Port 32 type: splice - position: 1 + positions: 1 - name: Rear Port 33 type: splice - position: 1 + positions: 1 - name: Rear Port 34 type: splice - position: 1 + positions: 1 - name: Rear Port 35 type: splice - position: 1 + positions: 1 - name: Rear Port 36 type: splice - position: 1 + positions: 1 - name: Rear Port 37 type: splice - position: 1 + positions: 1 - name: Rear Port 38 type: splice - position: 1 + positions: 1 - name: Rear Port 39 type: splice - position: 1 + positions: 1 - name: Rear Port 40 type: splice - position: 1 + positions: 1 - name: Rear Port 41 type: splice - position: 1 + positions: 1 - name: Rear Port 42 type: splice - position: 1 + positions: 1 - name: Rear Port 43 type: splice - position: 1 + positions: 1 - name: Rear Port 44 type: splice - position: 1 + positions: 1 - name: Rear Port 45 type: splice - position: 1 + positions: 1 - name: Rear Port 46 type: splice - position: 1 + positions: 1 - name: Rear Port 47 type: splice - position: 1 + positions: 1 - name: Rear Port 48 type: splice - position: 1 + positions: 1 - name: Rear Port 49 type: splice - position: 1 + positions: 1 - name: Rear Port 50 type: splice - position: 1 + positions: 1 - name: Rear Port 51 type: splice - position: 1 + positions: 1 - name: Rear Port 52 type: splice - position: 1 + positions: 1 - name: Rear Port 53 type: splice - position: 1 + positions: 1 - name: Rear Port 54 type: splice - position: 1 + positions: 1 - name: Rear Port 55 type: splice - position: 1 + positions: 1 - name: Rear Port 56 type: splice - position: 1 + positions: 1 - name: Rear Port 57 type: splice - position: 1 + positions: 1 - name: Rear Port 58 type: splice - position: 1 + positions: 1 - name: Rear Port 59 type: splice - position: 1 + positions: 1 - name: Rear Port 60 type: splice - position: 1 + positions: 1 - name: Rear Port 61 type: splice - position: 1 + positions: 1 - name: Rear Port 62 type: splice - position: 1 + positions: 1 - name: Rear Port 63 type: splice - position: 1 + positions: 1 - name: Rear Port 64 type: splice - position: 1 + positions: 1 - name: Rear Port 65 type: splice - position: 1 + positions: 1 - name: Rear Port 66 type: splice - position: 1 + positions: 1 - name: Rear Port 67 type: splice - position: 1 + positions: 1 - name: Rear Port 68 type: splice - position: 1 + positions: 1 - name: Rear Port 69 type: splice - position: 1 + positions: 1 - name: Rear Port 70 type: splice - position: 1 + positions: 1 - name: Rear Port 71 type: splice - position: 1 + positions: 1 - name: Rear Port 72 type: splice - position: 1 + positions: 1 diff --git a/device-types/DEPO/Race-SR518.yaml b/device-types/DEPO/Race-SR518.yaml index 53a6d0cb..77e70b27 100644 --- a/device-types/DEPO/Race-SR518.yaml +++ b/device-types/DEPO/Race-SR518.yaml @@ -25,7 +25,7 @@ module-bays: position: PCIe-4 - name: PCIe-5 LP x8 position: PCIe-7 - comment: M-Key M.2 + description: M-Key M.2 interfaces: - name: Eth-1 type: 1000base-t diff --git a/device-types/DataDirect Networks/SFA200NVX2-Enclosure.yaml b/device-types/DataDirect Networks/SFA200NVX2-Enclosure.yaml index ee8770ae..315de042 100644 --- a/device-types/DataDirect Networks/SFA200NVX2-Enclosure.yaml +++ b/device-types/DataDirect Networks/SFA200NVX2-Enclosure.yaml @@ -20,7 +20,5 @@ module-bays: device-bays: - name: Controller 0 label: Controller Slot 0 - position: '0' - name: Controller 1 label: Controller Slot 1 - position: '1' diff --git a/device-types/Datacom/VS-1124-F.yaml b/device-types/Datacom/VS-1124-F.yaml index cc75db35..af933579 100644 --- a/device-types/Datacom/VS-1124-F.yaml +++ b/device-types/Datacom/VS-1124-F.yaml @@ -65,7 +65,5 @@ interfaces: module-bays: - name: PSU1 position: '1' - maximum_draw: 200 - name: PSU2 position: '2' - maximum_draw: 200 diff --git a/device-types/Dell/PowerScale-A300.yaml b/device-types/Dell/PowerScale-A300.yaml index e3177a92..a533a661 100644 --- a/device-types/Dell/PowerScale-A300.yaml +++ b/device-types/Dell/PowerScale-A300.yaml @@ -16,10 +16,8 @@ console-ports: module-bays: - name: PSU1 position: PSU1 - type: iec-60320-c14 - name: PSU2 position: PSU2 - type: iec-60320-c14 interfaces: - name: Gig-E 1 type: 32gfc-sfp28 diff --git a/device-types/Dell/PowerScale-A3000.yaml b/device-types/Dell/PowerScale-A3000.yaml index e9a14cd2..19ecaac6 100644 --- a/device-types/Dell/PowerScale-A3000.yaml +++ b/device-types/Dell/PowerScale-A3000.yaml @@ -15,10 +15,8 @@ console-ports: module-bays: - name: PSU1 position: PSU1 - type: iec-60320-c14 - name: PSU2 position: PSU2 - type: iec-60320-c14 interfaces: - name: Gig-E 1 type: 32gfc-sfp28 diff --git a/device-types/Dell/PowerSwitch-N1524P.yaml b/device-types/Dell/PowerSwitch-N1524P.yaml index cc51ef71..6c603be7 100644 --- a/device-types/Dell/PowerSwitch-N1524P.yaml +++ b/device-types/Dell/PowerSwitch-N1524P.yaml @@ -17,100 +17,100 @@ power-ports: interfaces: - name: Gi1/0/1 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/2 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/3 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/4 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/5 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/6 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/7 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/8 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/9 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/10 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/11 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/12 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/13 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/14 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/15 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/16 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/17 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/18 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/19 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/20 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/21 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/22 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/23 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/24 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Te1/0/1 type: 10gbase-x-sfpp - name: Te1/0/2 diff --git a/device-types/Dell/PowerSwitch-N1548P.yaml b/device-types/Dell/PowerSwitch-N1548P.yaml index 1a3779c5..d526d50f 100644 --- a/device-types/Dell/PowerSwitch-N1548P.yaml +++ b/device-types/Dell/PowerSwitch-N1548P.yaml @@ -17,196 +17,196 @@ power-ports: interfaces: - name: Gi1/0/1 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/2 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/3 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/4 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/5 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/6 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/7 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/8 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/9 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/10 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/11 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/12 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/13 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/14 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/15 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/16 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/17 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/18 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/19 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/20 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/21 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/22 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/23 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/24 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/25 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/26 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/27 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/28 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/29 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/30 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/31 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/32 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/33 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/34 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/35 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/36 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/37 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/38 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/39 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/40 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/41 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/42 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/43 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/44 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/45 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/46 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/47 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/48 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Te1/0/1 type: 10gbase-x-sfpp - name: Te1/0/2 diff --git a/device-types/Dell/PowerSwitch-N2024P.yaml b/device-types/Dell/PowerSwitch-N2024P.yaml index 9b8f8a1b..0a19b7e5 100644 --- a/device-types/Dell/PowerSwitch-N2024P.yaml +++ b/device-types/Dell/PowerSwitch-N2024P.yaml @@ -16,100 +16,100 @@ power-ports: interfaces: - name: Gi1/0/1 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/2 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/3 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/4 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/5 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/6 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/7 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/8 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/9 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/10 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/11 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/12 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/13 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/14 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/15 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/16 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/17 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/18 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/19 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/20 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/21 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/22 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/23 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/24 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Te1/0/1 type: 10gbase-x-sfpp - name: Te1/0/2 diff --git a/device-types/Dell/PowerSwitch-N2048P.yaml b/device-types/Dell/PowerSwitch-N2048P.yaml index ac5467d4..2fb2dcaf 100644 --- a/device-types/Dell/PowerSwitch-N2048P.yaml +++ b/device-types/Dell/PowerSwitch-N2048P.yaml @@ -16,196 +16,196 @@ power-ports: interfaces: - name: Gi1/0/1 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/2 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/3 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/4 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/5 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/6 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/7 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/8 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/9 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/10 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/11 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/12 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/13 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/14 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/15 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/16 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/17 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/18 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/19 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/20 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/21 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/22 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/23 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/24 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/25 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/26 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/27 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/28 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/29 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/30 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/31 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/32 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/33 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/34 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/35 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/36 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/37 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/38 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/39 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/40 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/41 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/42 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/43 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/44 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/45 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/46 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/47 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/48 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Te1/0/1 type: 10gbase-x-sfpp - name: Te1/0/2 diff --git a/device-types/Dell/PowerSwitch-N3248P-ON.yaml b/device-types/Dell/PowerSwitch-N3248P-ON.yaml index a6faa2a9..bceede8e 100644 --- a/device-types/Dell/PowerSwitch-N3248P-ON.yaml +++ b/device-types/Dell/PowerSwitch-N3248P-ON.yaml @@ -23,196 +23,196 @@ interfaces: mgmt_only: true - name: Gi1/0/1 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/2 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/3 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/4 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/5 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/6 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/7 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/8 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/9 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/10 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/11 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/12 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/13 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/14 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/15 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/16 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/17 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/18 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/19 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/20 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/21 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/22 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/23 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/24 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/25 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/26 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/27 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/28 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/29 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/30 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/31 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/32 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/33 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/34 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/35 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/36 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/37 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/38 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/39 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/40 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/41 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/42 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/43 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/44 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/45 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/46 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/47 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Gi1/0/48 type: 1000base-t - poe-mode: pse - poe-type: type2-ieee802.3at + poe_mode: pse + poe_type: type2-ieee802.3at - name: Te1/0/1 type: 10gbase-x-sfpp - name: Te1/0/2 diff --git a/device-types/Fortinet/FG-900G.yaml b/device-types/Fortinet/FG-900G.yaml index abb1bd1c..3647ad4d 100644 --- a/device-types/Fortinet/FG-900G.yaml +++ b/device-types/Fortinet/FG-900G.yaml @@ -76,16 +76,16 @@ interfaces: type: 10gbase-x-sfpp - name: X5 type: 25gbase-x-sfp28 - comments: ULL (ultra-low latency) + description: ULL (ultra-low latency) - name: X6 type: 25gbase-x-sfp28 - comments: ULL (ultra-low latency) + description: ULL (ultra-low latency) - name: X7 type: 25gbase-x-sfp28 - comments: ULL (ultra-low latency) + description: ULL (ultra-low latency) - name: X8 type: 25gbase-x-sfp28 - comments: ULL (ultra-low latency) + description: ULL (ultra-low latency) module-bays: - name: PS1 position: '1' diff --git a/device-types/Fortinet/FS-648F-FPOE.yaml b/device-types/Fortinet/FS-648F-FPOE.yaml index 4c20a5d9..1ff89aba 100644 --- a/device-types/Fortinet/FS-648F-FPOE.yaml +++ b/device-types/Fortinet/FS-648F-FPOE.yaml @@ -18,10 +18,8 @@ console-ports: module-bays: - name: PSU1 position: '1' - maximum_draw: 1200 - name: PSU2 position: '2' - maximum_draw: 1200 interfaces: - name: port1 type: 2.5gbase-t diff --git a/device-types/GL-iNet/GL-AXT1800.yaml b/device-types/GL-iNet/GL-AXT1800.yaml index 2524aaa1..999b5e62 100644 --- a/device-types/GL-iNet/GL-AXT1800.yaml +++ b/device-types/GL-iNet/GL-AXT1800.yaml @@ -27,4 +27,4 @@ interfaces: type: 1000base-t - name: wlan0 type: ieee802.11ax - comments: IEEE 802.11a/b/g/n/ac/ax + description: IEEE 802.11a/b/g/n/ac/ax diff --git a/device-types/HPE/MSA-2050-Enclosure.yaml b/device-types/HPE/MSA-2050-Enclosure.yaml index 3b855bc5..be68b837 100644 --- a/device-types/HPE/MSA-2050-Enclosure.yaml +++ b/device-types/HPE/MSA-2050-Enclosure.yaml @@ -16,6 +16,4 @@ module-bays: position: PSU1 device-bays: - name: Ctrl1 - position: Ctrl1 - name: Ctrl0 - position: Ctrl0 diff --git a/device-types/HPE/Nimble-HF40.yaml b/device-types/HPE/Nimble-HF40.yaml index 05e7c250..f57c9209 100644 --- a/device-types/HPE/Nimble-HF40.yaml +++ b/device-types/HPE/Nimble-HF40.yaml @@ -18,7 +18,5 @@ module-bays: device-bays: - name: A label: Controller A - position: A - name: B label: Controller B - position: B diff --git a/device-types/HPE/Primera-2U-Enclosure.yaml b/device-types/HPE/Primera-2U-Enclosure.yaml index 96d65728..9d6e27df 100644 --- a/device-types/HPE/Primera-2U-Enclosure.yaml +++ b/device-types/HPE/Primera-2U-Enclosure.yaml @@ -16,6 +16,4 @@ module-bays: position: PSU1 device-bays: - name: Ctrl1 - position: Ctrl1 - name: Ctrl0 - position: Ctrl0 diff --git a/device-types/HPE/Primera-4U-Enclosure.yaml b/device-types/HPE/Primera-4U-Enclosure.yaml index 81337208..d2a135ac 100644 --- a/device-types/HPE/Primera-4U-Enclosure.yaml +++ b/device-types/HPE/Primera-4U-Enclosure.yaml @@ -20,10 +20,6 @@ module-bays: position: PSU3 device-bays: - name: Ctrl3 - position: Ctrl3 - name: Ctrl2 - position: Ctrl2 - name: Ctrl1 - position: Ctrl1 - name: Ctrl0 - position: Ctrl0 diff --git a/device-types/HPE/ProLiant-DL325-Gen11.yaml b/device-types/HPE/ProLiant-DL325-Gen11.yaml index 43f23ea0..049dcccb 100644 --- a/device-types/HPE/ProLiant-DL325-Gen11.yaml +++ b/device-types/HPE/ProLiant-DL325-Gen11.yaml @@ -20,15 +20,15 @@ module-bays: position: PCIe-1 - name: PCIe-2 NVME position: PCIe-2 - comments: Optional NS204i-u hot-plug NVME + description: Optional NS204i-u hot-plug NVME - name: PCIe-3 Gen5 raiser position: PCIe-3 - name: OCP-1 position: OCP-1 - comments: OCP 3.0 + description: OCP 3.0 - name: OCP-2 position: OCP-2 - comments: OCP 3.0 + description: OCP 3.0 interfaces: - name: iLO type: 1000base-t diff --git a/device-types/HPE/Virtual-Connect-SE-40Gb-F8-Module-for-Synergy.yaml b/device-types/HPE/Virtual-Connect-SE-40Gb-F8-Module-for-Synergy.yaml index 6f48d8c9..27976faf 100644 --- a/device-types/HPE/Virtual-Connect-SE-40Gb-F8-Module-for-Synergy.yaml +++ b/device-types/HPE/Virtual-Connect-SE-40Gb-F8-Module-for-Synergy.yaml @@ -36,7 +36,7 @@ interfaces: type: 40gbase-x-qsfpp - name: interconnect {module}, Q7 type: 40gbase-x-qsfpp - comments: ICM Clustering or Uplink + description: ICM Clustering or Uplink - name: interconnect {module}, Q8 type: 40gbase-x-qsfpp - comments: ICM Clustring or Uplink + description: ICM Clustring or Uplink diff --git a/device-types/Huawei/Dorado-5000-v6-enclosure.yaml b/device-types/Huawei/Dorado-5000-v6-enclosure.yaml index a53d2636..d2e70e63 100644 --- a/device-types/Huawei/Dorado-5000-v6-enclosure.yaml +++ b/device-types/Huawei/Dorado-5000-v6-enclosure.yaml @@ -15,6 +15,4 @@ module-bays: position: PSU1 device-bays: - name: Contoller A - position: A - name: Contoller B - position: B diff --git a/device-types/Juniper/ACX7024-AC.yaml b/device-types/Juniper/ACX7024-AC.yaml index 8c10209c..fee79d62 100644 --- a/device-types/Juniper/ACX7024-AC.yaml +++ b/device-types/Juniper/ACX7024-AC.yaml @@ -77,11 +77,9 @@ interfaces: module-bays: - name: PSM 0 # Comment: Power Supply Module 0 - maximum_draw: 150 position: '0' - name: PSM 1 # Comment: Power Supply Module 1 - maximum_draw: 150 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7024X.yaml b/device-types/Juniper/ACX7024X.yaml index fa4f7662..850cd703 100644 --- a/device-types/Juniper/ACX7024X.yaml +++ b/device-types/Juniper/ACX7024X.yaml @@ -76,10 +76,8 @@ interfaces: type: 25gbase-x-sfp28 module-bays: - name: PSM 0 - maximum_draw: 250 position: '0' - name: PSM 1 - maximum_draw: 250 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7100-32C-AC-AO.yaml b/device-types/Juniper/ACX7100-32C-AC-AO.yaml index b2eb0665..db8fb120 100644 --- a/device-types/Juniper/ACX7100-32C-AC-AO.yaml +++ b/device-types/Juniper/ACX7100-32C-AC-AO.yaml @@ -91,11 +91,9 @@ interfaces: module-bays: - name: PSM 0 # Comment: Power Supply Module 0 - maximum_draw: 1600 position: '0' - name: PSM 1 # Comment: Power Supply Module 1 - maximum_draw: 1600 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7100-32C-DC-AO.yaml b/device-types/Juniper/ACX7100-32C-DC-AO.yaml index 9ef33be5..1f7131cd 100644 --- a/device-types/Juniper/ACX7100-32C-DC-AO.yaml +++ b/device-types/Juniper/ACX7100-32C-DC-AO.yaml @@ -91,11 +91,9 @@ interfaces: module-bays: - name: PSM 0 # Comment: Power Supply Module 0 - maximum_draw: 1600 position: '0' - name: PSM 1 # Comment: Power Supply Module 1 - maximum_draw: 1600 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7100-48L-AC-AI.yaml b/device-types/Juniper/ACX7100-48L-AC-AI.yaml index 1fc42d7d..74ff7239 100644 --- a/device-types/Juniper/ACX7100-48L-AC-AI.yaml +++ b/device-types/Juniper/ACX7100-48L-AC-AI.yaml @@ -127,11 +127,9 @@ interfaces: module-bays: - name: PSM 0 # Comment: Power Supply Module 0 - maximum_draw: 1600 position: '0' - name: PSM 1 # Comment: Power Supply Module 1 - maximum_draw: 1600 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7100-48L-AC-AO.yaml b/device-types/Juniper/ACX7100-48L-AC-AO.yaml index 695abbf0..de93d2ea 100644 --- a/device-types/Juniper/ACX7100-48L-AC-AO.yaml +++ b/device-types/Juniper/ACX7100-48L-AC-AO.yaml @@ -127,11 +127,9 @@ interfaces: module-bays: - name: PSM 0 # Comment: Power Supply Module 0 - maximum_draw: 1600 position: '0' - name: PSM 1 # Comment: Power Supply Module 1 - maximum_draw: 1600 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7100-48L-DC-AI.yaml b/device-types/Juniper/ACX7100-48L-DC-AI.yaml index 531d7d88..af73b718 100644 --- a/device-types/Juniper/ACX7100-48L-DC-AI.yaml +++ b/device-types/Juniper/ACX7100-48L-DC-AI.yaml @@ -127,11 +127,9 @@ interfaces: module-bays: - name: PSM 0 # Comment: Power Supply Module 0 - maximum_draw: 1600 position: '0' - name: PSM 1 # Comment: Power Supply Module 1 - maximum_draw: 1600 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7100-48L-DC-AO.yaml b/device-types/Juniper/ACX7100-48L-DC-AO.yaml index 12484679..2456ac83 100644 --- a/device-types/Juniper/ACX7100-48L-DC-AO.yaml +++ b/device-types/Juniper/ACX7100-48L-DC-AO.yaml @@ -127,11 +127,9 @@ interfaces: module-bays: - name: PSM 0 # Comment: Power Supply Module 0 - maximum_draw: 1600 position: '0' - name: PSM 1 # Comment: Power Supply Module 1 - maximum_draw: 1600 position: '1' - name: Fan Module 0 position: '0' diff --git a/device-types/Juniper/ACX7332.yaml b/device-types/Juniper/ACX7332.yaml index a09af6bd..7f79d700 100644 --- a/device-types/Juniper/ACX7332.yaml +++ b/device-types/Juniper/ACX7332.yaml @@ -101,10 +101,8 @@ interfaces: type: 25gbase-x-sfp28 module-bays: - name: PSM 0 - maximum_draw: 2200 position: '0' - name: PSM 1 - maximum_draw: 2200 position: '1' - name: LC 1 position: '1' diff --git a/device-types/Minisforum/Minisforum-MS-01.yml b/device-types/Minisforum/Minisforum-MS-01.yml index 6e08d9db..683f95f6 100644 --- a/device-types/Minisforum/Minisforum-MS-01.yml +++ b/device-types/Minisforum/Minisforum-MS-01.yml @@ -26,4 +26,4 @@ module-bays: power-ports: - name: External Power Supply type: dc-terminal - maximum-draw: 180 + maximum_draw: 180 diff --git a/device-types/Moxa/EDS-P510.yaml b/device-types/Moxa/EDS-P510.yaml index b51d854e..4d3d25fb 100644 --- a/device-types/Moxa/EDS-P510.yaml +++ b/device-types/Moxa/EDS-P510.yaml @@ -41,19 +41,19 @@ interfaces: type: 100base-tx - name: G1-sfp type: 1000base-x-sfp - comment: combo port with G1-rj45 + description: combo port with G1-rj45 - name: G1-rj45 type: 1000base-t - comment: combo port with G1-sfp + description: combo port with G1-sfp - name: G2-sfp type: 1000base-x-sfp - comment: combo port with G2-rj45 + description: combo port with G2-rj45 - name: G2-rj45 type: 1000base-t - comment: combo port with G2-sfp + description: combo port with G2-sfp - name: G3-sfp type: 1000base-x-sfp - comment: combo port with G3-rj45 + description: combo port with G3-rj45 - name: G3-rj45 type: 1000base-t - comment: combo port with G3-sfp + description: combo port with G3-sfp diff --git a/device-types/Nozomi Networks/nsg-m-1000.yaml b/device-types/Nozomi Networks/nsg-m-1000.yaml index 5b289d2f..f0cd8d8d 100644 --- a/device-types/Nozomi Networks/nsg-m-1000.yaml +++ b/device-types/Nozomi Networks/nsg-m-1000.yaml @@ -18,40 +18,40 @@ power-ports: interfaces: - name: GbE-1 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-2 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-3 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-4 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-5 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-6 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-7 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-8 type: 1000base-t - comments: communication port + description: communication port - name: SFP-1 type: 1000base-x-sfp - comments: monitoring port + description: monitoring port - name: SFP-2 type: 1000base-x-sfp - comments: monitoring port + description: monitoring port - name: SFP-3 type: 1000base-x-sfp - comments: monitoring port + description: monitoring port - name: SFP-4 type: 1000base-x-sfp - comments: monitoring/communication port + description: monitoring/communication port - name: iLO type: 1000base-t mgmt_only: true diff --git a/device-types/Nozomi Networks/nsg-m-750.yaml b/device-types/Nozomi Networks/nsg-m-750.yaml index f1a9e56c..23e4c5ff 100644 --- a/device-types/Nozomi Networks/nsg-m-750.yaml +++ b/device-types/Nozomi Networks/nsg-m-750.yaml @@ -18,40 +18,40 @@ power-ports: interfaces: - name: GbE-1 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-2 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-3 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-4 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-5 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-6 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-7 type: 1000base-t - comments: monitoring port + description: monitoring port - name: GbE-8 type: 1000base-t - comments: communication port + description: communication port - name: SFP-1 type: 1000base-x-sfp - comments: monitoring port + description: monitoring port - name: SFP-2 type: 1000base-x-sfp - comments: monitoring port + description: monitoring port - name: SFP-3 type: 1000base-x-sfp - comments: monitoring port + description: monitoring port - name: SFP-4 type: 1000base-x-sfp - comments: monitoring/communication port + description: monitoring/communication port - name: iLO type: 1000base-t mgmt_only: true diff --git a/device-types/Sangoma/PBXact-2001.yaml b/device-types/Sangoma/PBXact-2001.yaml index 0d9d1b9a..8271f17c 100644 --- a/device-types/Sangoma/PBXact-2001.yaml +++ b/device-types/Sangoma/PBXact-2001.yaml @@ -12,10 +12,8 @@ console-ports: module-bays: - name: PSU1 position: PSU1 - type: iec-60320-c14 - name: PSU2 position: PSU2 - type: iec-60320-c14 interfaces: - name: eth0 type: 1000base-t diff --git a/device-types/Schneider Electric/SpaceLogic-AS-P-NL.yaml b/device-types/Schneider Electric/SpaceLogic-AS-P-NL.yaml index e702afb4..0a9488e6 100644 --- a/device-types/Schneider Electric/SpaceLogic-AS-P-NL.yaml +++ b/device-types/Schneider Electric/SpaceLogic-AS-P-NL.yaml @@ -31,4 +31,4 @@ power-ports: - name: power label: Power type: other - maximum-draw: 10 + maximum_draw: 10 diff --git a/device-types/Schweitzer Engineering Laboratories/SEL-587-Current-Differential-Relay.yaml b/device-types/Schweitzer Engineering Laboratories/SEL-587-Current-Differential-Relay.yaml index cdce7351..1af602e7 100644 --- a/device-types/Schweitzer Engineering Laboratories/SEL-587-Current-Differential-Relay.yaml +++ b/device-types/Schweitzer Engineering Laboratories/SEL-587-Current-Differential-Relay.yaml @@ -19,4 +19,3 @@ console-server-ports: - name: Port F label: Modbus RTU-Slave, ASCII terminals, HMI, SCADA, or DCS systems type: de-9 - speed: 38400 diff --git a/device-types/Server Technology/C2WG24SN-4PJN5D.yaml b/device-types/Server Technology/C2WG24SN-4PJN5D.yaml index d8cb972a..2a0941a2 100644 --- a/device-types/Server Technology/C2WG24SN-4PJN5D.yaml +++ b/device-types/Server Technology/C2WG24SN-4PJN5D.yaml @@ -21,7 +21,6 @@ console-server-ports: - name: link label: LINK type: rj-12 - poe: true power-ports: - name: Power Port 1 type: iec-60309-3p-n-e-6h diff --git a/device-types/Server Technology/C2WG24SN-YCLN5D6.yaml b/device-types/Server Technology/C2WG24SN-YCLN5D6.yaml index cbd95529..5dfe6bdc 100644 --- a/device-types/Server Technology/C2WG24SN-YCLN5D6.yaml +++ b/device-types/Server Technology/C2WG24SN-YCLN5D6.yaml @@ -21,7 +21,6 @@ console-server-ports: - name: link label: LINK type: rj-12 - poe: true power-ports: - name: Power Port 1 type: nema-l21-30p diff --git a/device-types/Server Technology/C2XG24SN-4PJN5D.yaml b/device-types/Server Technology/C2XG24SN-4PJN5D.yaml index 27d9c7e2..6f3f7f8e 100644 --- a/device-types/Server Technology/C2XG24SN-4PJN5D.yaml +++ b/device-types/Server Technology/C2XG24SN-4PJN5D.yaml @@ -11,7 +11,6 @@ console-ports: - name: link label: LINK type: rj-12 - poe: true - name: th1 label: T/H1 type: rj-11 diff --git a/device-types/Server Technology/C2XG24SN-YCLN5D6.yaml b/device-types/Server Technology/C2XG24SN-YCLN5D6.yaml index e319d36d..4bd9a636 100644 --- a/device-types/Server Technology/C2XG24SN-YCLN5D6.yaml +++ b/device-types/Server Technology/C2XG24SN-YCLN5D6.yaml @@ -11,7 +11,6 @@ console-ports: - name: link label: LINK type: rj-12 - poe: true - name: th1 label: T/H1 type: rj-11 diff --git a/device-types/Server Technology/PRO3X-C3WG36RL-DQJE2NT2.yaml b/device-types/Server Technology/PRO3X-C3WG36RL-DQJE2NT2.yaml index 965428d8..a52a19bc 100644 --- a/device-types/Server Technology/PRO3X-C3WG36RL-DQJE2NT2.yaml +++ b/device-types/Server Technology/PRO3X-C3WG36RL-DQJE2NT2.yaml @@ -11,11 +11,9 @@ console-ports: - name: console/modem label: SER type: rj-45 - poe: false - name: usb-a label: USB-A type: usb-a - poe: false console-server-ports: - name: aux label: AUX diff --git a/device-types/Supermicro/AS-2124BT-HNTR.yaml b/device-types/Supermicro/AS-2124BT-HNTR.yaml index b37d8955..d6fd88e6 100644 --- a/device-types/Supermicro/AS-2124BT-HNTR.yaml +++ b/device-types/Supermicro/AS-2124BT-HNTR.yaml @@ -13,10 +13,8 @@ weight_unit: kg module-bays: - name: PSU0 position: PSU 0 - maximum_draw: 2200 - name: PSU1 position: PSU 1 - maximum_draw: 2200 device-bays: - name: Node 1 label: Compute Node 1 diff --git a/device-types/Supermicro/AS-2124BT-HTR.yml b/device-types/Supermicro/AS-2124BT-HTR.yml index 3a513801..c1138e8a 100644 --- a/device-types/Supermicro/AS-2124BT-HTR.yml +++ b/device-types/Supermicro/AS-2124BT-HTR.yml @@ -15,10 +15,8 @@ rear_image: true module-bays: - name: PSU0 position: PSU 0 - maximum_draw: 2200 - name: PSU1 position: PSU 1 - maximum_draw: 2200 device-bays: - name: Node 1 label: Compute Node 1 diff --git a/device-types/Supermicro/AS-3015MR-H8TNR.yaml b/device-types/Supermicro/AS-3015MR-H8TNR.yaml index 39c41784..32e26202 100644 --- a/device-types/Supermicro/AS-3015MR-H8TNR.yaml +++ b/device-types/Supermicro/AS-3015MR-H8TNR.yaml @@ -22,10 +22,8 @@ interfaces: module-bays: - name: PSU0 position: PSU 0 - maximum_draw: 2200 - name: PSU1 position: PSU 1 - maximum_draw: 2200 device-bays: - name: Node 1 label: Compute Node 1 diff --git a/device-types/Supermicro/SSG-6029P-E1CR12T.yml b/device-types/Supermicro/SSG-6029P-E1CR12T.yml index c6cc0a2d..d13aef24 100644 --- a/device-types/Supermicro/SSG-6029P-E1CR12T.yml +++ b/device-types/Supermicro/SSG-6029P-E1CR12T.yml @@ -31,7 +31,7 @@ module-bays: position: PCIe-6 - name: PCIe-7 LP x8 position: PCIe-7 - comment: M-Key M.2 + description: M-Key M.2 interfaces: - name: Eth-1 type: 10gbase-t diff --git a/device-types/Supermicro/SSG-640P-E1CR24H.yml b/device-types/Supermicro/SSG-640P-E1CR24H.yml index 2ead7f1a..b306727f 100644 --- a/device-types/Supermicro/SSG-640P-E1CR24H.yml +++ b/device-types/Supermicro/SSG-640P-E1CR24H.yml @@ -31,7 +31,7 @@ module-bays: position: PCIe-4 - name: PCIe-5 NVME position: NVME - comment: M-Key M.2 + description: M-Key M.2 interfaces: - name: Eth-1 type: 10gbase-t diff --git a/device-types/Supermicro/SYS-5019P-MTR.yaml b/device-types/Supermicro/SYS-5019P-MTR.yaml index dc7cbe3c..a1ad19ce 100644 --- a/device-types/Supermicro/SYS-5019P-MTR.yaml +++ b/device-types/Supermicro/SYS-5019P-MTR.yaml @@ -28,10 +28,8 @@ interfaces: module-bays: - name: PSU0 position: PSU 0 - maximum_draw: 400 - name: PSU1 position: PSU 1 - maximum_draw: 400 - name: PCI-E 1 position: '1' description: PCI-E 3.0 x16 slot diff --git a/device-types/Supermicro/SYS-530MT-H8TNR.yaml b/device-types/Supermicro/SYS-530MT-H8TNR.yaml index d2f06645..753aa82b 100644 --- a/device-types/Supermicro/SYS-530MT-H8TNR.yaml +++ b/device-types/Supermicro/SYS-530MT-H8TNR.yaml @@ -26,26 +26,18 @@ module-bays: position: PSU2 device-bays: - name: Node 1 - position: Node1 label: Compute Node 1 - name: Node 2 - position: Node2 label: Compute Node 2 - name: Node 3 - position: Node3 label: Compute Node 3 - name: Node 4 - position: Node4 label: Compute Node 4 - name: Node 5 - position: Node5 label: Compute Node 5 - name: Node 6 - position: Node6 label: Compute Node 6 - name: Node 7 - position: Node7 label: Compute Node 7 - name: Node 8 - position: Node8 label: Compute Node 8 diff --git a/device-types/Supermicro/SYS-6028TR-HTR.yaml b/device-types/Supermicro/SYS-6028TR-HTR.yaml index e015299f..0b764b3e 100644 --- a/device-types/Supermicro/SYS-6028TR-HTR.yaml +++ b/device-types/Supermicro/SYS-6028TR-HTR.yaml @@ -13,10 +13,8 @@ weight_unit: kg module-bays: - name: PSU0 position: PSU 0 - maximum_draw: 2200 - name: PSU1 position: PSU 1 - maximum_draw: 2200 device-bays: - name: Node 1 label: Compute Node 1 diff --git a/device-types/Supermicro/SuperChassis-826-BE1C4.yaml b/device-types/Supermicro/SuperChassis-826-BE1C4.yaml index 4ad498d9..c1331bcd 100644 --- a/device-types/Supermicro/SuperChassis-826-BE1C4.yaml +++ b/device-types/Supermicro/SuperChassis-826-BE1C4.yaml @@ -13,10 +13,8 @@ weight_unit: kg module-bays: - name: PSU0 position: PSU 0 - maximum_draw: 1000 - name: PSU1 position: PSU 1 - maximum_draw: 1000 device-bays: - name: System Board label: System Board diff --git a/device-types/Synology/RS2416RP+.yaml b/device-types/Synology/RS2416RP+.yaml index 2dfe0e33..5fffcad3 100644 --- a/device-types/Synology/RS2416RP+.yaml +++ b/device-types/Synology/RS2416RP+.yaml @@ -14,7 +14,6 @@ comments: '[Synology RS2416RP+ Data Sheet](https://global.synologydownload.com/d console-ports: - name: Console type: de-9 - mgmt_only: true interfaces: - name: LAN 1 type: 1000base-t diff --git a/device-types/Synology/RS2418+.yaml b/device-types/Synology/RS2418+.yaml index affb6c67..cb68808a 100644 --- a/device-types/Synology/RS2418+.yaml +++ b/device-types/Synology/RS2418+.yaml @@ -11,7 +11,6 @@ airflow: front-to-rear console-ports: - name: Console type: de-9 - mgmt_only: true power-ports: - name: PSU 1 type: iec-60320-c14 diff --git a/device-types/Synology/RS2418RP+.yaml b/device-types/Synology/RS2418RP+.yaml index 230e31d6..a9680b03 100644 --- a/device-types/Synology/RS2418RP+.yaml +++ b/device-types/Synology/RS2418RP+.yaml @@ -11,7 +11,6 @@ airflow: front-to-rear console-ports: - name: Console type: de-9 - mgmt_only: true power-ports: - name: PSU 1 type: iec-60320-c14 diff --git a/device-types/Synology/RS3614xs+.yaml b/device-types/Synology/RS3614xs+.yaml index 0f5f4b80..0b70b424 100644 --- a/device-types/Synology/RS3614xs+.yaml +++ b/device-types/Synology/RS3614xs+.yaml @@ -34,4 +34,3 @@ interfaces: console-ports: - name: Console type: de-9 - mgmt_only: true diff --git a/device-types/Synology/RS3617RPxs.yaml b/device-types/Synology/RS3617RPxs.yaml index 207c721e..cba15fe4 100644 --- a/device-types/Synology/RS3617RPxs.yaml +++ b/device-types/Synology/RS3617RPxs.yaml @@ -22,4 +22,3 @@ interfaces: console-ports: - name: Console type: de-9 - mgmt_only: true diff --git a/device-types/Synology/RS3621xs+.yaml b/device-types/Synology/RS3621xs+.yaml index ab9d0a85..9c399570 100644 --- a/device-types/Synology/RS3621xs+.yaml +++ b/device-types/Synology/RS3621xs+.yaml @@ -42,4 +42,3 @@ interfaces: console-ports: - name: Console type: de-9 - mgmt_only: true diff --git a/device-types/Synology/RS815+.yaml b/device-types/Synology/RS815+.yaml index 782801f2..291866e8 100644 --- a/device-types/Synology/RS815+.yaml +++ b/device-types/Synology/RS815+.yaml @@ -23,4 +23,3 @@ interfaces: console-ports: - name: Console type: de-9 - mgmt_only: true diff --git a/device-types/Synology/RS820+.yaml b/device-types/Synology/RS820+.yaml index 6a0a47b8..488e912f 100644 --- a/device-types/Synology/RS820+.yaml +++ b/device-types/Synology/RS820+.yaml @@ -21,4 +21,3 @@ interfaces: console-ports: - name: Console type: de-9 - mgmt_only: true diff --git a/device-types/Teltonika/RUT955.yaml b/device-types/Teltonika/RUT955.yaml index 0e3b7f32..87caf65c 100644 --- a/device-types/Teltonika/RUT955.yaml +++ b/device-types/Teltonika/RUT955.yaml @@ -17,10 +17,10 @@ console-ports: type: usb-a - name: Sensor_1 type: other - comments: RS485/Modbus connector Full Duplex and Half Duplex + description: RS485/Modbus connector Full Duplex and Half Duplex - name: Sensor_2 type: de-9 - comments: RS232/Modbus connector Full Duplex and Half Duplex + description: RS232/Modbus connector Full Duplex and Half Duplex interfaces: - name: lan1 type: 100base-tx @@ -38,7 +38,7 @@ interfaces: poe_type: passive-24v-2pair - name: gnss_0 type: other - comments: GPS, GLONASS, BeiDou, Galileo and QZSS + description: GPS, GLONASS, BeiDou, Galileo and QZSS - name: Wifi_2.4 type: ieee802.11ac - name: Wifi_5 diff --git a/device-types/Teltonika/RUTX09.yaml b/device-types/Teltonika/RUTX09.yaml index 3ebd913f..20430cd4 100644 --- a/device-types/Teltonika/RUTX09.yaml +++ b/device-types/Teltonika/RUTX09.yaml @@ -32,4 +32,4 @@ interfaces: poe_type: passive-24v-2pair - name: gnss_0 type: other - comments: GPS, GLONASS, BeiDou, Galileo and QZSS + description: GPS, GLONASS, BeiDou, Galileo and QZSS diff --git a/device-types/Ubiquiti/ECS-Aggregation.yaml b/device-types/Ubiquiti/ECS-Aggregation.yaml index f8399d90..8373545b 100644 --- a/device-types/Ubiquiti/ECS-Aggregation.yaml +++ b/device-types/Ubiquiti/ECS-Aggregation.yaml @@ -132,7 +132,5 @@ interfaces: module-bays: - name: PSU 1 position: left - installed_module: ubiquiti-uacc-psu-12v-550w - name: PSU 2 position: right - installed_module: ubiquiti-uacc-psu-12v-550w diff --git a/device-types/Ubiquiti/EFG.yaml b/device-types/Ubiquiti/EFG.yaml index 1fcca466..18e599fa 100644 --- a/device-types/Ubiquiti/EFG.yaml +++ b/device-types/Ubiquiti/EFG.yaml @@ -41,7 +41,5 @@ interfaces: module-bays: - name: PSU 1 position: left - installed_module: ubiquiti-uacc-psu-12v-150w - name: PSU 2 position: right - installed_module: ubiquiti-uacc-psu-12v-150w diff --git a/device-types/Ubiquiti/ER-8-XG.yaml b/device-types/Ubiquiti/ER-8-XG.yaml index d1e5e0f6..9db88843 100644 --- a/device-types/Ubiquiti/ER-8-XG.yaml +++ b/device-types/Ubiquiti/ER-8-XG.yaml @@ -12,10 +12,8 @@ comments: '[EdgeRouter Infinity](https://dl.ubnt.com/datasheets/edgemax/EdgeRout module-bays: - name: PSU 1 position: '1' - maximum_draw: 40 - name: PSU 2 position: '2' - maximum_draw: 40 interfaces: - name: eth0 type: 1000base-t diff --git a/device-types/Ubiquiti/INS-3AF-O-G.yaml b/device-types/Ubiquiti/INS-3AF-O-G.yaml index 34489c0a..ddb40956 100644 --- a/device-types/Ubiquiti/INS-3AF-O-G.yaml +++ b/device-types/Ubiquiti/INS-3AF-O-G.yaml @@ -17,4 +17,4 @@ rear-ports: type: 8p8c positions: 1 label: PoE IN - poe: true + _is_power_source: true diff --git a/device-types/Ubiquiti/Surge-Protector.yaml b/device-types/Ubiquiti/Surge-Protector.yaml index 7e2d422b..f5356ea2 100644 --- a/device-types/Ubiquiti/Surge-Protector.yaml +++ b/device-types/Ubiquiti/Surge-Protector.yaml @@ -5,6 +5,7 @@ slug: ubiquiti-surge-protector part_number: ETH-SP-G2 u_height: 0 is_full_depth: false +is_powered: false comments: '[Ethernet Surge Protector](https://www.ui.com/accessories/ethernet-surge-protector/)' front-ports: - name: '1' @@ -15,4 +16,3 @@ rear-ports: - name: '1' type: 8p8c positions: 1 - poe: true diff --git a/device-types/Ubiquiti/UACC-AI-Port-RM.yaml b/device-types/Ubiquiti/UACC-AI-Port-RM.yaml index 59a7eb11..37d731d9 100644 --- a/device-types/Ubiquiti/UACC-AI-Port-RM.yaml +++ b/device-types/Ubiquiti/UACC-AI-Port-RM.yaml @@ -13,27 +13,21 @@ weight_unit: g device-bays: - name: '1' label: AI Port Slot 1 - position: '1' description: Slot for UP-AI-Port module - name: '2' label: AI Port Slot 2 - position: '2' description: Slot for UP-AI-Port module - name: '3' label: AI Port Slot 3 - position: '3' description: Slot for UP-AI-Port module - name: '4' label: AI Port Slot 4 - position: '4' description: Slot for UP-AI-Port module - name: '5' label: AI Port Slot 5 - position: '5' description: Slot for UP-AI-Port module - name: '6' label: AI Port Slot 6 - position: '6' description: Slot for UP-AI-Port module front_image: true rear_image: true diff --git a/device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml b/device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml index 918bb8c8..35243ffe 100644 --- a/device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml +++ b/device-types/Ubiquiti/USW-Pro-Max-16-PoE.yaml @@ -82,4 +82,4 @@ interfaces: power-ports: - name: Input type: nema-5-15p - maxium_draw: 210 + maximum_draw: 210 diff --git a/device-types/Uptime Industries/Bladerunner-1.0-20-blade.yaml b/device-types/Uptime Industries/Bladerunner-1.0-20-blade.yaml index f7f74d7d..98de29e0 100644 --- a/device-types/Uptime Industries/Bladerunner-1.0-20-blade.yaml +++ b/device-types/Uptime Industries/Bladerunner-1.0-20-blade.yaml @@ -19,42 +19,22 @@ is_powered: false # Can fit 20 Compute Blades device-bays: - name: '1' - position: '1' - name: '2' - position: '2' - name: '3' - position: '3' - name: '4' - position: '4' - name: '5' - position: '5' - name: '6' - position: '6' - name: '7' - position: '7' - name: '8' - position: '8' - name: '9' - position: '9' - name: '10' - position: '10' - name: '11' - position: '11' - name: '12' - position: '12' - name: '13' - position: '13' - name: '14' - position: '14' - name: '15' - position: '15' - name: '16' - position: '16' - name: '17' - position: '17' - name: '18' - position: '18' - name: '19' - position: '19' - name: '20' - position: '20' diff --git a/device-types/Vertiv/MPUIQ-VMCHS.yaml b/device-types/Vertiv/MPUIQ-VMCHS.yaml index 62ec50fd..42b30769 100644 --- a/device-types/Vertiv/MPUIQ-VMCHS.yaml +++ b/device-types/Vertiv/MPUIQ-VMCHS.yaml @@ -10,7 +10,7 @@ comments: MPU IQ Serial Adapter console-ports: - name: KVM type: rj-45 - poe: true + _is_power_source: true console-server-ports: - name: usb0 type: usb-a diff --git a/module-types/Ciena/waveserver-5-control-processor.yaml b/module-types/Ciena/waveserver-5-control-processor.yaml index 8f85f480..cc6f0a75 100644 --- a/module-types/Ciena/waveserver-5-control-processor.yaml +++ b/module-types/Ciena/waveserver-5-control-processor.yaml @@ -5,10 +5,8 @@ part_number: 186-3010-900 console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-c - mgmt_only: true interfaces: - name: DCN-1 type: 1000base-t diff --git a/module-types/Ciena/waveserver-ai-access-panel.yaml b/module-types/Ciena/waveserver-ai-access-panel.yaml index b2e9c7c6..ebbb6dd1 100644 --- a/module-types/Ciena/waveserver-ai-access-panel.yaml +++ b/module-types/Ciena/waveserver-ai-access-panel.yaml @@ -5,10 +5,8 @@ part_number: 186-1031-900 console-ports: - name: CONSOLE type: rj-45 - mgmt_only: true - name: USB type: usb-c - mgmt_only: true interfaces: - name: ILAN-1 type: 1000base-t diff --git a/module-types/Cisco/A9K-RSP440-LT.yaml b/module-types/Cisco/A9K-RSP440-LT.yaml index 0e4996e9..d4b6388f 100644 --- a/module-types/Cisco/A9K-RSP440-LT.yaml +++ b/module-types/Cisco/A9K-RSP440-LT.yaml @@ -7,26 +7,24 @@ interfaces: - name: MgmtEth0/RSP{module}/CPU0/0 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Interface + description: Out-of-Band Management Interface - name: MgmtEth0/RSP{module}/CPU0/1 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Interface + description: Out-of-Band Management Interface - name: External USB2 class-A port type: other mgmt_only: true - name: SFP+_00_10GE type: 10gbase-x-sfpp - comments: Virtualization Cluster Port + description: Virtualization Cluster Port mgmt_only: true - name: SFP+_01_10GE type: 10gbase-x-sfpp mgmt_only: true - comments: Virtualization Cluster Port + description: Virtualization Cluster Port console-ports: - name: Console type: rj-45 - mgmt_only: true - name: Auxiliary type: rj-45 - mgmt_only: true diff --git a/module-types/Cisco/A9K-RSP440-SE.yaml b/module-types/Cisco/A9K-RSP440-SE.yaml index 0754f437..f313d96e 100644 --- a/module-types/Cisco/A9K-RSP440-SE.yaml +++ b/module-types/Cisco/A9K-RSP440-SE.yaml @@ -7,26 +7,24 @@ interfaces: - name: MgmtEth0/RSP{module}/CPU0/0 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Interface + description: Out-of-Band Management Interface - name: MgmtEth0/RSP{module}/CPU0/1 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Interface + description: Out-of-Band Management Interface - name: RSP{module}/External USB2 class-A port type: other mgmt_only: true - name: RSP{module}/SFP+_00_10GE type: 10gbase-x-sfpp - comments: Virtualization Cluster Port + description: Virtualization Cluster Port mgmt_only: true - name: RSP{module}/SFP+_01_10GE type: 10gbase-x-sfpp mgmt_only: true - comments: Virtualization Cluster Port + description: Virtualization Cluster Port console-ports: - name: con0/RSP{module}/CPU0 type: rj-45 - mgmt_only: true - name: aux0/RSP{module}/CPU0 type: rj-45 - mgmt_only: true diff --git a/module-types/Cisco/A9K-RSP440-TR.yaml b/module-types/Cisco/A9K-RSP440-TR.yaml index c7fc430f..4f403874 100644 --- a/module-types/Cisco/A9K-RSP440-TR.yaml +++ b/module-types/Cisco/A9K-RSP440-TR.yaml @@ -8,26 +8,24 @@ interfaces: - name: MgmtEth0/RSP{module}/CPU0/0 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Interface + description: Out-of-Band Management Interface - name: MgmtEth0/RSP{module}/CPU0/1 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Interface + description: Out-of-Band Management Interface - name: External USB2 class-A port{module} type: other mgmt_only: true - name: SFP+_00_10GE{module} type: 10gbase-x-sfpp - comments: Virtualization Cluster Port + description: Virtualization Cluster Port mgmt_only: true - name: SFP+_01_10GE{module} type: 10gbase-x-sfpp mgmt_only: true - comments: Virtualization Cluster Port + description: Virtualization Cluster Port console-ports: - name: console{module} type: rj-45 - mgmt_only: true - name: Auxiliary{module} type: rj-45 - mgmt_only: true diff --git a/module-types/Cisco/A9K-RSP880-TR.yaml b/module-types/Cisco/A9K-RSP880-TR.yaml index b4a7fe1f..cc790d42 100644 --- a/module-types/Cisco/A9K-RSP880-TR.yaml +++ b/module-types/Cisco/A9K-RSP880-TR.yaml @@ -7,19 +7,17 @@ description: ASR9K Route Switch Processor with 880G/slot Fabric and 16GB console-ports: - name: console{module} type: rj-45 - mgmt_only: true - name: Auxiliary{module} type: rj-45 - mgmt_only: true interfaces: - name: MgmtEth0/RSP{module}/CPU0/0 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Port + description: Out-of-Band Management Port - name: MgmtEth0/RSP{module}/CPU0/1 type: 1000base-t mgmt_only: true - comments: Out-of-Band Management Port + description: Out-of-Band Management Port - name: External USB2 class-A port{module} type: other mgmt_only: true diff --git a/module-types/Corning/ECM-UM-12-04-89G.yaml b/module-types/Corning/ECM-UM-12-04-89G.yaml index 2a0c775a..ab4dfeb1 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 - comments: Front Port 1 (Strands 1-2) + description: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - comments: Front Port 2 (Strands 3-4) + description: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - comments: Front Port 3 (Strands 5-6) + description: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - comments: Front Port 4 (Strands 7-8) + description: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - comments: Front Port 5 (Strands 9-10) + description: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - comments: Front Port 6 (Strands 11-12) + description: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - comments: Rear Port MPO connector ports 1-6 (strands 1-12) + description: 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 92445936..9aca8763 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 - comments: Front Port 1 (Strands 1-2) + description: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - comments: Front Port 2 (Strands 3-4) + description: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - comments: Front Port 3 (Strands 5-6) + description: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - comments: Front Port 4 (Strands 7-8) + description: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - comments: Front Port 5 (Strands 9-10) + description: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - comments: Front Port 6 (Strands 11-12) + description: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - comments: Rear Port MPO connector ports 1-6 (strands 1-12) + description: 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 7056be7b..394465bb 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 - comments: Front Port 1 (Strands 1-2) + description: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - comments: Front Port 2 (Strands 3-4) + description: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - comments: Front Port 3 (Strands 5-6) + description: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - comments: Front Port 4 (Strands 7-8) + description: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - comments: Front Port 5 (Strands 9-10) + description: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - comments: Front Port 6 (Strands 11-12) + description: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - comments: Rear Port MPO connector ports 1-6 (strands 1-12) + description: 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 6b97d022..3ac9dba1 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 - comments: Front Port 1 (Strands 1-2) + description: Front Port 1 (Strands 1-2) - name: '{module}2' type: lc rear_port: '{module}1-6' rear_port_position: 2 - comments: Front Port 2 (Strands 3-4) + description: Front Port 2 (Strands 3-4) - name: '{module}3' type: lc rear_port: '{module}1-6' rear_port_position: 3 - comments: Front Port 3 (Strands 5-6) + description: Front Port 3 (Strands 5-6) - name: '{module}4' type: lc rear_port: '{module}1-6' rear_port_position: 4 - comments: Front Port 4 (Strands 7-8) + description: Front Port 4 (Strands 7-8) - name: '{module}5' type: lc rear_port: '{module}1-6' rear_port_position: 5 - comments: Front Port 5 (Strands 9-10) + description: Front Port 5 (Strands 9-10) - name: '{module}6' type: lc rear_port: '{module}1-6' rear_port_position: 6 - comments: Front Port 6 (Strands 11-12) + description: Front Port 6 (Strands 11-12) rear-ports: - name: '{module}1-6' type: mpo positions: 6 - comments: Rear Port MPO connector ports 1-6 (strands 1-12) + description: Rear Port MPO connector ports 1-6 (strands 1-12) diff --git a/module-types/Corning/ECM-UM08-04-E8GF-ULL.yaml b/module-types/Corning/ECM-UM08-04-E8GF-ULL.yaml index a66ee1d0..0b1089be 100644 --- a/module-types/Corning/ECM-UM08-04-E8GF-ULL.yaml +++ b/module-types/Corning/ECM-UM08-04-E8GF-ULL.yaml @@ -9,24 +9,24 @@ front-ports: type: lc rear_port: '{module}1-4' rear_port_position: 1 - comments: Front Port 1 (Strands 1, 12) + description: Front Port 1 (Strands 1, 12) - name: '{module}2' type: lc rear_port: '{module}1-4' rear_port_position: 2 - comments: Front Port 2 (Strands 2, 11) + description: Front Port 2 (Strands 2, 11) - name: '{module}3' type: lc rear_port: '{module}1-4' rear_port_position: 3 - comments: Front Port 3 (Strands 3, 10) + description: Front Port 3 (Strands 3, 10) - name: '{module}4' type: lc rear_port: '{module}1-4' rear_port_position: 4 - comments: Front Port 4 (Strands 4, 9) + description: Front Port 4 (Strands 4, 9) rear-ports: - name: '{module}1-4' type: mpo positions: 4 - comments: Rear Port MPO connector ports 1-4 (strands 1-12) + description: Rear Port MPO connector ports 1-4 (strands 1-12) diff --git a/module-types/Corning/EDGE-CP48-90.yaml b/module-types/Corning/EDGE-CP48-90.yaml index 2b19a75b..ac10fb66 100644 --- a/module-types/Corning/EDGE-CP48-90.yaml +++ b/module-types/Corning/EDGE-CP48-90.yaml @@ -8,36 +8,36 @@ front-ports: type: mpo rear_port: '{module}1' rear_port_position: 1 - comments: Front Port MPO conector port 1 (Strands 1-12) + description: Front Port MPO conector port 1 (Strands 1-12) - name: '{module}2' type: mpo rear_port: '{module}2' rear_port_position: 1 - comments: Front Port MPO conector port 2 (Strands 13-24) + description: Front Port MPO conector port 2 (Strands 13-24) - name: '{module}3' type: mpo rear_port: '{module}3' rear_port_position: 1 - comments: Front Port MPO conector port 3 (Strands 25-36) + description: Front Port MPO conector port 3 (Strands 25-36) - name: '{module}4' type: mpo rear_port: '{module}4' rear_port_position: 1 - comments: Front Port MPO conector port 4 (Strands 37-48) + description: Front Port MPO conector port 4 (Strands 37-48) rear-ports: - name: '{module}1' type: mpo positions: 1 - comments: Rear Port MPO connector port 1 (Strands 1-12) + description: Rear Port MPO connector port 1 (Strands 1-12) - name: '{module}2' type: mpo positions: 1 - comments: Rear Port MPO connector port 2 (strands 13-24) + description: Rear Port MPO connector port 2 (strands 13-24) - name: '{module}3' type: mpo positions: 1 - comments: Rear Port MPO connector port 3 (strands 25-36) + description: Rear Port MPO connector port 3 (strands 25-36) - name: '{module}4' type: mpo positions: 1 - comments: Rear Port MPO connector port 4 (strands 37-48) + description: Rear Port MPO connector port 4 (strands 37-48) diff --git a/module-types/Dell/450-BCGR.yaml b/module-types/Dell/450-BCGR.yaml index bb391656..cbdb3493 100644 --- a/module-types/Dell/450-BCGR.yaml +++ b/module-types/Dell/450-BCGR.yaml @@ -2,10 +2,10 @@ manufacturer: Dell model: 450-BCGR part_number: 450-BCGR +weight: 450 +weight_unit: g comments: '[1400 Watt Redundant Power Supply](https://www.shopblt.com/item/dell-unstructured-storage-cto-450-bcgr-dual/dujr_450bcgr.html)' power-ports: - name: PSU{module} type: iec-60320-c14 maximum_draw: 1400 - weight: 450 - weight_unit: grams diff --git a/module-types/Eaton/EMPDT1H1C2.yaml b/module-types/Eaton/EMPDT1H1C2.yaml index de4c2371..e16c7e75 100644 --- a/module-types/Eaton/EMPDT1H1C2.yaml +++ b/module-types/Eaton/EMPDT1H1C2.yaml @@ -7,8 +7,8 @@ interfaces: - name: EMP{module}/Device type: other label: from device - comments: RJ45 connector for RS485/Modbus connection + description: RJ45 connector for RS485/Modbus connection - name: EMP{module}/Sensors type: other label: to sensors - comments: RJ45 connector for RS485/Modbus connection + description: RJ45 connector for RS485/Modbus connection diff --git a/module-types/Eaton/Network-M2.yaml b/module-types/Eaton/Network-M2.yaml index 2c68851b..932699e9 100644 --- a/module-types/Eaton/Network-M2.yaml +++ b/module-types/Eaton/Network-M2.yaml @@ -8,11 +8,11 @@ interfaces: type: other mgmt_only: true label: Settings - comments: RNDIS (Ethernet over USB) connection with USB Micro-B connector + description: RNDIS (Ethernet over USB) connection with USB Micro-B connector - name: Sensors type: other label: AUX - comments: USB-A connection for USB to RS485/Modbus connection to environmental sensors + description: 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/Eaton/TrippLite-SNMPWEBCARD.yaml b/module-types/Eaton/TrippLite-SNMPWEBCARD.yaml index d04e198b..b3dd4088 100644 --- a/module-types/Eaton/TrippLite-SNMPWEBCARD.yaml +++ b/module-types/Eaton/TrippLite-SNMPWEBCARD.yaml @@ -11,4 +11,4 @@ console-ports: - name: CONFIG type: other label: CONFIG - comments: Use this port to provide a direct terminal connection to a computer with a terminal emulation program. + description: Use this port to provide a direct terminal connection to a computer with a terminal emulation program. diff --git a/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml b/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml index f6bc8de9..59e6ba37 100644 --- a/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml +++ b/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml @@ -10,4 +10,4 @@ interfaces: power-ports: - name: dc power terminal type: dc-terminal - maxiumum draw: 75 W + maximum_draw: 75 diff --git a/module-types/ZTE/CICK.yaml b/module-types/ZTE/CICK.yaml index 1c4e9e83..7bb9275d 100644 --- a/module-types/ZTE/CICK.yaml +++ b/module-types/ZTE/CICK.yaml @@ -5,62 +5,47 @@ comments: The power card PRWG card uses-48 V DC power and provides power supply of two power supplies is equal, the two PRWG cards work in load-balance mode. console-ports: - name: CLKI1 {module} - comments: The first BITS clock input interface, 75ohm + description: The first BITS clock input interface, 75ohm type: rj-45 - mgmt_only: true - name: CLKI2 {module} - comments: The second BITS clock input interface, 75ohm + description: The second BITS clock input interface, 75ohm type: rj-45 - mgmt_only: true - name: CLKO/1PPSO {module} - comments: BITS/1PPS+TOD clock output interface, 75ohm + description: BITS/1PPS+TOD clock output interface, 75ohm type: rj-45 - mgmt_only: true - name: CLKI1/TIMI1 {module} - comments: The first BITS/1PPS+TOD clock input interface, 120ohm + description: The first BITS/1PPS+TOD clock input interface, 120ohm type: rj-45 - mgmt_only: true - name: CLKI2/TIMI2 {module} - comments: The second BITS/1PPS+TOD clock input interface, 120ohm + description: The second BITS/1PPS+TOD clock input interface, 120ohm type: rj-45 - mgmt_only: true - name: CLKO/TIMO {module} - comments: BITS/1PPS+TOD clock output interface, 120ohm + description: BITS/1PPS+TOD clock output interface, 120ohm type: rj-45 - mgmt_only: true - name: ETH {module} - comments: Out-of-band maintenance network interface + description: Out-of-band maintenance network interface type: rj-45 - mgmt_only: true - name: COM {module} - comments: Public serial port + description: Public serial port type: rj-45 - mgmt_only: true - name: TEM {module} - comments: Temperature sensor interface + description: Temperature sensor interface type: rj-45 - mgmt_only: true - name: HUM - comments: Humid sensor interface + description: Humid sensor interface type: rj-45 - mgmt_only: true - name: SMO {module} - comments: Smog sensor interface + description: Smog sensor interface type: rj-45 - mgmt_only: true - name: LIQ {module} - comments: Liquid sensor interface + description: Liquid sensor interface type: rj-45 - mgmt_only: true - name: DOR {module} - comments: Entrance control sensor interface + description: Entrance control sensor interface type: rj-45 - mgmt_only: true - name: DIN {module} - comments: Digit input interface, four channels + description: Digit input interface, four channels type: rj-45 - mgmt_only: true - name: DOT {module} - comments: Digit input interface, four channels + description: Digit input interface, four channels type: rj-45 - mgmt_only: true diff --git a/module-types/ZTE/PRWH.yaml b/module-types/ZTE/PRWH.yaml index ae9278bf..1b221b3d 100644 --- a/module-types/ZTE/PRWH.yaml +++ b/module-types/ZTE/PRWH.yaml @@ -6,10 +6,8 @@ comments: The power card PRWG card uses-48 V DC power and provides power supply console-ports: - name: TST1 {module} type: rj-45 - mgmt_only: true - name: TST2 {module} type: rj-45 - mgmt_only: true power-ports: - name: PSU {module} type: dc-terminal diff --git a/module-types/ZTE/SCTM.yaml b/module-types/ZTE/SCTM.yaml index ae003cc2..d865b31d 100644 --- a/module-types/ZTE/SCTM.yaml +++ b/module-types/ZTE/SCTM.yaml @@ -12,15 +12,14 @@ interfaces: - name: xgei_1/{module}/4 type: 10gbase-x-sfpp - name: gei_1/{module}/5 - comments: For out-of-band network management + description: For out-of-band network management type: 1000base-t mgmt_only: true - name: gei_1/{module}/6 - comments: For mirroring service traffic + description: For mirroring service traffic type: 1000base-t mgmt_only: true console-ports: - name: CLI {module} - comments: RS-232 port,for local debugging + description: RS-232 port,for local debugging type: rj-45 - mgmt_only: true diff --git a/schema/components.json b/schema/components.json index 90baf1dc..2327946f 100644 --- a/schema/components.json +++ b/schema/components.json @@ -2,7 +2,6 @@ "type": "object", "$id": "urn:devicetype-library:components", "$schema": "https://json-schema.org/draft/2020-12/schema", - "additionalProperties": false, "definitions": { "console-port": { "type": "object", @@ -18,14 +17,18 @@ "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/console-port/properties/type" }, - "poe": { - "type": "boolean" + "description": { + "type": "string" + }, + "_is_power_source": { + "$ref": "urn:devicetype-library:reusable#/definitions/_is_power_source" } }, "required": [ "name", "type" - ] + ], + "additionalProperties": false }, "console-server-port": { "type": "object", @@ -40,12 +43,16 @@ }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/console-server-port/properties/type" + }, + "description": { + "type": "string" } }, "required": [ "name", "type" - ] + ], + "additionalProperties": false }, "power-port": { "type": "object", @@ -62,16 +69,22 @@ "$ref": "urn:devicetype-library:generated-schema#/definitions/power-port/properties/type" }, "maximum_draw": { - "type": "integer" + "type": "integer", + "minimum": 1 }, "allocated_draw": { - "type": "integer" + "type": "integer", + "minimum": 1 + }, + "description": { + "type": "string" } }, "required": [ "name", "type" - ] + ], + "additionalProperties": false }, "power-outlet": { "type": "object", @@ -93,12 +106,16 @@ }, "feed_leg": { "$ref": "urn:devicetype-library:generated-schema#/definitions/power-outlet/properties/feed-leg" + }, + "description": { + "type": "string" } }, "required": [ "name", "type" - ] + ], + "additionalProperties": false }, "interface": { "type": "object", @@ -114,20 +131,34 @@ "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/interface/properties/type" }, + "enabled": { + "type": "boolean" + }, + "mgmt_only": { + "type": "boolean" + }, + "description": { + "type": "string" + }, + "bridge": { + "type": "string", + "maxLength": 64 + }, "poe_mode": { "$ref": "urn:devicetype-library:generated-schema#/definitions/interface/properties/poe_mode" }, "poe_type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/interface/properties/poe_type" }, - "mgmt_only": { - "type": "boolean" + "rf_role": { + "$ref": "urn:devicetype-library:generated-schema#/definitions/interface/properties/rf_role" } }, "required": [ "name", "type" - ] + ], + "additionalProperties": false }, "front-port": { "type": "object", @@ -148,17 +179,23 @@ "pattern": "^[a-f0-9]{6}$" }, "rear_port": { - "type": "string" + "type": "string", + "maxLength": 64 }, "rear_port_position": { - "type": "integer" + "type": "integer", + "minimum": 1 + }, + "description": { + "type": "string" } }, "required": [ "name", "type", "rear_port" - ] + ], + "additionalProperties": false }, "rear-port": { "type": "object", @@ -179,16 +216,21 @@ "pattern": "^[a-f0-9]{6}$" }, "positions": { - "type": "integer" + "type": "integer", + "minimum": 1 }, - "poe": { - "type": "boolean" + "description": { + "type": "string" + }, + "_is_power_source": { + "$ref": "urn:devicetype-library:reusable#/definitions/_is_power_source" } }, "required": [ "name", "type" - ] + ], + "additionalProperties": false }, "module-bay": { "type": "object", @@ -202,13 +244,18 @@ "maxLength": 64 }, "position": { + "type": "string", + "maxLength": 30 + }, + "description": { "type": "string" } }, "required": [ "name", "position" - ] + ], + "additionalProperties": false }, "device-bay": { "type": "object", @@ -220,11 +267,15 @@ "label": { "type": "string", "maxLength": 64 + }, + "description": { + "type": "string" } }, "required": [ "name" - ] + ], + "additionalProperties": false }, "inventory-item": { "type": "object", @@ -238,15 +289,21 @@ "maxLength": 64 }, "manufacturer": { - "type": "string" + "type": "string", + "maxLength": 100 }, "part_id": { + "type": "string", + "maxLength": 50 + }, + "description": { "type": "string" } }, "required": [ "name" - ] + ], + "additionalProperties": false } } } diff --git a/schema/devicetype.json b/schema/devicetype.json index 39db03a7..ec292222 100644 --- a/schema/devicetype.json +++ b/schema/devicetype.json @@ -4,17 +4,21 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "properties": { "manufacturer": { - "type": "string" + "type": "string", + "maxLength": 100 }, "model": { - "type": "string" + "type": "string", + "maxLength": 100 }, "slug": { "type": "string", + "maxLength": 100, "pattern": "^[-a-z0-9_]+$" }, "part_number": { - "type": "string" + "type": "string", + "maxLength": 50 }, "u_height": { "type": "number", diff --git a/schema/generated_schema.json b/schema/generated_schema.json index baecb910..752ad98d 100644 --- a/schema/generated_schema.json +++ b/schema/generated_schema.json @@ -474,6 +474,13 @@ "passive-48v-2pair", "passive-48v-4pair" ] + }, + "rf_role": { + "type": "string", + "enum": [ + "ap", + "station" + ] } } }, diff --git a/schema/moduletype.json b/schema/moduletype.json index 7b033379..b89b8762 100644 --- a/schema/moduletype.json +++ b/schema/moduletype.json @@ -4,13 +4,16 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "properties": { "manufacturer": { - "type": "string" + "type": "string", + "maxLength": 100 }, "model": { - "type": "string" + "type": "string", + "maxLength": 100 }, "part_number": { - "type": "string" + "type": "string", + "maxLength": 50 }, "weight": { "$ref": "urn:devicetype-library:reusable#/definitions/weight" diff --git a/schema/reusable.json b/schema/reusable.json index d446a7b5..666a6097 100644 --- a/schema/reusable.json +++ b/schema/reusable.json @@ -4,6 +4,12 @@ "$schema": "https://json-schema.org/draft/2020-12/schema", "additionalProperties": false, "definitions": { + "_is_power_source": { + "title": "Port is a Power-Source for the Device", + "description": "Custom non-NetBox property used for power validation", + "type": "boolean", + "default": false + }, "weight": { "type": "number", "minimum": 0, diff --git a/tests/device_types.py b/tests/device_types.py index b5dc3c42..dee752eb 100644 --- a/tests/device_types.py +++ b/tests/device_types.py @@ -73,6 +73,8 @@ class DeviceType: return True def validate_power(self): + CUSTOM_POWER_SOURCE_PROPERTY = '_is_power_source' + # Check if power-ports exists if self.definition.get('power-ports', False): # Verify that is_powered is not set to False. If so, there should not be any power-ports defined @@ -92,15 +94,15 @@ class DeviceType: console_ports = self.definition.get('console-ports', False) if console_ports: for console_port in console_ports: - poe = console_port.get('poe', False) - if poe: + power_source = console_port.get(CUSTOM_POWER_SOURCE_PROPERTY, False) + if power_source: return True rear_ports = self.definition.get('rear-ports', False) if rear_ports: for rear_port in rear_ports: - poe = rear_port.get('poe', False) - if poe: + power_source = rear_port.get(CUSTOM_POWER_SOURCE_PROPERTY, False) + if power_source: return True # Check if the device is a child device, and if so, assume it has a valid power source from the parent