From 6827388f5db7f9202180757e3d365aa81eda92a5 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 12:44:44 -0400 Subject: [PATCH 01/11] added missing data to various APC models --- device-types/APC/AP8853.yaml | 4 +++- device-types/APC/AP8886.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-types/APC/AP8853.yaml b/device-types/APC/AP8853.yaml index 638bf1a12..4541621ea 100644 --- a/device-types/APC/AP8853.yaml +++ b/device-types/APC/AP8853.yaml @@ -1,8 +1,10 @@ manufacturer: APC model: AP8853 slug: ap8853 -# comments: APC Metered Rack PDU 2G, 32A, 230V, (36) C13 & (6) C19 +part_number: AP8853 u_height: 0 +is_full_depth: false +comments: Rack PDU 2G, Metered, ZeroU, 32A, 230V, (36) C13 & (6) C19 console-ports: - name: Serial type: rj-12 diff --git a/device-types/APC/AP8886.yaml b/device-types/APC/AP8886.yaml index 80568919d..c3a55ba65 100644 --- a/device-types/APC/AP8886.yaml +++ b/device-types/APC/AP8886.yaml @@ -2,9 +2,9 @@ manufacturer: APC model: AP8886 slug: ap8886 part_number: AP8886 +u_height: 0 is_full_depth: false comments: Rack PDU 2G, Metered, ZeroU, 22.0kW(32A) 17.3kW(24A), 230V, (30) C13 & (12) C19 -u_height: 0 console-ports: - name: Serial type: rj-12 From 4efad888b54eaeb4192e6d8a310767555c983c54 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 12:45:22 -0400 Subject: [PATCH 02/11] Arista corrections & updates --- device-types/Arista/DCS-7010T-48.yaml | 37 +++++++++++---------- device-types/Arista/DCS-7020SR-24C2.yaml | 31 +++++++++-------- device-types/Arista/DCS-7050CX3-32S.yaml | 30 +++++++++-------- device-types/Arista/DCS-7050QX-32S.yaml | 30 +++++++++-------- device-types/Arista/DCS-7050SX3-48YC12.yaml | 31 +++++++++-------- device-types/Arista/DCS-7050SX3-48YC8.yaml | 34 +++++++++++-------- device-types/Arista/DCS-7050TX3-48C8.yaml | 31 +++++++++-------- device-types/Arista/DCS-7124SX.yaml | 30 +++++++++-------- device-types/Arista/DCS-7150S-24.yaml | 30 +++++++++-------- device-types/Arista/DCS-7150S-52.yaml | 30 +++++++++-------- device-types/Arista/DCS-7150S-64.yaml | 31 +++++++++-------- device-types/Arista/DCS-7150SC-24.yaml | 30 +++++++++-------- device-types/Arista/DCS-7150SC-64.yaml | 31 +++++++++-------- device-types/Arista/DCS-7280SR2-48YC6.yaml | 32 ++++++++++-------- 14 files changed, 250 insertions(+), 188 deletions(-) diff --git a/device-types/Arista/DCS-7010T-48.yaml b/device-types/Arista/DCS-7010T-48.yaml index 2ec46b545..419cee2c0 100644 --- a/device-types/Arista/DCS-7010T-48.yaml +++ b/device-types/Arista/DCS-7010T-48.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7010T-48 slug: dcs-7010t-48 -is_full_depth: False +part_number: DCS-7010T-48 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 65 + allocated_draw: 52 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 65 + allocated_draw: 52 interfaces: - name: Ethernet1 type: 1000base-t @@ -100,25 +114,14 @@ interfaces: type: 1000base-t - name: Ethernet48 type: 1000base-t - - name: Ethernet49/1 + - name: Ethernet49 type: 10gbase-x-sfpp - - name: Ethernet50/1 + - name: Ethernet50 type: 10gbase-x-sfpp - - name: Ethernet51/1 + - name: Ethernet51 type: 10gbase-x-sfpp - - name: Ethernet52/1 + - name: Ethernet52 type: 10gbase-x-sfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 65 - allocated_draw: 52 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 65 - allocated_draw: 52 + mgmt_only: true diff --git a/device-types/Arista/DCS-7020SR-24C2.yaml b/device-types/Arista/DCS-7020SR-24C2.yaml index 24965e50d..be966d68e 100644 --- a/device-types/Arista/DCS-7020SR-24C2.yaml +++ b/device-types/Arista/DCS-7020SR-24C2.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7020SR-24C2 slug: dcs-7020sr-24c2 -is_full_depth: True +part_number: DCS-7020SR-24C2 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 105 + allocated_draw: 95 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 105 + allocated_draw: 95 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -50,21 +64,12 @@ interfaces: type: 10gbase-x-sfpp - name: Ethernet24 type: 10gbase-x-sfpp +# QSFP28(100G) ports can be broke into 4x25 with a model of [25-26]/[1-4] - name: Ethernet25/1 type: 100gbase-x-qsfp28 - name: Ethernet26/1 type: 100gbase-x-qsfp28 - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 105 - allocated_draw: 95 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 105 - allocated_draw: 95 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7050CX3-32S.yaml b/device-types/Arista/DCS-7050CX3-32S.yaml index a55e03af0..fe20c81bd 100644 --- a/device-types/Arista/DCS-7050CX3-32S.yaml +++ b/device-types/Arista/DCS-7050CX3-32S.yaml @@ -1,9 +1,24 @@ manufacturer: Arista model: DCS-7050CX3-32S slug: dcs-7050cx3-32s -is_full_depth: True +part_number: DCS-7050CX3-32S u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 362 + allocated_draw: 192 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 362 + allocated_draw: 192 interfaces: + # QSFP28(100G) ports can be broke into 4x25 with a model of [1-32]/[1-4] - name: Ethernet1/1 type: 100gbase-x-qsfp28 - name: Ethernet2/1 @@ -74,15 +89,4 @@ interfaces: type: 10gbase-x-sfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 362 - allocated_draw: 192 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 362 - allocated_draw: 192 + mgmt_only: true diff --git a/device-types/Arista/DCS-7050QX-32S.yaml b/device-types/Arista/DCS-7050QX-32S.yaml index 0ed7b1dfe..18713cdff 100644 --- a/device-types/Arista/DCS-7050QX-32S.yaml +++ b/device-types/Arista/DCS-7050QX-32S.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7050QX-32S slug: dcs-7050QX-32s -is_full_depth: False +part_number: DCS-7050QX-32S u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 500 + allocated_draw: 192 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 500 + allocated_draw: 192 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -78,15 +92,5 @@ interfaces: type: 40gbase-x-qsfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 500 - allocated_draw: 192 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 500 - allocated_draw: 192 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7050SX3-48YC12.yaml b/device-types/Arista/DCS-7050SX3-48YC12.yaml index 2899cc848..6fba8b583 100644 --- a/device-types/Arista/DCS-7050SX3-48YC12.yaml +++ b/device-types/Arista/DCS-7050SX3-48YC12.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7050SX3-48YC12 slug: dcs-7050sx3-48yc12 -is_full_depth: True +part_number: DCS-7050SX3-48YC12 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 325 + allocated_draw: 170 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 325 + allocated_draw: 170 interfaces: - name: Ethernet1 type: 25gbase-x-sfp28 @@ -100,6 +114,7 @@ interfaces: type: 25gbase-x-sfp28 - name: Ethernet48 type: 25gbase-x-sfp28 +# QSFP28(100G) ports can be broke into 4x25 with a model of [49-60]/[1-4] - name: Ethernet49/1 type: 100gbase-x-qsfp28 - name: Ethernet50/1 @@ -126,15 +141,5 @@ interfaces: type: 100gbase-x-qsfp28 - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 325 - allocated_draw: 170 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 325 - allocated_draw: 170 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7050SX3-48YC8.yaml b/device-types/Arista/DCS-7050SX3-48YC8.yaml index c5ad5c4e9..e9c0510ff 100644 --- a/device-types/Arista/DCS-7050SX3-48YC8.yaml +++ b/device-types/Arista/DCS-7050SX3-48YC8.yaml @@ -1,8 +1,23 @@ manufacturer: Arista model: DCS-7050SX3-48YC8 slug: dcs-7050sx3-48yc8 -is_full_depth: True +part_number: DCS-7050SX3-48YC8 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 + mgmt_only: true +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 301 + allocated_draw: 124 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 301 + allocated_draw: 124 interfaces: - name: Ethernet1 type: 25gbase-x-sfp28 @@ -88,7 +103,7 @@ interfaces: type: 25gbase-x-sfp28 - name: Ethernet42 type: 25gbase-x-sfp28 - - name: Ethernet33 + - name: Ethernet43 type: 25gbase-x-sfp28 - name: Ethernet44 type: 25gbase-x-sfp28 @@ -100,6 +115,7 @@ interfaces: type: 25gbase-x-sfp28 - name: Ethernet48 type: 25gbase-x-sfp28 +# QSFP28(100G) ports can be broke into 4x25 with a model of [49-56]/[1-4] - name: Ethernet49/1 type: 100gbase-x-qsfp28 - name: Ethernet50/1 @@ -118,15 +134,5 @@ interfaces: type: 100gbase-x-qsfp28 - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 301 - allocated_draw: 124 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 301 - allocated_draw: 124 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7050TX3-48C8.yaml b/device-types/Arista/DCS-7050TX3-48C8.yaml index e0d7b50ee..c20ff0b39 100644 --- a/device-types/Arista/DCS-7050TX3-48C8.yaml +++ b/device-types/Arista/DCS-7050TX3-48C8.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DDCS-7050TX3-48C8 slug: dcs-7050tx3-48c8 -is_full_depth: True +part_number: DDCS-7050TX3-48C8 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 346 + allocated_draw: 212 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 346 + allocated_draw: 212 interfaces: - name: Ethernet1 type: 10gbase-t @@ -100,6 +114,7 @@ interfaces: type: 10gbase-t - name: Ethernet48 type: 10gbase-t +# QSFP28(100G) ports can be broke into 4x25 with a model of [49-56]/[1-4] - name: Ethernet49/1 type: 100gbase-x-qsfp28 - name: Ethernet50/1 @@ -118,15 +133,5 @@ interfaces: type: 100gbase-x-qsfp28 - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 346 - allocated_draw: 212 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 346 - allocated_draw: 212 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7124SX.yaml b/device-types/Arista/DCS-7124SX.yaml index b58270ebb..da109acff 100644 --- a/device-types/Arista/DCS-7124SX.yaml +++ b/device-types/Arista/DCS-7124SX.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7124SX slug: dcs-7124sx -is_full_depth: True +part_number: DCS-7124SX u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 210 + allocated_draw: 120 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 210 + allocated_draw: 120 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -54,15 +68,5 @@ interfaces: type: 10gbase-x-sfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 210 - allocated_draw: 120 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 210 - allocated_draw: 120 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7150S-24.yaml b/device-types/Arista/DCS-7150S-24.yaml index a551b3191..9c932a4c1 100644 --- a/device-types/Arista/DCS-7150S-24.yaml +++ b/device-types/Arista/DCS-7150S-24.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7150S-24 slug: dcs-7150s-24 -is_full_depth: True +part_number: DCS-7150S-24 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 334 + allocated_draw: 191 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 334 + allocated_draw: 191 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -54,15 +68,5 @@ interfaces: type: 10gbase-x-sfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 334 - allocated_draw: 191 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 334 - allocated_draw: 191 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7150S-52.yaml b/device-types/Arista/DCS-7150S-52.yaml index adf705c37..4d1deb59e 100644 --- a/device-types/Arista/DCS-7150S-52.yaml +++ b/device-types/Arista/DCS-7150S-52.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7150S-52 slug: dcs-7150s-52 -is_full_depth: True +part_number: DCS-7150S-52 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 450 + allocated_draw: 191 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 450 + allocated_draw: 191 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -110,15 +124,5 @@ interfaces: type: 10gbase-x-sfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 450 - allocated_draw: 191 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 450 - allocated_draw: 191 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7150S-64.yaml b/device-types/Arista/DCS-7150S-64.yaml index ba4517824..8dcedb111 100644 --- a/device-types/Arista/DCS-7150S-64.yaml +++ b/device-types/Arista/DCS-7150S-64.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7150S-64 slug: dcs-7150s-64 -is_full_depth: True +part_number: DCS-7150S-64 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 455 + allocated_draw: 224 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 455 + allocated_draw: 224 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -100,6 +114,7 @@ interfaces: type: 10gbase-x-sfpp - name: Ethernet48 type: 10gbase-x-sfpp +# QSFP ports can be broke into 4x10 with a model of [49-54]/[1-4] - name: Ethernet49/1 type: 40gbase-x-qsfpp - name: Ethernet50/1 @@ -110,15 +125,5 @@ interfaces: type: 40gbase-x-qsfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 455 - allocated_draw: 224 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 455 - allocated_draw: 224 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7150SC-24.yaml b/device-types/Arista/DCS-7150SC-24.yaml index ffafa98bd..99ffbea55 100644 --- a/device-types/Arista/DCS-7150SC-24.yaml +++ b/device-types/Arista/DCS-7150SC-24.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7150SC-24 slug: dcs-7150sc-24 -is_full_depth: True +part_number: DCS-7150SC-24 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 334 + allocated_draw: 191 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 334 + allocated_draw: 191 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -54,15 +68,5 @@ interfaces: type: 10gbase-x-sfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 334 - allocated_draw: 191 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 334 - allocated_draw: 191 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7150SC-64.yaml b/device-types/Arista/DCS-7150SC-64.yaml index ba4517824..4b3fb97a0 100644 --- a/device-types/Arista/DCS-7150SC-64.yaml +++ b/device-types/Arista/DCS-7150SC-64.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7150S-64 slug: dcs-7150s-64 -is_full_depth: True +part_number: DCS-7150S-64 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 455 + allocated_draw: 224 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 455 + allocated_draw: 224 interfaces: - name: Ethernet1 type: 10gbase-x-sfpp @@ -100,6 +114,7 @@ interfaces: type: 10gbase-x-sfpp - name: Ethernet48 type: 10gbase-x-sfpp +# QSFP ports can be broke into 4x10 with a model of [49-52]/[1-4] - name: Ethernet49/1 type: 40gbase-x-qsfpp - name: Ethernet50/1 @@ -110,15 +125,5 @@ interfaces: type: 40gbase-x-qsfpp - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 455 - allocated_draw: 224 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 455 - allocated_draw: 224 + mgmt_only: true + diff --git a/device-types/Arista/DCS-7280SR2-48YC6.yaml b/device-types/Arista/DCS-7280SR2-48YC6.yaml index dfda72d06..4ab1965d5 100644 --- a/device-types/Arista/DCS-7280SR2-48YC6.yaml +++ b/device-types/Arista/DCS-7280SR2-48YC6.yaml @@ -1,8 +1,22 @@ manufacturer: Arista model: DCS-7280SR2-48YC6 slug: dcs-7280sr2-48yc6 -is_full_depth: True +part_number: DCS-7280SR2-48YC6 u_height: 1 +is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 647 + allocated_draw: 425 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 647 + allocated_draw: 425 interfaces: - name: Ethernet1 type: 25gbase-x-sfp28 @@ -88,7 +102,7 @@ interfaces: type: 25gbase-x-sfp28 - name: Ethernet42 type: 25gbase-x-sfp28 - - name: Ethernet33 + - name: Ethernet43 type: 25gbase-x-sfp28 - name: Ethernet44 type: 25gbase-x-sfp28 @@ -100,6 +114,7 @@ interfaces: type: 25gbase-x-sfp28 - name: Ethernet48 type: 25gbase-x-sfp28 +# QSFP28(100G) ports can be broke into 4x25 with a model of [49-54]/[1-4] - name: Ethernet49/1 type: 100gbase-x-qsfp28 - name: Ethernet50/1 @@ -114,15 +129,4 @@ interfaces: type: 100gbase-x-qsfp28 - name: Management1 type: 1000base-t -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 647 - allocated_draw: 425 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 647 - allocated_draw: 425 + mgmt_only: true From a03b7c6e881a201c1054d88c05b78dac7334746a Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 12:45:45 -0400 Subject: [PATCH 03/11] Fortigate corrections & updates --- device-types/Fortinet/FG-100F.yaml | 39 ++++++++++++++------------- device-types/Fortinet/FG-101F.yaml | 39 ++++++++++++++------------- device-types/Fortinet/FG-1100E.yaml | 31 ++++++++++----------- device-types/Fortinet/FG-1101E.yaml | 31 ++++++++++----------- device-types/Fortinet/FG-300E.yaml | 31 ++++++++++----------- device-types/Fortinet/FG-301E.yaml | 31 ++++++++++----------- device-types/Fortinet/FG-600E.yaml | 29 +++++++++++--------- device-types/Fortinet/FG-601E.yaml | 29 +++++++++++--------- device-types/Fortinet/FG-80E-POE.yaml | 26 +++++++++--------- device-types/Fortinet/FG-80E.yaml | 26 +++++++++--------- device-types/Fortinet/FG-81E-POE.yaml | 26 +++++++++--------- device-types/Fortinet/FG-81E.yaml | 26 +++++++++--------- 12 files changed, 190 insertions(+), 174 deletions(-) diff --git a/device-types/Fortinet/FG-100F.yaml b/device-types/Fortinet/FG-100F.yaml index 9e48306d9..c870856da 100644 --- a/device-types/Fortinet/FG-100F.yaml +++ b/device-types/Fortinet/FG-100F.yaml @@ -1,15 +1,28 @@ manufacturer: Fortinet model: FortiGate 100F -part_number: FG-100F slug: fg-100f -# comments: Same as FG-101F but without a 480GB SSD onboard. -is_full_depth: False +part_number: FG-100F u_height: 1 +is_full_depth: false +comments: Same as FG-101F but WITHOUT a 480GB SSD onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 39 + allocated_draw: 35 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 39 + allocated_draw: 35 interfaces: - name: dmz type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: wan1 type: 1000base-t - name: wan2 @@ -56,25 +69,13 @@ interfaces: type: 1000base-x-sfp - name: port17 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port18 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port19 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port20 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 39 - allocated_draw: 35 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 39 - allocated_draw: 35 + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-101F.yaml b/device-types/Fortinet/FG-101F.yaml index 5d1355a32..7aad74222 100644 --- a/device-types/Fortinet/FG-101F.yaml +++ b/device-types/Fortinet/FG-101F.yaml @@ -1,15 +1,28 @@ manufacturer: Fortinet model: FortiGate 101F -part_number: FG-101F slug: fg-101f -# comments: Same as FG-100F but with a 480GB SSD onboard. -is_full_depth: False +part_number: FG-101F u_height: 1 +is_full_depth: false +comments: Same as FG-100F but WITH a 480GB SSD onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 39 + allocated_draw: 35 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 39 + allocated_draw: 35 interfaces: - name: dmz type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: wan1 type: 1000base-t - name: wan2 @@ -56,25 +69,13 @@ interfaces: type: 1000base-x-sfp - name: port17 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port18 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port19 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port20 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 39 - allocated_draw: 35 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 39 - allocated_draw: 35 + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-1100E.yaml b/device-types/Fortinet/FG-1100E.yaml index 3a5bd3096..3158e1fe7 100644 --- a/device-types/Fortinet/FG-1100E.yaml +++ b/device-types/Fortinet/FG-1100E.yaml @@ -1,15 +1,28 @@ manufacturer: Fortinet model: FortiGate 1100E -part_number: FG-1100E slug: fg-1100e -# comments: Same as FG-1101E but without 2 x 480GB SSDs onboard. -is_full_depth: False +part_number: FG-1100E u_height: 2 +is_full_depth: false +comments: Same as FG-1101E but WITHOUT 2 x 480GB SSDs onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 336 + allocated_draw: 217 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 336 + allocated_draw: 217 interfaces: - name: ha type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: port1 type: 1000base-t - name: port2 @@ -78,15 +91,3 @@ interfaces: type: 40gbase-x-qsfpp - name: port34 type: 40gbase-x-qsfpp -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 336 - allocated_draw: 217 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 336 - allocated_draw: 217 diff --git a/device-types/Fortinet/FG-1101E.yaml b/device-types/Fortinet/FG-1101E.yaml index dbd4241a0..1985722ee 100644 --- a/device-types/Fortinet/FG-1101E.yaml +++ b/device-types/Fortinet/FG-1101E.yaml @@ -1,15 +1,28 @@ manufacturer: Fortinet model: FortiGate 1101E -part_number: FG-1101E slug: fg-1101e -# comments: Same as FG-1100E but with 2 x 480GB SSDs onboard. -is_full_depth: False +part_number: FG-1101E u_height: 2 +is_full_depth: false +comments: Same as FG-1100E but WITH 2 x 480GB SSDs onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 336 + allocated_draw: 217 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 336 + allocated_draw: 217 interfaces: - name: ha type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: port1 type: 1000base-t - name: port2 @@ -78,15 +91,3 @@ interfaces: type: 40gbase-x-qsfpp - name: port34 type: 40gbase-x-qsfpp -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 346 - allocated_draw: 222 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 346 - allocated_draw: 222 diff --git a/device-types/Fortinet/FG-300E.yaml b/device-types/Fortinet/FG-300E.yaml index ef6fb4240..3ffc8ac6c 100644 --- a/device-types/Fortinet/FG-300E.yaml +++ b/device-types/Fortinet/FG-300E.yaml @@ -1,15 +1,28 @@ manufacturer: Fortinet model: FortiGate 300E -part_number: FG-300E slug: fg-300e -# comments: Same as FG-301E but without a 480GB SSD onboard. -is_full_depth: False +part_number: FG-300E u_height: 1 +is_full_depth: false +comments: Same as FG-301E but WITHOUT a 480GB SSD onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 180 + allocated_draw: 95 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 180 + allocated_draw: 95 interfaces: - name: ha type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: port1 type: 1000base-t - name: port2 @@ -74,15 +87,3 @@ interfaces: type: 1000base-x-sfp - name: vw2 type: 1000base-x-sfp -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 173 - allocated_draw: 90 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 173 - allocated_draw: 90 diff --git a/device-types/Fortinet/FG-301E.yaml b/device-types/Fortinet/FG-301E.yaml index fb628981c..962c3c5d3 100644 --- a/device-types/Fortinet/FG-301E.yaml +++ b/device-types/Fortinet/FG-301E.yaml @@ -1,15 +1,28 @@ manufacturer: Fortinet model: FortiGate 301E -part_number: FG-301E slug: fg-301e -# comments: Same as FG-300E but with a 480GB SSD onboard. -is_full_depth: False +part_number: FG-301E u_height: 1 +is_full_depth: false +comments: Same as FG-300E but WITH a 480GB SSD onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 180 + allocated_draw: 95 + - name: PS2 + type: iec-60320-c14 + maximum_draw: 180 + allocated_draw: 95 interfaces: - name: ha type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: port1 type: 1000base-t - name: port2 @@ -74,15 +87,3 @@ interfaces: type: 1000base-x-sfp - name: vw2 type: 1000base-x-sfp -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 180 - allocated_draw: 95 - - name: PS2 - type: iec-60320-c14 - maximum_draw: 180 - allocated_draw: 95 diff --git a/device-types/Fortinet/FG-600E.yaml b/device-types/Fortinet/FG-600E.yaml index 3edbf232d..b28e047cf 100644 --- a/device-types/Fortinet/FG-600E.yaml +++ b/device-types/Fortinet/FG-600E.yaml @@ -1,15 +1,29 @@ manufacturer: Fortinet model: FortiGate 600E -part_number: FG-600E slug: fg-600e -# comments: Same as FG-601E but without 2 x 240GB SSDs onboard. -is_full_depth: False +part_number: FG-600E u_height: 1 +is_full_depth: false +comments: Same as FG-601E but WITHOUT 2 x 240GB SSDs onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 244 + allocated_draw: 129 + # Option to install a second PSU Uncomment out to add + #- name: PS1 + # type: iec-60320-c14 + # maximum_draw: 244 + # allocated_draw: 129 interfaces: - name: ha type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: port1 type: 1000base-t - name: port2 @@ -46,12 +60,3 @@ interfaces: type: 10gbase-x-sfpp - name: x2 type: 10gbase-x-sfpp -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 244 - allocated_draw: 129 - # Option to install a second PSU diff --git a/device-types/Fortinet/FG-601E.yaml b/device-types/Fortinet/FG-601E.yaml index c75d976e6..aab21f1f2 100644 --- a/device-types/Fortinet/FG-601E.yaml +++ b/device-types/Fortinet/FG-601E.yaml @@ -1,15 +1,29 @@ manufacturer: Fortinet model: FortiGate 601E -part_number: FG-601E slug: fg-601e -# comments: Same as FG-600E but with 2 x 240GB SSDs onboard. -is_full_depth: False +part_number: FG-601E u_height: 1 +is_full_depth: false +comments: Same as FG-600E but WITH 2 x 240GB SSDs onboard. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 244 + allocated_draw: 129 + # Option to install a second PSU Uncomment out to add + #- name: PS1 + # type: iec-60320-c14 + # maximum_draw: 244 + # allocated_draw: 129 interfaces: - name: ha type: 1000base-t - name: mgmt type: 1000base-t + mgmt_only: true - name: port1 type: 1000base-t - name: port2 @@ -46,12 +60,3 @@ interfaces: type: 10gbase-x-sfpp - name: x2 type: 10gbase-x-sfpp -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 244 - allocated_draw: 129 - # Option to install a second PSU diff --git a/device-types/Fortinet/FG-80E-POE.yaml b/device-types/Fortinet/FG-80E-POE.yaml index a95dd3731..c563a4f49 100644 --- a/device-types/Fortinet/FG-80E-POE.yaml +++ b/device-types/Fortinet/FG-80E-POE.yaml @@ -1,10 +1,18 @@ manufacturer: Fortinet model: FortiGate 80E-POE -part_number: FG-80E-POE slug: fg-80e-poe -# comments: Same as FG-81E-poe but without a 128GB SSD onboard. Has 12 x 1G POE. -is_full_depth: False +part_number: FG-80E-POE u_height: 1 +is_full_depth: false +comments: Same as FG-81E-poe but WITHOUT a 128GB SSD onboard. Has 12 x 1G POE. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: nema-5-15p + maximum_draw: 137 + allocated_draw: 20 interfaces: - name: port1 type: 1000base-t @@ -48,15 +56,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: nema-5-15p - maximum_draw: 137 - allocated_draw: 20 + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-80E.yaml b/device-types/Fortinet/FG-80E.yaml index a1898734d..73cce79be 100644 --- a/device-types/Fortinet/FG-80E.yaml +++ b/device-types/Fortinet/FG-80E.yaml @@ -1,10 +1,18 @@ manufacturer: Fortinet model: FortiGate 80E -part_number: FG-80E slug: fg-80e -# comments: Same as FG-81E but without a 128GB SSD onboard. Has no POE. -is_full_depth: False +part_number: FG-80E u_height: 1 +is_full_depth: false +comments: Same as FG-81E but WITHOUT a 128GB SSD onboard. Has no POE. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: nema-5-15p + maximum_draw: 25 + allocated_draw: 18 interfaces: - name: port1 type: 1000base-t @@ -36,15 +44,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: nema-5-15p - maximum_draw: 25 - allocated_draw: 18 + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-81E-POE.yaml b/device-types/Fortinet/FG-81E-POE.yaml index 25f89094a..0ca5b7f6a 100644 --- a/device-types/Fortinet/FG-81E-POE.yaml +++ b/device-types/Fortinet/FG-81E-POE.yaml @@ -1,10 +1,18 @@ manufacturer: Fortinet model: FortiGate 81E-POE -part_number: FG-81E-POE slug: fg-81e-poe -# comments: Same as FG-80E-POE but with a 128GB SSD onboard. Has 12 x 1G POE. -is_full_depth: False +part_number: FG-81E-POE u_height: 1 +is_full_depth: false +comments: Same as FG-80E-POE but WITH a 128GB SSD onboard. Has 12 x 1G POE. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: nema-5-15p + maximum_draw: 137 + allocated_draw: 20 interfaces: - name: port1 type: 1000base-t @@ -48,15 +56,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: nema-5-15p - maximum_draw: 137 - allocated_draw: 20 + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-81E.yaml b/device-types/Fortinet/FG-81E.yaml index bde837ed6..01db5d90f 100644 --- a/device-types/Fortinet/FG-81E.yaml +++ b/device-types/Fortinet/FG-81E.yaml @@ -1,10 +1,18 @@ manufacturer: Fortinet model: FortiGate 81E -part_number: FG-81E slug: fg-81e -# comments: Same as FG-80E but with a 128GB SSD onboard. Has no POE. -is_full_depth: False +part_number: FG-81E u_height: 1 +is_full_depth: false +comments: Same as FG-80E but WITH a 128GB SSD onboard. Has no POE. +console-ports: + - name: Console + type: rj-45 +power-ports: + - name: PS1 + type: nema-5-15p + maximum_draw: 72 + allocated_draw: 20 interfaces: - name: port1 type: 1000base-t @@ -36,15 +44,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.) -console-ports: - - name: Console - type: rj-45 -power-ports: - - name: PS1 - type: nema-5-15p - maximum_draw: 72 - allocated_draw: 20 + # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) From 4beade1e0f01bcb14388adcf3d2a31062c555ef1 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 12:46:08 -0400 Subject: [PATCH 04/11] infoblox Trinzic TE-805 corrections & updates --- device-types/Infoblox/TE-805-HW-AC-B.yaml | 30 +++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/device-types/Infoblox/TE-805-HW-AC-B.yaml b/device-types/Infoblox/TE-805-HW-AC-B.yaml index abb78e810..4705ecceb 100644 --- a/device-types/Infoblox/TE-805-HW-AC-B.yaml +++ b/device-types/Infoblox/TE-805-HW-AC-B.yaml @@ -1,19 +1,10 @@ manufacturer: Infoblox -model: TE-805-HW-AC-B +model: Trinzic TE-805 slug: te-805-hw-ac-b -is_full_depth: False +part_number: TE-805-HW-AC-B u_height: 1 -interfaces: - - name: IPMI - type: 1000base-t - - name: MGMT - type: 1000base-t - - name: LAN1 - type: 1000base-t - - name: LAN2 - type: 1000base-t - - name: HA - type: 1000base-t +is_full_depth: true +comments: Trinzic TE-805 Network Management Device with HDD & PSU console-ports: - name: Console type: rj-45 @@ -22,3 +13,16 @@ power-ports: type: iec-60320-c14 maximum_draw: 130 allocated_draw: 130 +interfaces: + - name: IPMI + type: 1000base-t + mgmt_only: true + - name: mgmt + type: 1000base-t + mgmt_only: true + - name: LAN1 + type: 1000base-t + - name: LAN2 + type: 1000base-t + - name: HA + type: 1000base-t From bcdc53d8d8475835dba3260846a81d75361ae3bf Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 12:46:23 -0400 Subject: [PATCH 05/11] Opengear corrections and updates --- device-types/Opengear/CM7116-2-DAC-US.yaml | 51 ++-- device-types/Opengear/CM7116-2-SAC-US.yaml | 86 +++---- ...CM7132-2-DAC.yaml => CM7132-2-DAC-US.yaml} | 82 +++---- device-types/Opengear/CM7148-2-DAC-US.yaml | 114 ++++----- device-types/Opengear/CM7148-2-SAC-US.yaml | 214 ++++++++--------- device-types/Opengear/CM7196-2-DAC-US.yaml | 210 ++++++++--------- ...IM7248-2-DAC.yaml => IM7248-2-DAC-US.yaml} | 217 +++++++++--------- 7 files changed, 500 insertions(+), 474 deletions(-) rename device-types/Opengear/{CM7132-2-DAC.yaml => CM7132-2-DAC-US.yaml} (59%) rename device-types/Opengear/{IM7248-2-DAC.yaml => IM7248-2-DAC-US.yaml} (54%) diff --git a/device-types/Opengear/CM7116-2-DAC-US.yaml b/device-types/Opengear/CM7116-2-DAC-US.yaml index a3a2e1d62..605f8f1cd 100644 --- a/device-types/Opengear/CM7116-2-DAC-US.yaml +++ b/device-types/Opengear/CM7116-2-DAC-US.yaml @@ -1,49 +1,45 @@ manufacturer: Opengear model: CM7116-2-DAC-US slug: cm7116-2-dac-us +part_number: CM7116-2-DAC-US u_height: 1 -interfaces: -# physical interface labels seem different than config labels - - name: lan - type: 1000base-t - mgmt_only: true - - name: wan - type: 1000base-t +is_full_depth: false +comments: 'CM7116 with built-in Dual Power Supplies' console-ports: - name: Console type: rj-45 console-server-ports: - - name: port1 + - name: Port 1 type: rj-45 - - name: port2 + - name: Port 2 type: rj-45 - - name: port3 + - name: Port 3 type: rj-45 - - name: port4 + - name: Port 4 type: rj-45 - - name: port5 + - name: Port 5 type: rj-45 - - name: port6 + - name: Port 6 type: rj-45 - - name: port7 + - name: Port 7 type: rj-45 - - name: port8 + - name: Port 8 type: rj-45 - - name: port9 + - name: Port 9 type: rj-45 - - name: port10 + - name: Port 10 type: rj-45 - - name: port11 + - name: Port 11 type: rj-45 - - name: port12 + - name: Port 12 type: rj-45 - - name: port13 + - name: Port 13 type: rj-45 - - name: port14 + - name: Port 14 type: rj-45 - - name: port15 + - name: Port 15 type: rj-45 - - name: port16 + - name: Port 16 type: rj-45 power-ports: - name: PS1 @@ -53,4 +49,11 @@ power-ports: - name: PS2 type: iec-60320-c14 maximum_draw: 25 - allocated_draw: 20 +interfaces: +# physical interface labels seem different than config labels + - name: lan + type: 1000base-t + mgmt_only: true + - name: wan + type: 1000base-t + mgmt_only: true diff --git a/device-types/Opengear/CM7116-2-SAC-US.yaml b/device-types/Opengear/CM7116-2-SAC-US.yaml index f57f00d0b..c9993c2fe 100644 --- a/device-types/Opengear/CM7116-2-SAC-US.yaml +++ b/device-types/Opengear/CM7116-2-SAC-US.yaml @@ -1,7 +1,51 @@ manufacturer: Opengear model: CM7116-2-SAC-US slug: cm7116-2-sac-us +part_number: CM7116-2-SAC-US u_height: 1 +is_full_depth: false +comments: 'CM7116 with built-in Single Power Supply' +console-ports: + - name: Console + type: rj-45 +console-server-ports: + - name: Port 1 + type: rj-45 + - name: Port 2 + type: rj-45 + - name: Port 3 + type: rj-45 + - name: Port 4 + type: rj-45 + - name: Port 5 + type: rj-45 + - name: Port 6 + type: rj-45 + - name: Port 7 + type: rj-45 + - name: Port 8 + type: rj-45 + - name: Port 9 + type: rj-45 + - name: Port 10 + type: rj-45 + - name: Port 11 + type: rj-45 + - name: Port 12 + type: rj-45 + - name: Port 13 + type: rj-45 + - name: Port 14 + type: rj-45 + - name: Port 15 + type: rj-45 + - name: Port 16 + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 25 + allocated_draw: 20 interfaces: # physical interface labels seem different than config labels - name: lan @@ -9,44 +53,4 @@ interfaces: mgmt_only: true - name: wan type: 1000base-t -console-ports: - - name: Console - type: rj-45 -console-server-ports: - - name: port1 - type: rj-45 - - name: port2 - type: rj-45 - - name: port3 - type: rj-45 - - name: port4 - type: rj-45 - - name: port5 - type: rj-45 - - name: port6 - type: rj-45 - - name: port7 - type: rj-45 - - name: port8 - type: rj-45 - - name: port9 - type: rj-45 - - name: port10 - type: rj-45 - - name: port11 - type: rj-45 - - name: port12 - type: rj-45 - - name: port13 - type: rj-45 - - name: port14 - type: rj-45 - - name: port15 - type: rj-45 - - name: port16 - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 25 - allocated_draw: 20 + mgmt_only: true diff --git a/device-types/Opengear/CM7132-2-DAC.yaml b/device-types/Opengear/CM7132-2-DAC-US.yaml similarity index 59% rename from device-types/Opengear/CM7132-2-DAC.yaml rename to device-types/Opengear/CM7132-2-DAC-US.yaml index 2d066317f..ffe7c234b 100644 --- a/device-types/Opengear/CM7132-2-DAC.yaml +++ b/device-types/Opengear/CM7132-2-DAC-US.yaml @@ -1,81 +1,77 @@ manufacturer: Opengear model: CM7132-2-DAC-US slug: cm7132-2-dac-us +part_number: CM7132-2-DAC-US u_height: 1 -interfaces: -# physical interface labels seem different than config labels - - name: lan - type: 1000base-t - mgmt_only: true - - name: wan - type: 1000base-t +is_full_depth: false +comments: 'CM7132 with built-in Dual Power Supplies' console-ports: - name: Console type: rj-45 console-server-ports: - - name: port1 + - name: Port 1 type: rj-45 - - name: port2 + - name: Port 2 type: rj-45 - - name: port3 + - name: Port 3 type: rj-45 - - name: port4 + - name: Port 4 type: rj-45 - - name: port5 + - name: Port 5 type: rj-45 - - name: port6 + - name: Port 6 type: rj-45 - - name: port7 + - name: Port 7 type: rj-45 - - name: port8 + - name: Port 8 type: rj-45 - - name: port9 + - name: Port 9 type: rj-45 - - name: port10 + - name: Port 10 type: rj-45 - - name: port11 + - name: Port 11 type: rj-45 - - name: port12 + - name: Port 12 type: rj-45 - - name: port13 + - name: Port 13 type: rj-45 - - name: port14 + - name: Port 14 type: rj-45 - - name: port15 + - name: Port 15 type: rj-45 - - name: port16 + - name: Port 16 type: rj-45 - - name: port17 + - name: Port 17 type: rj-45 - - name: port18 + - name: Port 18 type: rj-45 - - name: port19 + - name: Port 19 type: rj-45 - - name: port20 + - name: Port 20 type: rj-45 - - name: port21 + - name: Port 21 type: rj-45 - - name: port22 + - name: Port 22 type: rj-45 - - name: port23 + - name: Port 23 type: rj-45 - - name: port24 + - name: Port 24 type: rj-45 - - name: port25 + - name: Port 25 type: rj-45 - - name: port26 + - name: Port 26 type: rj-45 - - name: port27 + - name: Port 27 type: rj-45 - - name: port28 + - name: Port 28 type: rj-45 - - name: port29 + - name: Port 29 type: rj-45 - - name: port30 + - name: Port 30 type: rj-45 - - name: port31 + - name: Port 31 type: rj-45 - - name: port32 + - name: Port 32 type: rj-45 power-ports: - name: PS1 @@ -86,3 +82,11 @@ power-ports: type: iec-60320-c14 maximum_draw: 25 allocated_draw: 20 +interfaces: +# physical interface labels seem different than config labels + - name: lan + type: 1000base-t + mgmt_only: true + - name: wan + type: 1000base-t + mgmt_only: true diff --git a/device-types/Opengear/CM7148-2-DAC-US.yaml b/device-types/Opengear/CM7148-2-DAC-US.yaml index db14c3522..63d1e5f0c 100644 --- a/device-types/Opengear/CM7148-2-DAC-US.yaml +++ b/device-types/Opengear/CM7148-2-DAC-US.yaml @@ -1,113 +1,109 @@ manufacturer: Opengear model: CM7148-2-DAC-US slug: cm7148-2-dac-us +part_number: CM7148-2-DAC-US u_height: 1 -interfaces: -# physical interface labels seem different than config labels - - name: lan - type: 1000base-t - mgmt_only: true - - name: wan - type: 1000base-t +is_full_depth: false +comments: 'CM7148 with built-in Dual Power Supplies' console-ports: - name: Console type: rj-45 console-server-ports: - - name: port1 + - name: Port 1 type: rj-45 - - name: port2 + - name: Port 2 type: rj-45 - - name: port3 + - name: Port 3 type: rj-45 - - name: port4 + - name: Port 4 type: rj-45 - - name: port5 + - name: Port 5 type: rj-45 - - name: port6 + - name: Port 6 type: rj-45 - - name: port7 + - name: Port 7 type: rj-45 - - name: port8 + - name: Port 8 type: rj-45 - - name: port9 + - name: Port 9 type: rj-45 - - name: port10 + - name: Port 10 type: rj-45 - - name: port11 + - name: Port 11 type: rj-45 - - name: port12 + - name: Port 12 type: rj-45 - - name: port13 + - name: Port 13 type: rj-45 - - name: port14 + - name: Port 14 type: rj-45 - - name: port15 + - name: Port 15 type: rj-45 - - name: port16 + - name: Port 16 type: rj-45 - - name: port17 + - name: Port 17 type: rj-45 - - name: port18 + - name: Port 18 type: rj-45 - - name: port19 + - name: Port 19 type: rj-45 - - name: port20 + - name: Port 20 type: rj-45 - - name: port21 + - name: Port 21 type: rj-45 - - name: port22 + - name: Port 22 type: rj-45 - - name: port23 + - name: Port 23 type: rj-45 - - name: port24 + - name: Port 24 type: rj-45 - - name: port25 + - name: Port 25 type: rj-45 - - name: port26 + - name: Port 26 type: rj-45 - - name: port27 + - name: Port 27 type: rj-45 - - name: port28 + - name: Port 28 type: rj-45 - - name: port29 + - name: Port 29 type: rj-45 - - name: port30 + - name: Port 30 type: rj-45 - - name: port31 + - name: Port 31 type: rj-45 - - name: port32 + - name: Port 32 type: rj-45 - - name: port33 + - name: Port 33 type: rj-45 - - name: port34 + - name: Port 34 type: rj-45 - - name: port35 + - name: Port 35 type: rj-45 - - name: port36 + - name: Port 36 type: rj-45 - - name: port37 + - name: Port 37 type: rj-45 - - name: port38 + - name: Port 38 type: rj-45 - - name: port39 + - name: Port 39 type: rj-45 - - name: port40 + - name: Port 40 type: rj-45 - - name: port41 + - name: Port 41 type: rj-45 - - name: port42 + - name: Port 42 type: rj-45 - - name: port43 + - name: Port 43 type: rj-45 - - name: port47 + - name: Port 47 type: rj-45 - - name: port45 + - name: Port 45 type: rj-45 - - name: port46 + - name: Port 46 type: rj-45 - - name: port47 + - name: Port 47 type: rj-45 - - name: port48 + - name: Port 48 type: rj-45 power-ports: - name: PS1 @@ -118,3 +114,11 @@ power-ports: type: iec-60320-c14 maximum_draw: 25 allocated_draw: 20 +interfaces: +# physical interface labels seem different than config labels + - name: lan + type: 1000base-t + mgmt_only: true + - name: wan + type: 1000base-t + mgmt_only: true diff --git a/device-types/Opengear/CM7148-2-SAC-US.yaml b/device-types/Opengear/CM7148-2-SAC-US.yaml index bebc94018..5b2922680 100644 --- a/device-types/Opengear/CM7148-2-SAC-US.yaml +++ b/device-types/Opengear/CM7148-2-SAC-US.yaml @@ -1,7 +1,115 @@ manufacturer: Opengear model: CM7148-2-SAC-US slug: cm7148-2-sac-us +part_number: CM7148-2-SAC-US u_height: 1 +is_full_depth: false +comments: 'CM7148 with built-in Single Power Supply' +console-ports: + - name: Console + type: rj-45 +console-server-ports: + - name: Port 1 + type: rj-45 + - name: Port 2 + type: rj-45 + - name: Port 3 + type: rj-45 + - name: Port 4 + type: rj-45 + - name: Port 5 + type: rj-45 + - name: Port 6 + type: rj-45 + - name: Port 7 + type: rj-45 + - name: Port 8 + type: rj-45 + - name: Port 9 + type: rj-45 + - name: Port 10 + type: rj-45 + - name: Port 11 + type: rj-45 + - name: Port 12 + type: rj-45 + - name: Port 13 + type: rj-45 + - name: Port 14 + type: rj-45 + - name: Port 15 + type: rj-45 + - name: Port 16 + type: rj-45 + - name: Port 17 + type: rj-45 + - name: Port 18 + type: rj-45 + - name: Port 19 + type: rj-45 + - name: Port 20 + type: rj-45 + - name: Port 21 + type: rj-45 + - name: Port 22 + type: rj-45 + - name: Port 23 + type: rj-45 + - name: Port 24 + type: rj-45 + - name: Port 25 + type: rj-45 + - name: Port 26 + type: rj-45 + - name: Port 27 + type: rj-45 + - name: Port 28 + type: rj-45 + - name: Port 29 + type: rj-45 + - name: Port 30 + type: rj-45 + - name: Port 31 + type: rj-45 + - name: Port 32 + type: rj-45 + - name: Port 33 + type: rj-45 + - name: Port 34 + type: rj-45 + - name: Port 35 + type: rj-45 + - name: Port 36 + type: rj-45 + - name: Port 37 + type: rj-45 + - name: Port 38 + type: rj-45 + - name: Port 39 + type: rj-45 + - name: Port 40 + type: rj-45 + - name: Port 41 + type: rj-45 + - name: Port 42 + type: rj-45 + - name: Port 43 + type: rj-45 + - name: Port 47 + type: rj-45 + - name: Port 45 + type: rj-45 + - name: Port 46 + type: rj-45 + - name: Port 47 + type: rj-45 + - name: Port 48 + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + maximum_draw: 25 + allocated_draw: 20 interfaces: # physical interface labels seem different than config labels - name: lan @@ -9,108 +117,4 @@ interfaces: mgmt_only: true - name: wan type: 1000base-t -console-ports: - - name: Console - type: rj-45 -console-server-ports: - - name: port1 - type: rj-45 - - name: port2 - type: rj-45 - - name: port3 - type: rj-45 - - name: port4 - type: rj-45 - - name: port5 - type: rj-45 - - name: port6 - type: rj-45 - - name: port7 - type: rj-45 - - name: port8 - type: rj-45 - - name: port9 - type: rj-45 - - name: port10 - type: rj-45 - - name: port11 - type: rj-45 - - name: port12 - type: rj-45 - - name: port13 - type: rj-45 - - name: port14 - type: rj-45 - - name: port15 - type: rj-45 - - name: port16 - type: rj-45 - - name: port17 - type: rj-45 - - name: port18 - type: rj-45 - - name: port19 - type: rj-45 - - name: port20 - type: rj-45 - - name: port21 - type: rj-45 - - name: port22 - type: rj-45 - - name: port23 - type: rj-45 - - name: port24 - type: rj-45 - - name: port25 - type: rj-45 - - name: port26 - type: rj-45 - - name: port27 - type: rj-45 - - name: port28 - type: rj-45 - - name: port29 - type: rj-45 - - name: port30 - type: rj-45 - - name: port31 - type: rj-45 - - name: port32 - type: rj-45 - - name: port33 - type: rj-45 - - name: port34 - type: rj-45 - - name: port35 - type: rj-45 - - name: port36 - type: rj-45 - - name: port37 - type: rj-45 - - name: port38 - type: rj-45 - - name: port39 - type: rj-45 - - name: port40 - type: rj-45 - - name: port41 - type: rj-45 - - name: port42 - type: rj-45 - - name: port43 - type: rj-45 - - name: port47 - type: rj-45 - - name: port45 - type: rj-45 - - name: port46 - type: rj-45 - - name: port47 - type: rj-45 - - name: port48 - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - maximum_draw: 25 - allocated_draw: 20 + mgmt_only: true diff --git a/device-types/Opengear/CM7196-2-DAC-US.yaml b/device-types/Opengear/CM7196-2-DAC-US.yaml index 3a93aebfd..7e69462e1 100644 --- a/device-types/Opengear/CM7196-2-DAC-US.yaml +++ b/device-types/Opengear/CM7196-2-DAC-US.yaml @@ -1,209 +1,205 @@ manufacturer: Opengear model: CM7196-2-DAC-US slug: cm7196-2-dac-us +part_number: CM7196-2-DAC-US u_height: 1 -interfaces: -# physical interface labels seem different than config labels - - name: lan - type: 1000base-t - mgmt_only: true - - name: wan - type: 1000base-t +is_full_depth: false +comments: 'CM7196 with built-in Dual Power Supplies. 48 console ports on the front and 48 console ports on the back of the appliance.' console-ports: - name: Console type: rj-45 console-server-ports: - - name: port1 + - name: Port 1 type: rj-45 - - name: port2 + - name: Port 2 type: rj-45 - - name: port3 + - name: Port 3 type: rj-45 - - name: port4 + - name: Port 4 type: rj-45 - - name: port5 + - name: Port 5 type: rj-45 - - name: port6 + - name: Port 6 type: rj-45 - - name: port7 + - name: Port 7 type: rj-45 - - name: port8 + - name: Port 8 type: rj-45 - - name: port9 + - name: Port 9 type: rj-45 - - name: port10 + - name: Port 10 type: rj-45 - - name: port11 + - name: Port 11 type: rj-45 - - name: port12 + - name: Port 12 type: rj-45 - - name: port13 + - name: Port 13 type: rj-45 - - name: port14 + - name: Port 14 type: rj-45 - - name: port15 + - name: Port 15 type: rj-45 - - name: port16 + - name: Port 16 type: rj-45 - - name: port17 + - name: Port 17 type: rj-45 - - name: port18 + - name: Port 18 type: rj-45 - - name: port19 + - name: Port 19 type: rj-45 - - name: port20 + - name: Port 20 type: rj-45 - - name: port21 + - name: Port 21 type: rj-45 - - name: port22 + - name: Port 22 type: rj-45 - - name: port23 + - name: Port 23 type: rj-45 - - name: port24 + - name: Port 24 type: rj-45 - - name: port25 + - name: Port 25 type: rj-45 - - name: port26 + - name: Port 26 type: rj-45 - - name: port27 + - name: Port 27 type: rj-45 - - name: port28 + - name: Port 28 type: rj-45 - - name: port29 + - name: Port 29 type: rj-45 - - name: port30 + - name: Port 30 type: rj-45 - - name: port31 + - name: Port 31 type: rj-45 - - name: port32 + - name: Port 32 type: rj-45 - - name: port33 + - name: Port 33 type: rj-45 - - name: port34 + - name: Port 34 type: rj-45 - - name: port35 + - name: Port 35 type: rj-45 - - name: port36 + - name: Port 36 type: rj-45 - - name: port37 + - name: Port 37 type: rj-45 - - name: port38 + - name: Port 38 type: rj-45 - - name: port39 + - name: Port 39 type: rj-45 - - name: port40 + - name: Port 40 type: rj-45 - - name: port41 + - name: Port 41 type: rj-45 - - name: port42 + - name: Port 42 type: rj-45 - - name: port43 + - name: Port 43 type: rj-45 - - name: port44 + - name: Port 44 type: rj-45 - - name: port45 + - name: Port 45 type: rj-45 - - name: port46 + - name: Port 46 type: rj-45 - - name: port47 + - name: Port 47 type: rj-45 - - name: port48 + - name: Port 48 type: rj-45 - - name: port49 + - name: Port 49 type: rj-45 - - name: port50 + - name: Port 50 type: rj-45 - - name: port51 + - name: Port 51 type: rj-45 - - name: port52 + - name: Port 52 type: rj-45 - - name: port53 + - name: Port 53 type: rj-45 - - name: port54 + - name: Port 54 type: rj-45 - - name: port55 + - name: Port 55 type: rj-45 - - name: port56 + - name: Port 56 type: rj-45 - - name: port57 + - name: Port 57 type: rj-45 - - name: port58 + - name: Port 58 type: rj-45 - - name: port59 + - name: Port 59 type: rj-45 - - name: port60 + - name: Port 60 type: rj-45 - - name: port61 + - name: Port 61 type: rj-45 - - name: port62 + - name: Port 62 type: rj-45 - - name: port63 + - name: Port 63 type: rj-45 - - name: port64 + - name: Port 64 type: rj-45 - - name: port65 + - name: Port 65 type: rj-45 - - name: port66 + - name: Port 66 type: rj-45 - - name: port67 + - name: Port 67 type: rj-45 - - name: port68 + - name: Port 68 type: rj-45 - - name: port69 + - name: Port 69 type: rj-45 - - name: port70 + - name: Port 70 type: rj-45 - - name: port71 + - name: Port 71 type: rj-45 - - name: port72 + - name: Port 72 type: rj-45 - - name: port73 + - name: Port 73 type: rj-45 - - name: port74 + - name: Port 74 type: rj-45 - - name: port75 + - name: Port 75 type: rj-45 - - name: port76 + - name: Port 76 type: rj-45 - - name: port77 + - name: Port 77 type: rj-45 - - name: port78 + - name: Port 78 type: rj-45 - - name: port79 + - name: Port 79 type: rj-45 - - name: port80 + - name: Port 80 type: rj-45 - - name: port81 + - name: Port 81 type: rj-45 - - name: port82 + - name: Port 82 type: rj-45 - - name: port83 + - name: Port 83 type: rj-45 - - name: port84 + - name: Port 84 type: rj-45 - - name: port85 + - name: Port 85 type: rj-45 - - name: port86 + - name: Port 86 type: rj-45 - - name: port87 + - name: Port 87 type: rj-45 - - name: port88 + - name: Port 88 type: rj-45 - - name: port89 + - name: Port 89 type: rj-45 - - name: port90 + - name: Port 90 type: rj-45 - - name: port91 + - name: Port 91 type: rj-45 - - name: port92 + - name: Port 92 type: rj-45 - - name: port93 + - name: Port 93 type: rj-45 - - name: port94 + - name: Port 94 type: rj-45 - - name: port95 + - name: Port 95 type: rj-45 - - name: port96 + - name: Port 96 type: rj-45 power-ports: - name: PS1 @@ -214,3 +210,11 @@ power-ports: type: iec-60320-c14 maximum_draw: 25 allocated_draw: 20 +interfaces: +# physical interface labels seem different than config labels + - name: lan + type: 1000base-t + mgmt_only: true + - name: wan + type: 1000base-t + mgmt_only: true diff --git a/device-types/Opengear/IM7248-2-DAC.yaml b/device-types/Opengear/IM7248-2-DAC-US.yaml similarity index 54% rename from device-types/Opengear/IM7248-2-DAC.yaml rename to device-types/Opengear/IM7248-2-DAC-US.yaml index e11a38e0c..b0c602c4e 100644 --- a/device-types/Opengear/IM7248-2-DAC.yaml +++ b/device-types/Opengear/IM7248-2-DAC-US.yaml @@ -1,7 +1,115 @@ manufacturer: Opengear -model: IM7248-2-DAC -slug: im7248-2-dac +model: IM7248-2-DAC-US +slug: im7248-2-dac-us +part_number: IM7248-2-DAC-US +u_height: 1 is_full_depth: false +comments: '' +console-ports: + - name: Console + type: rj-45 +console-server-ports: + - name: Port 1 + type: rj-45 + - name: Port 2 + type: rj-45 + - name: Port 3 + type: rj-45 + - name: Port 4 + type: rj-45 + - name: Port 5 + type: rj-45 + - name: Port 6 + type: rj-45 + - name: Port 7 + type: rj-45 + - name: Port 8 + type: rj-45 + - name: Port 9 + type: rj-45 + - name: Port 10 + type: rj-45 + - name: Port 11 + type: rj-45 + - name: Port 12 + type: rj-45 + - name: Port 13 + type: rj-45 + - name: Port 14 + type: rj-45 + - name: Port 15 + type: rj-45 + - name: Port 16 + type: rj-45 + - name: Port 17 + type: rj-45 + - name: Port 18 + type: rj-45 + - name: Port 19 + type: rj-45 + - name: Port 20 + type: rj-45 + - name: Port 21 + type: rj-45 + - name: Port 22 + type: rj-45 + - name: Port 23 + type: rj-45 + - name: Port 24 + type: rj-45 + - name: Port 25 + type: rj-45 + - name: Port 26 + type: rj-45 + - name: Port 27 + type: rj-45 + - name: Port 28 + type: rj-45 + - name: Port 29 + type: rj-45 + - name: Port 30 + type: rj-45 + - name: Port 31 + type: rj-45 + - name: Port 32 + type: rj-45 + - name: Port 33 + type: rj-45 + - name: Port 34 + type: rj-45 + - name: Port 35 + type: rj-45 + - name: Port 36 + type: rj-45 + - name: Port 37 + type: rj-45 + - name: Port 38 + type: rj-45 + - name: Port 39 + type: rj-45 + - name: Port 40 + type: rj-45 + - name: Port 41 + type: rj-45 + - name: Port 42 + type: rj-45 + - name: Port 43 + type: rj-45 + - name: Port 47 + type: rj-45 + - name: Port 45 + type: rj-45 + - name: Port 46 + type: rj-45 + - name: Port 47 + type: rj-45 + - name: Port 48 + type: rj-45 +power-ports: + - name: PS1 + type: iec-60320-c14 + - name: PS2 + type: iec-60320-c14 interfaces: - name: eth0 type: 1000base-t @@ -12,108 +120,3 @@ interfaces: - name: wlan0 type: ieee802.11n mgmt_only: true -console-ports: - - name: Console - type: rj-45 -console-server-ports: - - name: port1 - type: rj-45 - - name: port2 - type: rj-45 - - name: port3 - type: rj-45 - - name: port4 - type: rj-45 - - name: port5 - type: rj-45 - - name: port6 - type: rj-45 - - name: port7 - type: rj-45 - - name: port8 - type: rj-45 - - name: port9 - type: rj-45 - - name: port10 - type: rj-45 - - name: port11 - type: rj-45 - - name: port12 - type: rj-45 - - name: port13 - type: rj-45 - - name: port14 - type: rj-45 - - name: port15 - type: rj-45 - - name: port16 - type: rj-45 - - name: port17 - type: rj-45 - - name: port18 - type: rj-45 - - name: port19 - type: rj-45 - - name: port20 - type: rj-45 - - name: port21 - type: rj-45 - - name: port22 - type: rj-45 - - name: port23 - type: rj-45 - - name: port24 - type: rj-45 - - name: port25 - type: rj-45 - - name: port26 - type: rj-45 - - name: port27 - type: rj-45 - - name: port28 - type: rj-45 - - name: port29 - type: rj-45 - - name: port30 - type: rj-45 - - name: port31 - type: rj-45 - - name: port32 - type: rj-45 - - name: port33 - type: rj-45 - - name: port34 - type: rj-45 - - name: port35 - type: rj-45 - - name: port36 - type: rj-45 - - name: port37 - type: rj-45 - - name: port38 - type: rj-45 - - name: port39 - type: rj-45 - - name: port40 - type: rj-45 - - name: port41 - type: rj-45 - - name: port42 - type: rj-45 - - name: port43 - type: rj-45 - - name: port47 - type: rj-45 - - name: port45 - type: rj-45 - - name: port46 - type: rj-45 - - name: port47 - type: rj-45 - - name: port48 - type: rj-45 -power-ports: - - name: PS1 - type: iec-60320-c14 - - name: PS2 - type: iec-60320-c14 From 1d099e70fa1d9485b103ea0acfe1349dcfae7c2a Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 13:15:29 -0400 Subject: [PATCH 06/11] further Arista Opengear and Fortinet Tweaks --- device-types/Arista/DCS-7050SX3-48YC8.yaml | 1 - device-types/Fortinet/FG-300E.yaml | 2 +- device-types/Fortinet/FG-301E.yaml | 2 +- device-types/Opengear/CM7116-2-DAC-US.yaml | 2 +- device-types/Opengear/CM7116-2-SAC-US.yaml | 2 +- device-types/Opengear/CM7132-2-DAC-US.yaml | 2 +- device-types/Opengear/CM7148-2-DAC-US.yaml | 4 ++-- device-types/Opengear/CM7148-2-SAC-US.yaml | 2 +- device-types/Opengear/CM7196-2-DAC-US.yaml | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/device-types/Arista/DCS-7050SX3-48YC8.yaml b/device-types/Arista/DCS-7050SX3-48YC8.yaml index e9c0510ff..5fa7771fa 100644 --- a/device-types/Arista/DCS-7050SX3-48YC8.yaml +++ b/device-types/Arista/DCS-7050SX3-48YC8.yaml @@ -8,7 +8,6 @@ comments: '' console-ports: - name: Console type: rj-45 - mgmt_only: true power-ports: - name: PS1 type: iec-60320-c14 diff --git a/device-types/Fortinet/FG-300E.yaml b/device-types/Fortinet/FG-300E.yaml index 3ffc8ac6c..5e3e4b6dd 100644 --- a/device-types/Fortinet/FG-300E.yaml +++ b/device-types/Fortinet/FG-300E.yaml @@ -4,7 +4,7 @@ slug: fg-300e part_number: FG-300E u_height: 1 is_full_depth: false -comments: Same as FG-301E but WITHOUT a 480GB SSD onboard. +comments: Same as FG-301E but WITHOUT 2 x 240GB SSD onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-301E.yaml b/device-types/Fortinet/FG-301E.yaml index 962c3c5d3..83d5dc877 100644 --- a/device-types/Fortinet/FG-301E.yaml +++ b/device-types/Fortinet/FG-301E.yaml @@ -4,7 +4,7 @@ slug: fg-301e part_number: FG-301E u_height: 1 is_full_depth: false -comments: Same as FG-300E but WITH a 480GB SSD onboard. +comments: Same as FG-300E but WITH 2 x 240GB SSD onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Opengear/CM7116-2-DAC-US.yaml b/device-types/Opengear/CM7116-2-DAC-US.yaml index 605f8f1cd..1ea77761e 100644 --- a/device-types/Opengear/CM7116-2-DAC-US.yaml +++ b/device-types/Opengear/CM7116-2-DAC-US.yaml @@ -4,7 +4,7 @@ slug: cm7116-2-dac-us part_number: CM7116-2-DAC-US u_height: 1 is_full_depth: false -comments: 'CM7116 with built-in Dual Power Supplies' +comments: CM7116 with built-in Dual Power Supplies console-ports: - name: Console type: rj-45 diff --git a/device-types/Opengear/CM7116-2-SAC-US.yaml b/device-types/Opengear/CM7116-2-SAC-US.yaml index c9993c2fe..ea07c450b 100644 --- a/device-types/Opengear/CM7116-2-SAC-US.yaml +++ b/device-types/Opengear/CM7116-2-SAC-US.yaml @@ -4,7 +4,7 @@ slug: cm7116-2-sac-us part_number: CM7116-2-SAC-US u_height: 1 is_full_depth: false -comments: 'CM7116 with built-in Single Power Supply' +comments: CM7116 with built-in Single Power Supply console-ports: - name: Console type: rj-45 diff --git a/device-types/Opengear/CM7132-2-DAC-US.yaml b/device-types/Opengear/CM7132-2-DAC-US.yaml index ffe7c234b..67eff2497 100644 --- a/device-types/Opengear/CM7132-2-DAC-US.yaml +++ b/device-types/Opengear/CM7132-2-DAC-US.yaml @@ -4,7 +4,7 @@ slug: cm7132-2-dac-us part_number: CM7132-2-DAC-US u_height: 1 is_full_depth: false -comments: 'CM7132 with built-in Dual Power Supplies' +comments: CM7132 with built-in Dual Power Supplies console-ports: - name: Console type: rj-45 diff --git a/device-types/Opengear/CM7148-2-DAC-US.yaml b/device-types/Opengear/CM7148-2-DAC-US.yaml index 63d1e5f0c..72431877a 100644 --- a/device-types/Opengear/CM7148-2-DAC-US.yaml +++ b/device-types/Opengear/CM7148-2-DAC-US.yaml @@ -4,7 +4,7 @@ slug: cm7148-2-dac-us part_number: CM7148-2-DAC-US u_height: 1 is_full_depth: false -comments: 'CM7148 with built-in Dual Power Supplies' +comments: CM7148 with built-in Dual Power Supplies console-ports: - name: Console type: rj-45 @@ -95,7 +95,7 @@ console-server-ports: type: rj-45 - name: Port 43 type: rj-45 - - name: Port 47 + - name: Port 44 type: rj-45 - name: Port 45 type: rj-45 diff --git a/device-types/Opengear/CM7148-2-SAC-US.yaml b/device-types/Opengear/CM7148-2-SAC-US.yaml index 5b2922680..436e71e84 100644 --- a/device-types/Opengear/CM7148-2-SAC-US.yaml +++ b/device-types/Opengear/CM7148-2-SAC-US.yaml @@ -4,7 +4,7 @@ slug: cm7148-2-sac-us part_number: CM7148-2-SAC-US u_height: 1 is_full_depth: false -comments: 'CM7148 with built-in Single Power Supply' +comments: CM7148 with built-in Single Power Supply console-ports: - name: Console type: rj-45 diff --git a/device-types/Opengear/CM7196-2-DAC-US.yaml b/device-types/Opengear/CM7196-2-DAC-US.yaml index 7e69462e1..6e369aa1e 100644 --- a/device-types/Opengear/CM7196-2-DAC-US.yaml +++ b/device-types/Opengear/CM7196-2-DAC-US.yaml @@ -4,7 +4,7 @@ slug: cm7196-2-dac-us part_number: CM7196-2-DAC-US u_height: 1 is_full_depth: false -comments: 'CM7196 with built-in Dual Power Supplies. 48 console ports on the front and 48 console ports on the back of the appliance.' +comments: CM7196 with built-in Dual Power Supplies. 48 console ports on the front and 48 console ports on the back of the appliance. console-ports: - name: Console type: rj-45 From df4cbe83b23b9adce6ed1d2648302c12fb7283dc Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 13:23:01 -0400 Subject: [PATCH 07/11] Infoblox TE-805-HW-AC-B corrections --- device-types/Infoblox/TE-805-HW-AC-B.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/device-types/Infoblox/TE-805-HW-AC-B.yaml b/device-types/Infoblox/TE-805-HW-AC-B.yaml index 4705ecceb..d1ef4b387 100644 --- a/device-types/Infoblox/TE-805-HW-AC-B.yaml +++ b/device-types/Infoblox/TE-805-HW-AC-B.yaml @@ -14,15 +14,15 @@ power-ports: maximum_draw: 130 allocated_draw: 130 interfaces: - - name: IPMI + - name: HA type: 1000base-t - mgmt_only: true - - name: mgmt + - name: IPMI type: 1000base-t mgmt_only: true - name: LAN1 type: 1000base-t - name: LAN2 type: 1000base-t - - name: HA + - name: MGMT type: 1000base-t + mgmt_only: true From f47707134910e42912f6a50f562d6f124acb8141 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 13:41:42 -0400 Subject: [PATCH 08/11] Fortigate updates to describe model differences --- device-types/Fortinet/FG-100F.yaml | 10 +++++----- device-types/Fortinet/FG-101F.yaml | 10 +++++----- device-types/Fortinet/FG-1100E.yaml | 2 +- device-types/Fortinet/FG-1101E.yaml | 2 +- device-types/Fortinet/FG-300E.yaml | 2 +- device-types/Fortinet/FG-301E.yaml | 2 +- device-types/Fortinet/FG-600E.yaml | 2 +- device-types/Fortinet/FG-601E.yaml | 2 +- device-types/Fortinet/FG-80E-POE.yaml | 6 +++--- device-types/Fortinet/FG-80E.yaml | 6 +++--- device-types/Fortinet/FG-81E-POE.yaml | 6 +++--- device-types/Fortinet/FG-81E.yaml | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/device-types/Fortinet/FG-100F.yaml b/device-types/Fortinet/FG-100F.yaml index c870856da..39fb5f791 100644 --- a/device-types/Fortinet/FG-100F.yaml +++ b/device-types/Fortinet/FG-100F.yaml @@ -4,7 +4,7 @@ slug: fg-100f part_number: FG-100F u_height: 1 is_full_depth: false -comments: Same as FG-101F but WITHOUT a 480GB SSD onboard. +comments: Same as FG-101F but **WITHOUT** a 480GB SSD onboard. console-ports: - name: Console type: rj-45 @@ -69,13 +69,13 @@ interfaces: type: 1000base-x-sfp - name: port17 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port18 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port19 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port20 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-101F.yaml b/device-types/Fortinet/FG-101F.yaml index 7aad74222..b54a8f40c 100644 --- a/device-types/Fortinet/FG-101F.yaml +++ b/device-types/Fortinet/FG-101F.yaml @@ -4,7 +4,7 @@ slug: fg-101f part_number: FG-101F u_height: 1 is_full_depth: false -comments: Same as FG-100F but WITH a 480GB SSD onboard. +comments: Same as FG-100F but **WITH** a 480GB SSD onboard. console-ports: - name: Console type: rj-45 @@ -69,13 +69,13 @@ interfaces: type: 1000base-x-sfp - name: port17 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port18 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port19 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: port20 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-1100E.yaml b/device-types/Fortinet/FG-1100E.yaml index 3158e1fe7..41097f290 100644 --- a/device-types/Fortinet/FG-1100E.yaml +++ b/device-types/Fortinet/FG-1100E.yaml @@ -4,7 +4,7 @@ slug: fg-1100e part_number: FG-1100E u_height: 2 is_full_depth: false -comments: Same as FG-1101E but WITHOUT 2 x 480GB SSDs onboard. +comments: Same as FG-1101E but **WITHOUT** 2 x 480GB SSDs onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-1101E.yaml b/device-types/Fortinet/FG-1101E.yaml index 1985722ee..e1b910aa8 100644 --- a/device-types/Fortinet/FG-1101E.yaml +++ b/device-types/Fortinet/FG-1101E.yaml @@ -4,7 +4,7 @@ slug: fg-1101e part_number: FG-1101E u_height: 2 is_full_depth: false -comments: Same as FG-1100E but WITH 2 x 480GB SSDs onboard. +comments: Same as FG-1100E but **WITH** 2 x 480GB SSDs onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-300E.yaml b/device-types/Fortinet/FG-300E.yaml index 5e3e4b6dd..973162fcf 100644 --- a/device-types/Fortinet/FG-300E.yaml +++ b/device-types/Fortinet/FG-300E.yaml @@ -4,7 +4,7 @@ slug: fg-300e part_number: FG-300E u_height: 1 is_full_depth: false -comments: Same as FG-301E but WITHOUT 2 x 240GB SSD onboard. +comments: Same as FG-301E but **WITHOUT** 2 x 240GB SSD onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-301E.yaml b/device-types/Fortinet/FG-301E.yaml index 83d5dc877..854d12bf6 100644 --- a/device-types/Fortinet/FG-301E.yaml +++ b/device-types/Fortinet/FG-301E.yaml @@ -4,7 +4,7 @@ slug: fg-301e part_number: FG-301E u_height: 1 is_full_depth: false -comments: Same as FG-300E but WITH 2 x 240GB SSD onboard. +comments: Same as FG-300E but **WITH** 2 x 240GB SSD onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-600E.yaml b/device-types/Fortinet/FG-600E.yaml index b28e047cf..e93f8c230 100644 --- a/device-types/Fortinet/FG-600E.yaml +++ b/device-types/Fortinet/FG-600E.yaml @@ -4,7 +4,7 @@ slug: fg-600e part_number: FG-600E u_height: 1 is_full_depth: false -comments: Same as FG-601E but WITHOUT 2 x 240GB SSDs onboard. +comments: Same as FG-601E but **WITHOUT** 2 x 240GB SSDs onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-601E.yaml b/device-types/Fortinet/FG-601E.yaml index aab21f1f2..3f1f0bc38 100644 --- a/device-types/Fortinet/FG-601E.yaml +++ b/device-types/Fortinet/FG-601E.yaml @@ -4,7 +4,7 @@ slug: fg-601e part_number: FG-601E u_height: 1 is_full_depth: false -comments: Same as FG-600E but WITH 2 x 240GB SSDs onboard. +comments: Same as FG-600E but **WITH** 2 x 240GB SSDs onboard. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-80E-POE.yaml b/device-types/Fortinet/FG-80E-POE.yaml index c563a4f49..2f3697d14 100644 --- a/device-types/Fortinet/FG-80E-POE.yaml +++ b/device-types/Fortinet/FG-80E-POE.yaml @@ -4,7 +4,7 @@ slug: fg-80e-poe part_number: FG-80E-POE u_height: 1 is_full_depth: false -comments: Same as FG-81E-poe but WITHOUT a 128GB SSD onboard. Has 12 x 1G POE. +comments: Same as FG-81E-poe but **WITHOUT** a 128GB SSD onboard. Has 12 x 1G POE. console-ports: - name: Console type: rj-45 @@ -56,7 +56,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-80E.yaml b/device-types/Fortinet/FG-80E.yaml index 73cce79be..6f67b47de 100644 --- a/device-types/Fortinet/FG-80E.yaml +++ b/device-types/Fortinet/FG-80E.yaml @@ -4,7 +4,7 @@ slug: fg-80e part_number: FG-80E u_height: 1 is_full_depth: false -comments: Same as FG-81E but WITHOUT a 128GB SSD onboard. Has no POE. +comments: Same as FG-81E but **WITHOUT** a 128GB SSD onboard. Has no POE. console-ports: - name: Console type: rj-45 @@ -44,7 +44,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-81E-POE.yaml b/device-types/Fortinet/FG-81E-POE.yaml index 0ca5b7f6a..ade37d4d7 100644 --- a/device-types/Fortinet/FG-81E-POE.yaml +++ b/device-types/Fortinet/FG-81E-POE.yaml @@ -4,7 +4,7 @@ slug: fg-81e-poe part_number: FG-81E-POE u_height: 1 is_full_depth: false -comments: Same as FG-80E-POE but WITH a 128GB SSD onboard. Has 12 x 1G POE. +comments: Same as FG-80E-POE but **WITH** a 128GB SSD onboard. Has 12 x 1G POE. console-ports: - name: Console type: rj-45 @@ -56,7 +56,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) diff --git a/device-types/Fortinet/FG-81E.yaml b/device-types/Fortinet/FG-81E.yaml index 01db5d90f..f4fc0df5d 100644 --- a/device-types/Fortinet/FG-81E.yaml +++ b/device-types/Fortinet/FG-81E.yaml @@ -4,7 +4,7 @@ slug: fg-81e part_number: FG-81E u_height: 1 is_full_depth: false -comments: Same as FG-80E but WITH a 128GB SSD onboard. Has no POE. +comments: Same as FG-80E but **WITH** a 128GB SSD onboard. Has no POE. console-ports: - name: Console type: rj-45 @@ -44,7 +44,7 @@ interfaces: type: 1000base-t - name: wan1 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) - name: wan2 type: 1000base-x-sfp - # comments: shared media (You can use 1 of the 2 ports WITH this name. 1 is 1000base-x-sfp & the other is 1000base-t.) + # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.) From b9b1dee26f18b6c4e27bc9f179b47efbe40f1801 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Tue, 31 Mar 2020 13:43:42 -0400 Subject: [PATCH 09/11] Fortigate comment grammar updates --- device-types/Fortinet/FG-100F.yaml | 2 +- device-types/Fortinet/FG-101F.yaml | 2 +- device-types/Fortinet/FG-1100E.yaml | 2 +- device-types/Fortinet/FG-1101E.yaml | 2 +- device-types/Fortinet/FG-300E.yaml | 2 +- device-types/Fortinet/FG-301E.yaml | 2 +- device-types/Fortinet/FG-600E.yaml | 2 +- device-types/Fortinet/FG-601E.yaml | 2 +- device-types/Fortinet/FG-80E-POE.yaml | 2 +- device-types/Fortinet/FG-80E.yaml | 2 +- device-types/Fortinet/FG-81E-POE.yaml | 2 +- device-types/Fortinet/FG-81E.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/device-types/Fortinet/FG-100F.yaml b/device-types/Fortinet/FG-100F.yaml index 39fb5f791..dd9d40538 100644 --- a/device-types/Fortinet/FG-100F.yaml +++ b/device-types/Fortinet/FG-100F.yaml @@ -4,7 +4,7 @@ slug: fg-100f part_number: FG-100F u_height: 1 is_full_depth: false -comments: Same as FG-101F but **WITHOUT** a 480GB SSD onboard. +comments: Same as FG-101F , but **WITHOUT** a 480GB SSD on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-101F.yaml b/device-types/Fortinet/FG-101F.yaml index b54a8f40c..a87103b6c 100644 --- a/device-types/Fortinet/FG-101F.yaml +++ b/device-types/Fortinet/FG-101F.yaml @@ -4,7 +4,7 @@ slug: fg-101f part_number: FG-101F u_height: 1 is_full_depth: false -comments: Same as FG-100F but **WITH** a 480GB SSD onboard. +comments: Same as FG-100F , but **WITH** a 480GB SSD on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-1100E.yaml b/device-types/Fortinet/FG-1100E.yaml index 41097f290..78943f54b 100644 --- a/device-types/Fortinet/FG-1100E.yaml +++ b/device-types/Fortinet/FG-1100E.yaml @@ -4,7 +4,7 @@ slug: fg-1100e part_number: FG-1100E u_height: 2 is_full_depth: false -comments: Same as FG-1101E but **WITHOUT** 2 x 480GB SSDs onboard. +comments: Same as FG-1101E , but **WITHOUT** 2 x 480GB SSDs on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-1101E.yaml b/device-types/Fortinet/FG-1101E.yaml index e1b910aa8..9964072dc 100644 --- a/device-types/Fortinet/FG-1101E.yaml +++ b/device-types/Fortinet/FG-1101E.yaml @@ -4,7 +4,7 @@ slug: fg-1101e part_number: FG-1101E u_height: 2 is_full_depth: false -comments: Same as FG-1100E but **WITH** 2 x 480GB SSDs onboard. +comments: Same as FG-1100E , but **WITH** 2 x 480GB SSDs on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-300E.yaml b/device-types/Fortinet/FG-300E.yaml index 973162fcf..3b76a8346 100644 --- a/device-types/Fortinet/FG-300E.yaml +++ b/device-types/Fortinet/FG-300E.yaml @@ -4,7 +4,7 @@ slug: fg-300e part_number: FG-300E u_height: 1 is_full_depth: false -comments: Same as FG-301E but **WITHOUT** 2 x 240GB SSD onboard. +comments: Same as FG-301E , but **WITHOUT** 2 x 240GB SSD on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-301E.yaml b/device-types/Fortinet/FG-301E.yaml index 854d12bf6..7f86d57cc 100644 --- a/device-types/Fortinet/FG-301E.yaml +++ b/device-types/Fortinet/FG-301E.yaml @@ -4,7 +4,7 @@ slug: fg-301e part_number: FG-301E u_height: 1 is_full_depth: false -comments: Same as FG-300E but **WITH** 2 x 240GB SSD onboard. +comments: Same as FG-300E , but **WITH** 2 x 240GB SSD on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-600E.yaml b/device-types/Fortinet/FG-600E.yaml index e93f8c230..0365d3ac1 100644 --- a/device-types/Fortinet/FG-600E.yaml +++ b/device-types/Fortinet/FG-600E.yaml @@ -4,7 +4,7 @@ slug: fg-600e part_number: FG-600E u_height: 1 is_full_depth: false -comments: Same as FG-601E but **WITHOUT** 2 x 240GB SSDs onboard. +comments: Same as FG-601E , but **WITHOUT** 2 x 240GB SSDs on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-601E.yaml b/device-types/Fortinet/FG-601E.yaml index 3f1f0bc38..514f50664 100644 --- a/device-types/Fortinet/FG-601E.yaml +++ b/device-types/Fortinet/FG-601E.yaml @@ -4,7 +4,7 @@ slug: fg-601e part_number: FG-601E u_height: 1 is_full_depth: false -comments: Same as FG-600E but **WITH** 2 x 240GB SSDs onboard. +comments: Same as FG-600E , but **WITH** 2 x 240GB SSDs on-board. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-80E-POE.yaml b/device-types/Fortinet/FG-80E-POE.yaml index 2f3697d14..6c22fd6d7 100644 --- a/device-types/Fortinet/FG-80E-POE.yaml +++ b/device-types/Fortinet/FG-80E-POE.yaml @@ -4,7 +4,7 @@ slug: fg-80e-poe part_number: FG-80E-POE u_height: 1 is_full_depth: false -comments: Same as FG-81E-poe but **WITHOUT** a 128GB SSD onboard. Has 12 x 1G POE. +comments: Same as FG-81E-poe , but **WITHOUT** a 128GB SSD on-board. Has 12 x 1G POE. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-80E.yaml b/device-types/Fortinet/FG-80E.yaml index 6f67b47de..68d03ca79 100644 --- a/device-types/Fortinet/FG-80E.yaml +++ b/device-types/Fortinet/FG-80E.yaml @@ -4,7 +4,7 @@ slug: fg-80e part_number: FG-80E u_height: 1 is_full_depth: false -comments: Same as FG-81E but **WITHOUT** a 128GB SSD onboard. Has no POE. +comments: Same as FG-81E , but **WITHOUT** a 128GB SSD on-board. Has no POE. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-81E-POE.yaml b/device-types/Fortinet/FG-81E-POE.yaml index ade37d4d7..12b413193 100644 --- a/device-types/Fortinet/FG-81E-POE.yaml +++ b/device-types/Fortinet/FG-81E-POE.yaml @@ -4,7 +4,7 @@ slug: fg-81e-poe part_number: FG-81E-POE u_height: 1 is_full_depth: false -comments: Same as FG-80E-POE but **WITH** a 128GB SSD onboard. Has 12 x 1G POE. +comments: Same as FG-80E-POE , but **WITH** a 128GB SSD on-board. Has 12 x 1G POE. console-ports: - name: Console type: rj-45 diff --git a/device-types/Fortinet/FG-81E.yaml b/device-types/Fortinet/FG-81E.yaml index f4fc0df5d..12e775af7 100644 --- a/device-types/Fortinet/FG-81E.yaml +++ b/device-types/Fortinet/FG-81E.yaml @@ -4,7 +4,7 @@ slug: fg-81e part_number: FG-81E u_height: 1 is_full_depth: false -comments: Same as FG-80E but **WITH** a 128GB SSD onboard. Has no POE. +comments: Same as FG-80E , but **WITH** a 128GB SSD on-board. Has no POE. console-ports: - name: Console type: rj-45 From 7d34f3290784113c795e6514b7215e4300664085 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Thu, 2 Apr 2020 21:05:58 -0400 Subject: [PATCH 10/11] duplicate interface names --- device-types/Arista/DCS-7050SX3-48YC12.yaml | 2 +- device-types/Arista/DCS-7050TX3-48C8.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-types/Arista/DCS-7050SX3-48YC12.yaml b/device-types/Arista/DCS-7050SX3-48YC12.yaml index 6fba8b583..8afff37a1 100644 --- a/device-types/Arista/DCS-7050SX3-48YC12.yaml +++ b/device-types/Arista/DCS-7050SX3-48YC12.yaml @@ -102,7 +102,7 @@ interfaces: type: 25gbase-x-sfp28 - name: Ethernet42 type: 25gbase-x-sfp28 - - name: Ethernet33 + - name: Ethernet43 type: 25gbase-x-sfp28 - name: Ethernet44 type: 25gbase-x-sfp28 diff --git a/device-types/Arista/DCS-7050TX3-48C8.yaml b/device-types/Arista/DCS-7050TX3-48C8.yaml index c20ff0b39..4bba9d2f7 100644 --- a/device-types/Arista/DCS-7050TX3-48C8.yaml +++ b/device-types/Arista/DCS-7050TX3-48C8.yaml @@ -102,7 +102,7 @@ interfaces: type: 10gbase-t - name: Ethernet42 type: 10gbase-t - - name: Ethernet33 + - name: Ethernet43 type: 10gbase-t - name: Ethernet44 type: 10gbase-t From 84a22bc738eded1aff3a17531eb56087353c1437 Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Sat, 2 May 2020 22:38:13 -0400 Subject: [PATCH 11/11] closes #118 --- device-types/APC/AP8853.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-types/APC/AP8853.yaml b/device-types/APC/AP8853.yaml index 4541621ea..928b34205 100644 --- a/device-types/APC/AP8853.yaml +++ b/device-types/APC/AP8853.yaml @@ -68,7 +68,7 @@ power-outlets: type: iec-60320-c13 power_port: Power Port 1 feed_leg: A - - name: Power Outlet 1 + - name: Power Outlet 15 type: iec-60320-c19 power_port: Power Port 1 feed_leg: A