diff --git a/device-types/Arista/DCS-7050TX-64.yaml b/device-types/Arista/DCS-7050TX-64.yaml
new file mode 100644
index 00000000..7e8487cf
--- /dev/null
+++ b/device-types/Arista/DCS-7050TX-64.yaml
@@ -0,0 +1,125 @@
+---
+manufacturer: Arista
+model: DCS-7050TX-64
+slug: arista-dcs-7050tx-64
+part_number: DCS-7050TX-64
+airflow: front-to-rear
+weight: 8.6
+weight_unit: kg
+is_full_depth: true
+u_height: 1
+interfaces:
+  - name: Ethernet1
+    type: 10gbase-t
+  - name: Ethernet2
+    type: 10gbase-t
+  - name: Ethernet3
+    type: 10gbase-t
+  - name: Ethernet4
+    type: 10gbase-t
+  - name: Ethernet5
+    type: 10gbase-t
+  - name: Ethernet6
+    type: 10gbase-t
+  - name: Ethernet7
+    type: 10gbase-t
+  - name: Ethernet8
+    type: 10gbase-t
+  - name: Ethernet9
+    type: 10gbase-t
+  - name: Ethernet10
+    type: 10gbase-t
+  - name: Ethernet11
+    type: 10gbase-t
+  - name: Ethernet12
+    type: 10gbase-t
+  - name: Ethernet13
+    type: 10gbase-t
+  - name: Ethernet14
+    type: 10gbase-t
+  - name: Ethernet15
+    type: 10gbase-t
+  - name: Ethernet16
+    type: 10gbase-t
+  - name: Ethernet17
+    type: 10gbase-t
+  - name: Ethernet18
+    type: 10gbase-t
+  - name: Ethernet19
+    type: 10gbase-t
+  - name: Ethernet20
+    type: 10gbase-t
+  - name: Ethernet21
+    type: 10gbase-t
+  - name: Ethernet22
+    type: 10gbase-t
+  - name: Ethernet23
+    type: 10gbase-t
+  - name: Ethernet24
+    type: 10gbase-t
+  - name: Ethernet25
+    type: 10gbase-t
+  - name: Ethernet26
+    type: 10gbase-t
+  - name: Ethernet27
+    type: 10gbase-t
+  - name: Ethernet28
+    type: 10gbase-t
+  - name: Ethernet29
+    type: 10gbase-t
+  - name: Ethernet30
+    type: 10gbase-t
+  - name: Ethernet31
+    type: 10gbase-t
+  - name: Ethernet32
+    type: 10gbase-t
+  - name: Ethernet33
+    type: 10gbase-t
+  - name: Ethernet34
+    type: 10gbase-t
+  - name: Ethernet35
+    type: 10gbase-t
+  - name: Ethernet36
+    type: 10gbase-t
+  - name: Ethernet37
+    type: 10gbase-t
+  - name: Ethernet38
+    type: 10gbase-t
+  - name: Ethernet39
+    type: 10gbase-t
+  - name: Ethernet40
+    type: 10gbase-t
+  - name: Ethernet41
+    type: 10gbase-t
+  - name: Ethernet42
+    type: 10gbase-t
+  - name: Ethernet43
+    type: 10gbase-t
+  - name: Ethernet44
+    type: 10gbase-t
+  - name: Ethernet45
+    type: 10gbase-t
+  - name: Ethernet46
+    type: 10gbase-t
+  - name: Ethernet47
+    type: 10gbase-t
+  - name: Ethernet48
+    type: 10gbase-t
+  - name: Ethernet49
+    type: 40gbase-x-qsfpp
+  - name: Ethernet50
+    type: 40gbase-x-qsfpp
+  - name: Ethernet51
+    type: 40gbase-x-qsfpp
+  - name: Ethernet52
+    type: 40gbase-x-qsfpp
+  - name: Management1
+    type: 1000base-t
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
diff --git a/device-types/Arista/DCS-7130LBR-48S6QD-R.yaml b/device-types/Arista/DCS-7130LBR-48S6QD-R.yaml
index f39fab4b..d2cd8af5 100644
--- a/device-types/Arista/DCS-7130LBR-48S6QD-R.yaml
+++ b/device-types/Arista/DCS-7130LBR-48S6QD-R.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Arista
 model: DCS-7130LBR-48S6QD-R
-slug: arista-ddcs-7130lbr-48s6qd-r
+slug: arista-dcs-7130lbr-48s6qd-r
 part_number: DCS-7130LBR-48S6QD-R
 u_height: 1
 weight: 33
diff --git a/device-types/Arista/DCS-7160-48YC6-F.yaml b/device-types/Arista/DCS-7160-48YC6-F.yaml
new file mode 100644
index 00000000..ba66fe0e
--- /dev/null
+++ b/device-types/Arista/DCS-7160-48YC6-F.yaml
@@ -0,0 +1,134 @@
+---
+manufacturer: Arista
+model: DCS-7160-48YC6-F
+slug: arista-dcs-7160-48yc6-f
+part_number: DCS-7160-48YC6-F
+u_height: 1
+weight: 19.24
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista 7160 Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/7160-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU 1
+    position: '0'
+  - name: PSU 2
+    position: '1'
+front_image: true
+rear_image: false
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 25gbase-x-sfp28
+  - name: Ethernet2
+    type: 25gbase-x-sfp28
+  - name: Ethernet3
+    type: 25gbase-x-sfp28
+  - name: Ethernet4
+    type: 25gbase-x-sfp28
+  - name: Ethernet5
+    type: 25gbase-x-sfp28
+  - name: Ethernet6
+    type: 25gbase-x-sfp28
+  - name: Ethernet7
+    type: 25gbase-x-sfp28
+  - name: Ethernet8
+    type: 25gbase-x-sfp28
+  - name: Ethernet9
+    type: 25gbase-x-sfp28
+  - name: Ethernet10
+    type: 25gbase-x-sfp28
+  - name: Ethernet11
+    type: 25gbase-x-sfp28
+  - name: Ethernet12
+    type: 25gbase-x-sfp28
+  - name: Ethernet13
+    type: 25gbase-x-sfp28
+  - name: Ethernet14
+    type: 25gbase-x-sfp28
+  - name: Ethernet15
+    type: 25gbase-x-sfp28
+  - name: Ethernet16
+    type: 25gbase-x-sfp28
+  - name: Ethernet17
+    type: 25gbase-x-sfp28
+  - name: Ethernet18
+    type: 25gbase-x-sfp28
+  - name: Ethernet19
+    type: 25gbase-x-sfp28
+  - name: Ethernet20
+    type: 25gbase-x-sfp28
+  - name: Ethernet21
+    type: 25gbase-x-sfp28
+  - name: Ethernet22
+    type: 25gbase-x-sfp28
+  - name: Ethernet23
+    type: 25gbase-x-sfp28
+  - name: Ethernet24
+    type: 25gbase-x-sfp28
+  - name: Ethernet25
+    type: 25gbase-x-sfp28
+  - name: Ethernet26
+    type: 25gbase-x-sfp28
+  - name: Ethernet27
+    type: 25gbase-x-sfp28
+  - name: Ethernet28
+    type: 25gbase-x-sfp28
+  - name: Ethernet29
+    type: 25gbase-x-sfp28
+  - name: Ethernet30
+    type: 25gbase-x-sfp28
+  - name: Ethernet31
+    type: 25gbase-x-sfp28
+  - name: Ethernet32
+    type: 25gbase-x-sfp28
+  - name: Ethernet33
+    type: 25gbase-x-sfp28
+  - name: Ethernet34
+    type: 25gbase-x-sfp28
+  - name: Ethernet35
+    type: 25gbase-x-sfp28
+  - name: Ethernet36
+    type: 25gbase-x-sfp28
+  - name: Ethernet37
+    type: 25gbase-x-sfp28
+  - name: Ethernet38
+    type: 25gbase-x-sfp28
+  - name: Ethernet39
+    type: 25gbase-x-sfp28
+  - name: Ethernet40
+    type: 25gbase-x-sfp28
+  - name: Ethernet41
+    type: 25gbase-x-sfp28
+  - name: Ethernet42
+    type: 25gbase-x-sfp28
+  - name: Ethernet43
+    type: 25gbase-x-sfp28
+  - name: Ethernet44
+    type: 25gbase-x-sfp28
+  - name: Ethernet45
+    type: 25gbase-x-sfp28
+  - name: Ethernet46
+    type: 25gbase-x-sfp28
+  - name: Ethernet47
+    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
+    type: 100gbase-x-qsfp28
+  - name: Ethernet51/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet52/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet53/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet54/1
+    type: 100gbase-x-qsfp28
diff --git a/device-types/Arista/DCS-7160-48YC6-R.yaml b/device-types/Arista/DCS-7160-48YC6-R.yaml
new file mode 100644
index 00000000..5aee4f39
--- /dev/null
+++ b/device-types/Arista/DCS-7160-48YC6-R.yaml
@@ -0,0 +1,134 @@
+---
+manufacturer: Arista
+model: DCS-7160-48YC6-R
+slug: arista-dcs-7160-48yc6-r
+part_number: DCS-7160-48YC6-R
+u_height: 1
+weight: 19.24
+weight_unit: lb
+airflow: rear-to-front
+is_full_depth: false
+comments: '[Arista 7160 Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/7160-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU 1
+    position: '0'
+  - name: PSU 2
+    position: '1'
+front_image: true
+rear_image: false
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 25gbase-x-sfp28
+  - name: Ethernet2
+    type: 25gbase-x-sfp28
+  - name: Ethernet3
+    type: 25gbase-x-sfp28
+  - name: Ethernet4
+    type: 25gbase-x-sfp28
+  - name: Ethernet5
+    type: 25gbase-x-sfp28
+  - name: Ethernet6
+    type: 25gbase-x-sfp28
+  - name: Ethernet7
+    type: 25gbase-x-sfp28
+  - name: Ethernet8
+    type: 25gbase-x-sfp28
+  - name: Ethernet9
+    type: 25gbase-x-sfp28
+  - name: Ethernet10
+    type: 25gbase-x-sfp28
+  - name: Ethernet11
+    type: 25gbase-x-sfp28
+  - name: Ethernet12
+    type: 25gbase-x-sfp28
+  - name: Ethernet13
+    type: 25gbase-x-sfp28
+  - name: Ethernet14
+    type: 25gbase-x-sfp28
+  - name: Ethernet15
+    type: 25gbase-x-sfp28
+  - name: Ethernet16
+    type: 25gbase-x-sfp28
+  - name: Ethernet17
+    type: 25gbase-x-sfp28
+  - name: Ethernet18
+    type: 25gbase-x-sfp28
+  - name: Ethernet19
+    type: 25gbase-x-sfp28
+  - name: Ethernet20
+    type: 25gbase-x-sfp28
+  - name: Ethernet21
+    type: 25gbase-x-sfp28
+  - name: Ethernet22
+    type: 25gbase-x-sfp28
+  - name: Ethernet23
+    type: 25gbase-x-sfp28
+  - name: Ethernet24
+    type: 25gbase-x-sfp28
+  - name: Ethernet25
+    type: 25gbase-x-sfp28
+  - name: Ethernet26
+    type: 25gbase-x-sfp28
+  - name: Ethernet27
+    type: 25gbase-x-sfp28
+  - name: Ethernet28
+    type: 25gbase-x-sfp28
+  - name: Ethernet29
+    type: 25gbase-x-sfp28
+  - name: Ethernet30
+    type: 25gbase-x-sfp28
+  - name: Ethernet31
+    type: 25gbase-x-sfp28
+  - name: Ethernet32
+    type: 25gbase-x-sfp28
+  - name: Ethernet33
+    type: 25gbase-x-sfp28
+  - name: Ethernet34
+    type: 25gbase-x-sfp28
+  - name: Ethernet35
+    type: 25gbase-x-sfp28
+  - name: Ethernet36
+    type: 25gbase-x-sfp28
+  - name: Ethernet37
+    type: 25gbase-x-sfp28
+  - name: Ethernet38
+    type: 25gbase-x-sfp28
+  - name: Ethernet39
+    type: 25gbase-x-sfp28
+  - name: Ethernet40
+    type: 25gbase-x-sfp28
+  - name: Ethernet41
+    type: 25gbase-x-sfp28
+  - name: Ethernet42
+    type: 25gbase-x-sfp28
+  - name: Ethernet43
+    type: 25gbase-x-sfp28
+  - name: Ethernet44
+    type: 25gbase-x-sfp28
+  - name: Ethernet45
+    type: 25gbase-x-sfp28
+  - name: Ethernet46
+    type: 25gbase-x-sfp28
+  - name: Ethernet47
+    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
+    type: 100gbase-x-qsfp28
+  - name: Ethernet51/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet52/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet53/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet54/1
+    type: 100gbase-x-qsfp28
diff --git a/device-types/Arista/DCS-7280CR3MK-32D4A-S-F.yaml b/device-types/Arista/DCS-7280CR3MK-32D4A-S-F.yaml
new file mode 100644
index 00000000..de7e79a2
--- /dev/null
+++ b/device-types/Arista/DCS-7280CR3MK-32D4A-S-F.yaml
@@ -0,0 +1,97 @@
+---
+manufacturer: Arista
+model: DCS-7280CR3MK-32D4A-S-F
+slug: arista-dcs-7280cr3mk-32d4a-s-f
+part_number: DCS-7280CR3MK-32D4A-S-F
+u_height: 1
+weight: 27
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: true
+comments: '[Arista 7280R3 MACSec Datasheet](https://www.arista.com/assets/data/pdf/Datasheets/7280R3-MACSec-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU 0
+    position: '0'
+  - name: PSU 1
+    position: '1'
+front_image: false
+rear_image: false
+interfaces:
+  - name: Ethernet1/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet2/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet3/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet4/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet5/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet6/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet7/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet8/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet9/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet10/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet11/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet12/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet13/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet14/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet15/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet16/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet17/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet18/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet19/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet20/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet21/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet22/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet23/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet24/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet25/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet26/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet27/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet28/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet29/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet30/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet31/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet32/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet33/1
+    type: 400gbase-x-qsfpdd
+  - name: Ethernet34/1
+    type: 400gbase-x-qsfpdd
+  - name: Ethernet35/1
+    type: 400gbase-x-qsfpdd
+  - name: Ethernet36/1
+    type: 400gbase-x-qsfpdd
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Arista/DCS-7280CR3MK-32D4A-S-R.yaml b/device-types/Arista/DCS-7280CR3MK-32D4A-S-R.yaml
new file mode 100644
index 00000000..431f254c
--- /dev/null
+++ b/device-types/Arista/DCS-7280CR3MK-32D4A-S-R.yaml
@@ -0,0 +1,97 @@
+---
+manufacturer: Arista
+model: DCS-7280CR3MK-32D4A-S-R
+slug: arista-dcs-7280cr3mk-32d4a-s-r
+part_number: DCS-7280CR3MK-32D4A-S-R
+u_height: 1
+weight: 27
+weight_unit: lb
+airflow: rear-to-front
+is_full_depth: true
+comments: '[Arista 7280R3 MACSec Datasheet](https://www.arista.com/assets/data/pdf/Datasheets/7280R3-MACSec-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU 0
+    position: '0'
+  - name: PSU 1
+    position: '1'
+front_image: false
+rear_image: false
+interfaces:
+  - name: Ethernet1/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet2/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet3/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet4/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet5/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet6/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet7/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet8/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet9/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet10/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet11/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet12/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet13/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet14/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet15/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet16/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet17/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet18/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet19/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet20/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet21/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet22/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet23/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet24/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet25/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet26/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet27/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet28/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet29/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet30/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet31/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet32/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet33/1
+    type: 400gbase-x-qsfpdd
+  - name: Ethernet34/1
+    type: 400gbase-x-qsfpdd
+  - name: Ethernet35/1
+    type: 400gbase-x-qsfpdd
+  - name: Ethernet36/1
+    type: 400gbase-x-qsfpdd
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Arista/DCS-7280SE-72-F.yaml b/device-types/Arista/DCS-7280SE-72-F.yaml
new file mode 100644
index 00000000..88d56ccf
--- /dev/null
+++ b/device-types/Arista/DCS-7280SE-72-F.yaml
@@ -0,0 +1,124 @@
+---
+manufacturer: Arista
+model: DCS-7280SE-72-F
+slug: arista-dcs-7280se-72-f
+part_number: DCS-7280SE-72-F
+u_height: 1
+weight: 10.2
+weight_unit: kg
+airflow: front-to-rear
+is_full_depth: false
+front_image: false
+rear_image: false
+interfaces:
+  - name: Ethernet1
+    type: 10gbase-x-sfpp
+  - name: Ethernet2
+    type: 10gbase-x-sfpp
+  - name: Ethernet3
+    type: 10gbase-x-sfpp
+  - name: Ethernet4
+    type: 10gbase-x-sfpp
+  - name: Ethernet5
+    type: 10gbase-x-sfpp
+  - name: Ethernet6
+    type: 10gbase-x-sfpp
+  - name: Ethernet7
+    type: 10gbase-x-sfpp
+  - name: Ethernet8
+    type: 10gbase-x-sfpp
+  - name: Ethernet9
+    type: 10gbase-x-sfpp
+  - name: Ethernet10
+    type: 10gbase-x-sfpp
+  - name: Ethernet11
+    type: 10gbase-x-sfpp
+  - name: Ethernet12
+    type: 10gbase-x-sfpp
+  - name: Ethernet13
+    type: 10gbase-x-sfpp
+  - name: Ethernet14
+    type: 10gbase-x-sfpp
+  - name: Ethernet15
+    type: 10gbase-x-sfpp
+  - name: Ethernet16
+    type: 10gbase-x-sfpp
+  - name: Ethernet17
+    type: 10gbase-x-sfpp
+  - name: Ethernet18
+    type: 10gbase-x-sfpp
+  - name: Ethernet19
+    type: 10gbase-x-sfpp
+  - name: Ethernet20
+    type: 10gbase-x-sfpp
+  - name: Ethernet21
+    type: 10gbase-x-sfpp
+  - name: Ethernet22
+    type: 10gbase-x-sfpp
+  - name: Ethernet23
+    type: 10gbase-x-sfpp
+  - name: Ethernet24
+    type: 10gbase-x-sfpp
+  - name: Ethernet25
+    type: 10gbase-x-sfpp
+  - name: Ethernet26
+    type: 10gbase-x-sfpp
+  - name: Ethernet27
+    type: 10gbase-x-sfpp
+  - name: Ethernet28
+    type: 10gbase-x-sfpp
+  - name: Ethernet29
+    type: 10gbase-x-sfpp
+  - name: Ethernet30
+    type: 10gbase-x-sfpp
+  - name: Ethernet31
+    type: 10gbase-x-sfpp
+  - name: Ethernet32
+    type: 10gbase-x-sfpp
+  - name: Ethernet33
+    type: 10gbase-x-sfpp
+  - name: Ethernet34
+    type: 10gbase-x-sfpp
+  - name: Ethernet35
+    type: 10gbase-x-sfpp
+  - name: Ethernet36
+    type: 10gbase-x-sfpp
+  - name: Ethernet37
+    type: 10gbase-x-sfpp
+  - name: Ethernet38
+    type: 10gbase-x-sfpp
+  - name: Ethernet39
+    type: 10gbase-x-sfpp
+  - name: Ethernet40
+    type: 10gbase-x-sfpp
+  - name: Ethernet41
+    type: 10gbase-x-sfpp
+  - name: Ethernet42
+    type: 10gbase-x-sfpp
+  - name: Ethernet43
+    type: 10gbase-x-sfpp
+  - name: Ethernet44
+    type: 10gbase-x-sfpp
+  - name: Ethernet45
+    type: 10gbase-x-sfpp
+  - name: Ethernet46
+    type: 10gbase-x-sfpp
+  - name: Ethernet47
+    type: 10gbase-x-sfpp
+  - name: Ethernet48
+    type: 10gbase-x-sfpp
+  - name: Ethernet49/1
+    type: 100gbase-x-sfpdd
+  - name: Ethernet50/1
+    type: 100gbase-x-sfpdd
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
diff --git a/device-types/Arista/DCS-7280SE-72-R.yaml b/device-types/Arista/DCS-7280SE-72-R.yaml
new file mode 100644
index 00000000..4cec3c82
--- /dev/null
+++ b/device-types/Arista/DCS-7280SE-72-R.yaml
@@ -0,0 +1,124 @@
+---
+manufacturer: Arista
+model: DCS-7280SE-72-R
+slug: arista-dcs-7280se-72-r
+part_number: DCS-7280SE-72-R
+u_height: 1
+weight: 10.2
+weight_unit: kg
+airflow: rear-to-front
+is_full_depth: false
+front_image: false
+rear_image: false
+interfaces:
+  - name: Ethernet1
+    type: 10gbase-x-sfpp
+  - name: Ethernet2
+    type: 10gbase-x-sfpp
+  - name: Ethernet3
+    type: 10gbase-x-sfpp
+  - name: Ethernet4
+    type: 10gbase-x-sfpp
+  - name: Ethernet5
+    type: 10gbase-x-sfpp
+  - name: Ethernet6
+    type: 10gbase-x-sfpp
+  - name: Ethernet7
+    type: 10gbase-x-sfpp
+  - name: Ethernet8
+    type: 10gbase-x-sfpp
+  - name: Ethernet9
+    type: 10gbase-x-sfpp
+  - name: Ethernet10
+    type: 10gbase-x-sfpp
+  - name: Ethernet11
+    type: 10gbase-x-sfpp
+  - name: Ethernet12
+    type: 10gbase-x-sfpp
+  - name: Ethernet13
+    type: 10gbase-x-sfpp
+  - name: Ethernet14
+    type: 10gbase-x-sfpp
+  - name: Ethernet15
+    type: 10gbase-x-sfpp
+  - name: Ethernet16
+    type: 10gbase-x-sfpp
+  - name: Ethernet17
+    type: 10gbase-x-sfpp
+  - name: Ethernet18
+    type: 10gbase-x-sfpp
+  - name: Ethernet19
+    type: 10gbase-x-sfpp
+  - name: Ethernet20
+    type: 10gbase-x-sfpp
+  - name: Ethernet21
+    type: 10gbase-x-sfpp
+  - name: Ethernet22
+    type: 10gbase-x-sfpp
+  - name: Ethernet23
+    type: 10gbase-x-sfpp
+  - name: Ethernet24
+    type: 10gbase-x-sfpp
+  - name: Ethernet25
+    type: 10gbase-x-sfpp
+  - name: Ethernet26
+    type: 10gbase-x-sfpp
+  - name: Ethernet27
+    type: 10gbase-x-sfpp
+  - name: Ethernet28
+    type: 10gbase-x-sfpp
+  - name: Ethernet29
+    type: 10gbase-x-sfpp
+  - name: Ethernet30
+    type: 10gbase-x-sfpp
+  - name: Ethernet31
+    type: 10gbase-x-sfpp
+  - name: Ethernet32
+    type: 10gbase-x-sfpp
+  - name: Ethernet33
+    type: 10gbase-x-sfpp
+  - name: Ethernet34
+    type: 10gbase-x-sfpp
+  - name: Ethernet35
+    type: 10gbase-x-sfpp
+  - name: Ethernet36
+    type: 10gbase-x-sfpp
+  - name: Ethernet37
+    type: 10gbase-x-sfpp
+  - name: Ethernet38
+    type: 10gbase-x-sfpp
+  - name: Ethernet39
+    type: 10gbase-x-sfpp
+  - name: Ethernet40
+    type: 10gbase-x-sfpp
+  - name: Ethernet41
+    type: 10gbase-x-sfpp
+  - name: Ethernet42
+    type: 10gbase-x-sfpp
+  - name: Ethernet43
+    type: 10gbase-x-sfpp
+  - name: Ethernet44
+    type: 10gbase-x-sfpp
+  - name: Ethernet45
+    type: 10gbase-x-sfpp
+  - name: Ethernet46
+    type: 10gbase-x-sfpp
+  - name: Ethernet47
+    type: 10gbase-x-sfpp
+  - name: Ethernet48
+    type: 10gbase-x-sfpp
+  - name: Ethernet49/1
+    type: 100gbase-x-sfpdd
+  - name: Ethernet50/1
+    type: 100gbase-x-sfpdd
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
diff --git a/device-types/Brocade/ICX-6400-EPS1500.yaml b/device-types/Brocade/ICX-6400-EPS1500.yaml
new file mode 100644
index 00000000..dae91b45
--- /dev/null
+++ b/device-types/Brocade/ICX-6400-EPS1500.yaml
@@ -0,0 +1,24 @@
+---
+manufacturer: Brocade
+model: ICX 6400-EPS1500
+slug: brocade-icx6400-eps1500
+part_number: ICX6400-EPS1500
+is_full_depth: false
+u_height: 1
+airflow: side-to-rear
+weight: 6.75
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 1600
+power-outlets:
+  - name: EPS OUT 1
+    type: dc-terminal
+    power_port: PS1
+  - name: EPS OUT 2
+    type: dc-terminal
+    power_port: PS1
+  - name: EPS OUT 3
+    type: dc-terminal
+    power_port: PS1
diff --git a/device-types/Brocade/ICX-6430-24.yaml b/device-types/Brocade/ICX-6430-24.yaml
index 06ac8b13..fb12e2e7 100644
--- a/device-types/Brocade/ICX-6430-24.yaml
+++ b/device-types/Brocade/ICX-6430-24.yaml
@@ -75,3 +75,6 @@ power-ports:
   - name: PSU0
     type: iec-60320-c14
     maximum_draw: 20
+  - name: EPS1
+    type: dc-terminal
+    maximum_draw: 20
diff --git a/device-types/Brocade/ICX-6430-48.yaml b/device-types/Brocade/ICX-6430-48.yaml
index 6b6f1ef7..6c0acb10 100644
--- a/device-types/Brocade/ICX-6430-48.yaml
+++ b/device-types/Brocade/ICX-6430-48.yaml
@@ -123,3 +123,6 @@ power-ports:
   - name: PSU0
     type: iec-60320-c14
     maximum_draw: 38
+  - name: EPS1
+    type: dc-terminal
+    maximum_draw: 38
diff --git a/device-types/Brocade/ICX-6450-24.yaml b/device-types/Brocade/ICX-6450-24.yaml
index 6af4a18f..e02d6714 100644
--- a/device-types/Brocade/ICX-6450-24.yaml
+++ b/device-types/Brocade/ICX-6450-24.yaml
@@ -75,3 +75,6 @@ power-ports:
   - name: PSU0
     type: iec-60320-c14
     maximum_draw: 37
+  - name: EPS1
+    type: dc-terminal
+    maximum_draw: 37
diff --git a/device-types/Brocade/ICX-6450-24p.yaml b/device-types/Brocade/ICX-6450-24p.yaml
index b3e16367..84b8e02e 100644
--- a/device-types/Brocade/ICX-6450-24p.yaml
+++ b/device-types/Brocade/ICX-6450-24p.yaml
@@ -76,3 +76,6 @@ power-ports:
   - name: PSU0
     type: iec-60320-c14
     maximum_draw: 400
+  - name: EPS1
+    type: dc-terminal
+    maximum_draw: 400
diff --git a/device-types/Brocade/ICX-6450-48.yaml b/device-types/Brocade/ICX-6450-48.yaml
index 070ff0e1..b834a477 100644
--- a/device-types/Brocade/ICX-6450-48.yaml
+++ b/device-types/Brocade/ICX-6450-48.yaml
@@ -120,3 +120,6 @@ power-ports:
   - name: PSU0
     type: iec-60320-c14
     maximum_draw: 55
+  - name: EPS1
+    type: dc-terminal
+    maximum_draw: 55
diff --git a/device-types/Brocade/ICX-6610-24.yaml b/device-types/Brocade/ICX-6610-24.yaml
index e6a4d6f8..996b6ae7 100644
--- a/device-types/Brocade/ICX-6610-24.yaml
+++ b/device-types/Brocade/ICX-6610-24.yaml
@@ -80,10 +80,8 @@ interfaces:
 console-ports:
   - name: con0
     type: rj-45
-power-ports:
+module-bays:
   - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 120
+    position: '1'
   - name: PSU2
-    type: iec-60320-c14
-    maximum_draw: 120
+    position: '2'
diff --git a/device-types/Brocade/ICX-6610-24F.yaml b/device-types/Brocade/ICX-6610-24F.yaml
new file mode 100644
index 00000000..07031187
--- /dev/null
+++ b/device-types/Brocade/ICX-6610-24F.yaml
@@ -0,0 +1,90 @@
+---
+manufacturer: Brocade
+model: ICX 6610-24F
+slug: brocade-icx6610-24f
+part_number: ICX6610-24F
+airflow: front-to-rear
+weight: 6.69
+weight_unit: kg
+is_full_depth: false
+u_height: 1
+interfaces:
+  - name: GigEthernetmgmt1
+    type: 1000base-t
+    mgmt_only: true
+  - name: ethernet 1/1/1
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/2
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/3
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/4
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/5
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/6
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/7
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/8
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/9
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/10
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/11
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/12
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/13
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/14
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/15
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/16
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/17
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/18
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/19
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/20
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/21
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/22
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/23
+    type: 1000base-x-sfp
+  - name: ethernet 1/1/24
+    type: 1000base-x-sfp
+  - name: ethernet 1/2/1
+    type: 40gbase-x-qsfpp
+  - name: ethernet 1/2/6
+    type: 40gbase-x-qsfpp
+  - name: ethernet 1/3/1
+    type: 10gbase-x-sfpp
+  - name: ethernet 1/3/2
+    type: 10gbase-x-sfpp
+  - name: ethernet 1/3/3
+    type: 10gbase-x-sfpp
+  - name: ethernet 1/3/4
+    type: 10gbase-x-sfpp
+  - name: ethernet 1/3/5
+    type: 10gbase-x-sfpp
+  - name: ethernet 1/3/6
+    type: 10gbase-x-sfpp
+  - name: ethernet 1/3/7
+    type: 10gbase-x-sfpp
+  - name: ethernet 1/3/8
+    type: 10gbase-x-sfpp
+console-ports:
+  - name: con0
+    type: rj-45
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Brocade/ICX-6610-48.yaml b/device-types/Brocade/ICX-6610-48.yaml
index 768dcf6d..19f523f6 100644
--- a/device-types/Brocade/ICX-6610-48.yaml
+++ b/device-types/Brocade/ICX-6610-48.yaml
@@ -128,10 +128,8 @@ interfaces:
 console-ports:
   - name: con0
     type: rj-45
-power-ports:
+module-bays:
   - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 120
+    position: '1'
   - name: PSU2
-    type: iec-60320-c14
-    maximum_draw: 120
+    position: '2'
diff --git a/device-types/Brocade/ICX-6610-48p.yaml b/device-types/Brocade/ICX-6610-48p.yaml
index 51edf4d2..aafaff0d 100644
--- a/device-types/Brocade/ICX-6610-48p.yaml
+++ b/device-types/Brocade/ICX-6610-48p.yaml
@@ -129,10 +129,8 @@ interfaces:
 console-ports:
   - name: con0
     type: rj-45
-power-ports:
+module-bays:
   - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 1000
+    position: '1'
   - name: PSU2
-    type: iec-60320-c14
-    maximum_draw: 1000
+    position: '2'
diff --git a/device-types/F5/BIG-IP-4000s.yaml b/device-types/F5/BIG-IP-4000s.yaml
new file mode 100644
index 00000000..251997a2
--- /dev/null
+++ b/device-types/F5/BIG-IP-4000s.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: F5
+model: BIG-IP 4000s
+slug: f5-big-ip-4000s
+part_number: 4000s
+u_height: 1
+is_full_depth: true
+weight: 20
+weight_unit: lb
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
+  - name: Failover
+    type: rj-45
+module-bays:
+  - name: psu1
+    position: '1'
+  - name: psu2
+    position: '2'
+interfaces:
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1.1'
+    type: 1000base-t
+  - name: '1.2'
+    type: 1000base-t
+  - name: '1.3'
+    type: 1000base-t
+  - name: '1.4'
+    type: 1000base-t
+  - name: '1.5'
+    type: 1000base-t
+  - name: '1.6'
+    type: 1000base-t
+  - name: '1.7'
+    type: 1000base-t
+  - name: '1.8'
+    type: 1000base-t
+  - name: '2.1'
+    type: 10gbase-x-sfpp
+  - name: '2.2'
+    type: 10gbase-x-sfpp
diff --git a/device-types/Fortinet/FG-1200D.yaml b/device-types/Fortinet/FG-1200D.yaml
new file mode 100644
index 00000000..2569d333
--- /dev/null
+++ b/device-types/Fortinet/FG-1200D.yaml
@@ -0,0 +1,103 @@
+---
+manufacturer: Fortinet
+model: FortiGate 1200D
+slug: fortinet-fg-1200d
+part_number: FG-1200D
+airflow: front-to-rear
+weight: 14.7
+weight_unit: kg
+u_height: 2
+is_full_depth: false
+front_image: true
+rear_image: false
+console-ports:
+  - name: usbmgmt
+    type: usb-mini-b
+  - name: Console
+    type: rj-45
+  - name: usbport1
+    type: usb-a
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+interfaces:
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+  - name: mgmt2
+    type: 1000base-t
+    mgmt_only: true
+  - name: port1
+    type: 1000base-x-sfp
+  - name: port2
+    type: 1000base-x-sfp
+  - name: port3
+    type: 1000base-x-sfp
+  - name: port4
+    type: 1000base-x-sfp
+  - name: port5
+    type: 1000base-x-sfp
+  - name: port6
+    type: 1000base-x-sfp
+  - name: port7
+    type: 1000base-x-sfp
+  - name: port8
+    type: 1000base-x-sfp
+  - name: port9
+    type: 1000base-x-sfp
+  - name: port10
+    type: 1000base-x-sfp
+  - name: port11
+    type: 1000base-x-sfp
+  - name: port12
+    type: 1000base-x-sfp
+  - name: port13
+    type: 1000base-x-sfp
+  - name: port14
+    type: 1000base-x-sfp
+  - name: port15
+    type: 1000base-x-sfp
+  - name: port16
+    type: 1000base-x-sfp
+  - name: port17
+    type: 1000base-t
+  - name: port18
+    type: 1000base-t
+  - name: port19
+    type: 1000base-t
+  - name: port20
+    type: 1000base-t
+  - name: port21
+    type: 1000base-t
+  - name: port22
+    type: 1000base-t
+  - name: port23
+    type: 1000base-t
+  - name: port24
+    type: 1000base-t
+  - name: port25
+    type: 1000base-t
+  - name: port26
+    type: 1000base-t
+  - name: port27
+    type: 1000base-t
+  - name: port28
+    type: 1000base-t
+  - name: port29
+    type: 1000base-t
+  - name: port30
+    type: 1000base-t
+  - name: port31
+    type: 1000base-t
+  - name: port32
+    type: 1000base-t
+  - name: port33
+    type: 10gbase-x-sfpp
+  - name: port34
+    type: 10gbase-x-sfpp
+  - name: port35
+    type: 10gbase-x-sfpp
+  - name: port36
+    type: 10gbase-x-sfpp
diff --git a/device-types/Fortinet/FG-201F.yaml b/device-types/Fortinet/FG-201F.yaml
new file mode 100644
index 00000000..1f7ea612
--- /dev/null
+++ b/device-types/Fortinet/FG-201F.yaml
@@ -0,0 +1,90 @@
+---
+manufacturer: Fortinet
+model: FortiGate 201F
+slug: fortinet-fg-201f
+part_number: FG-201F
+u_height: 1
+is_full_depth: false
+weight: 4.6
+weight_unit: kg
+comments: Same as FG-200F , but **WITH** SSD on-board.
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: usbport1
+    type: usb-a
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 122
+    allocated_draw: 105
+  - name: PS2
+    type: iec-60320-c14
+    maximum_draw: 122
+    allocated_draw: 105
+interfaces:
+  - name: ha
+    type: 1000base-t
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: wan1
+    type: 1000base-t
+  - name: wan2
+    type: 1000base-t
+  - name: port1
+    type: 1000base-t
+  - name: port2
+    type: 1000base-t
+  - name: port3
+    type: 1000base-t
+  - name: port4
+    type: 1000base-t
+  - name: port5
+    type: 1000base-t
+  - name: port6
+    type: 1000base-t
+  - name: port7
+    type: 1000base-t
+  - name: port8
+    type: 1000base-t
+  - name: port9
+    type: 1000base-t
+  - name: port10
+    type: 1000base-t
+  - name: port11
+    type: 1000base-t
+  - name: port12
+    type: 1000base-t
+  - name: port13
+    type: 1000base-t
+  - name: port14
+    type: 1000base-t
+  - name: port15
+    type: 1000base-t
+  - name: port16
+    type: 1000base-t
+  - name: port17
+    type: 1000base-x-sfp
+  - name: port18
+    type: 1000base-x-sfp
+  - name: port19
+    type: 1000base-x-sfp
+  - name: port20
+    type: 1000base-x-sfp
+  - name: port21
+    type: 1000base-x-sfp
+  - name: port22
+    type: 1000base-x-sfp
+  - name: port23
+    type: 1000base-x-sfp
+  - name: port24
+    type: 1000base-x-sfp
+  - name: x1
+    type: 10gbase-x-sfpp
+  - name: x2
+    type: 10gbase-x-sfpp
+  - name: x3
+    type: 10gbase-x-sfpp
+  - name: x4
+    type: 10gbase-x-sfpp
diff --git a/device-types/Fortinet/FG-500D.yaml b/device-types/Fortinet/FG-500D.yaml
new file mode 100644
index 00000000..4e8571a9
--- /dev/null
+++ b/device-types/Fortinet/FG-500D.yaml
@@ -0,0 +1,66 @@
+---
+manufacturer: Fortinet
+model: FortiGate 500D
+slug: fortinet-fg-500d
+part_number: FG-500D
+u_height: 1
+is_full_depth: false
+weight: 4.9
+weight_unit: kg
+console-ports:
+  - name: usbmgmt
+    type: usb-mini-b
+  - name: Console
+    type: rj-45
+  - name: usbport1
+    type: usb-a
+  - name: usbport2
+    type: usb-a
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 122
+    allocated_draw: 105
+  - name: FRPS
+    type: dc-terminal
+    maximum_draw: 122
+    allocated_draw: 105
+interfaces:
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+  - name: mgmt2
+    type: 1000base-t
+    mgmt_only: true
+  - name: port1
+    type: 1000base-x-sfp
+  - name: port2
+    type: 1000base-x-sfp
+  - name: port3
+    type: 1000base-x-sfp
+  - name: port4
+    type: 1000base-x-sfp
+  - name: port5
+    type: 1000base-x-sfp
+  - name: port6
+    type: 1000base-x-sfp
+  - name: port7
+    type: 1000base-x-sfp
+  - name: port8
+    type: 1000base-x-sfp
+  - name: port9
+    type: 1000base-t
+  - name: port10
+    type: 1000base-t
+  - name: port11
+    type: 1000base-t
+  - name: port12
+    type: 1000base-t
+  - name: port13
+    type: 1000base-t
+  - name: port14
+    type: 1000base-t
+  - name: port15
+    type: 1000base-t
+  - name: port16
+    type: 1000base-t
diff --git a/device-types/Fortinet/FRPS-100.yaml b/device-types/Fortinet/FRPS-100.yaml
new file mode 100644
index 00000000..ace99db9
--- /dev/null
+++ b/device-types/Fortinet/FRPS-100.yaml
@@ -0,0 +1,30 @@
+---
+manufacturer: Fortinet
+model: FortiRPS 100
+slug: fortinet-fortirps-100
+part_number: FRPS-100
+is_full_depth: false
+u_height: 1
+airflow: side-to-rear
+weight: 4.4
+weight_unit: kg
+power-ports:
+  - name: AC Input 1
+    type: iec-60320-c14
+    maximum_draw: 552
+  - name: AC Input 2
+    type: iec-60320-c14
+    maximum_draw: 552
+power-outlets:
+  - name: DC Output 1-1
+    type: dc-terminal
+    power_port: AC-Input 1
+  - name: DC Output 1-2
+    type: dc-terminal
+    power_port: AC-Input 1
+  - name: DC Output 2-1
+    type: dc-terminal
+    power_port: AC-Input 2
+  - name: DC Output 2-2
+    type: dc-terminal
+    power_port: AC-Input 2
diff --git a/device-types/HPE/Aruba-2530-48G-2SFPP.yaml b/device-types/HPE/Aruba-2530-48G-2SFPP.yaml
new file mode 100644
index 00000000..af54f26d
--- /dev/null
+++ b/device-types/HPE/Aruba-2530-48G-2SFPP.yaml
@@ -0,0 +1,118 @@
+---
+manufacturer: HPE
+model: Aruba 2530-48G-2SFP+
+slug: hpe-aruba-2530-48g-2sfpp
+part_number: J9855A
+u_height: 1
+is_full_depth: false
+comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N113F7)'
+weight: 3.08
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 55
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-t
+  - name: '28'
+    type: 1000base-t
+  - name: '29'
+    type: 1000base-t
+  - name: '30'
+    type: 1000base-t
+  - name: '31'
+    type: 1000base-t
+  - name: '32'
+    type: 1000base-t
+  - name: '33'
+    type: 1000base-t
+  - name: '34'
+    type: 1000base-t
+  - name: '35'
+    type: 1000base-t
+  - name: '36'
+    type: 1000base-t
+  - name: '37'
+    type: 1000base-t
+  - name: '38'
+    type: 1000base-t
+  - name: '39'
+    type: 1000base-t
+  - name: '40'
+    type: 1000base-t
+  - name: '41'
+    type: 1000base-t
+  - name: '42'
+    type: 1000base-t
+  - name: '43'
+    type: 1000base-t
+  - name: '44'
+    type: 1000base-t
+  - name: '45'
+    type: 1000base-t
+  - name: '46'
+    type: 1000base-t
+  - name: '47'
+    type: 1000base-t
+  - name: '48'
+    type: 1000base-t
+  - name: '49'
+    type: 1000base-x-sfp
+  - name: '50'
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/Aruba-2620-24-PoEP.yml b/device-types/HPE/Aruba-2620-24-PoEP.yml
index 9244c557..f88a88bb 100644
--- a/device-types/HPE/Aruba-2620-24-PoEP.yml
+++ b/device-types/HPE/Aruba-2620-24-PoEP.yml
@@ -18,52 +18,100 @@ power-ports:
 interfaces:
   - name: '1'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '2'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '3'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '4'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '5'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '6'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '7'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '8'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '9'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '10'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '11'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '12'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '13'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '14'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '15'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '16'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '17'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '18'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '19'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '20'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '21'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '22'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '23'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '24'
     type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
   - name: '25'
     type: 1000base-t
   - name: '26'
diff --git a/device-types/HPE/Aruba-2620-48-PoEP.yml b/device-types/HPE/Aruba-2620-48-PoEP.yml
new file mode 100644
index 00000000..ea029c49
--- /dev/null
+++ b/device-types/HPE/Aruba-2620-48-PoEP.yml
@@ -0,0 +1,219 @@
+---
+manufacturer: HPE
+model: Aruba 2620-48 PoE+
+slug: hpe-aruba-2620-48-poep
+part_number: J9627A
+u_height: 1
+is_full_depth: false
+weight: 5.23
+weight_unit: kg
+comments: '[HPE Aruba 2620 Switch Series](https://www.hpe.com/psnow/doc/c04111491.pdf?jumpid=in_lit-psnow-getpdf)'
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 437
+interfaces:
+  - name: '1'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '2'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '3'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '4'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '5'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '6'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '7'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '8'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '9'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '10'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '11'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '12'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '13'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '14'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '15'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '16'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '17'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '18'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '19'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '20'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '21'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '22'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '23'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '24'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '25'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '26'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '27'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '28'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '29'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '30'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '31'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '32'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '33'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '34'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '35'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '36'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '37'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '38'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '39'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '40'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '41'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '42'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '43'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '44'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '45'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '46'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '47'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '48'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '49'
+    type: 1000base-t
+  - name: '50'
+    type: 1000base-t
+# slots:
+  - name: '51'
+    type: 1000base-x-sfp
+  - name: '52'
+    type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2510G-48.yaml b/device-types/HPE/ProCurve-2510G-48.yaml
index ba7967bf..0136c424 100644
--- a/device-types/HPE/ProCurve-2510G-48.yaml
+++ b/device-types/HPE/ProCurve-2510G-48.yaml
@@ -2,6 +2,7 @@
 manufacturer: HPE
 model: ProCurve 2510G-48
 slug: hpe-procurve-2510g-48
+part_number: J9020A
 u_height: 1
 is_full_depth: false
 airflow: side-to-rear
diff --git a/device-types/HPE/ProCurve-2610-24-PoE.yaml b/device-types/HPE/ProCurve-2610-24-PoE.yaml
index a10aa9f3..25f36fa9 100644
--- a/device-types/HPE/ProCurve-2610-24-PoE.yaml
+++ b/device-types/HPE/ProCurve-2610-24-PoE.yaml
@@ -18,52 +18,100 @@ power-ports:
 interfaces:
   - name: '1'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '2'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '3'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '4'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '5'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '6'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '7'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '8'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '9'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '10'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '11'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '12'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '13'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '14'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '15'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '16'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '17'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '18'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '19'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '20'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '21'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '22'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '23'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '24'
     type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
   - name: '25'
     type: 1000base-t
   - name: '26'
diff --git a/device-types/HPE/ProCurve-2610-48-PoE.yaml b/device-types/HPE/ProCurve-2610-48-PoE.yaml
new file mode 100644
index 00000000..03b13de2
--- /dev/null
+++ b/device-types/HPE/ProCurve-2610-48-PoE.yaml
@@ -0,0 +1,214 @@
+---
+manufacturer: HPE
+model: ProCurve 2610-48-PoE
+slug: hpe-procurve-2610-48-poe
+part_number: J9089A
+u_height: 1
+is_full_depth: false
+weight: 7.58
+weight_unit: kg
+comments: '[HP Switch 2610 Series](https://www.hpe.com/psnow/doc/c04111724.pdf?jumpid=in_lit-psnow-getpdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 492
+interfaces:
+  - name: '1'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '2'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '3'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '4'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '5'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '6'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '7'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '8'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '9'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '10'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '11'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '12'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '13'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '14'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '15'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '16'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '17'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '18'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '19'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '20'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '21'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '22'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '23'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '24'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '25'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '26'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '27'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '28'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '29'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '30'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '31'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '32'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '33'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '34'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '35'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '36'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '37'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '38'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '39'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '40'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '41'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '42'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '43'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '44'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '45'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '46'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '47'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '48'
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: '49'
+    type: 1000base-t
+  - name: '50'
+    type: 1000base-t
diff --git a/device-types/HPE/ProCurve-2824.yaml b/device-types/HPE/ProCurve-2824.yaml
index 293daa90..09adf222 100644
--- a/device-types/HPE/ProCurve-2824.yaml
+++ b/device-types/HPE/ProCurve-2824.yaml
@@ -15,6 +15,9 @@ power-ports:
   - name: PS1
     type: iec-60320-c14
     maximum_draw: 100
+  - name: RPS
+    type: dc-terminal
+    maximum_draw: 100
 interfaces:
   - name: '1'
     type: 1000base-t
diff --git a/device-types/HPE/ProCurve-2848.yaml b/device-types/HPE/ProCurve-2848.yaml
new file mode 100644
index 00000000..1e7a5f20
--- /dev/null
+++ b/device-types/HPE/ProCurve-2848.yaml
@@ -0,0 +1,126 @@
+---
+manufacturer: HPE
+model: ProCurve 2848
+slug: hpe-procurve-2848
+part_number: J4904A
+u_height: 1
+is_full_depth: false
+comments: '[HP ProCurve Switch 2800 Series](https://www.hpe.com/psnow/doc/c04284111.html?jumpid=in_lit-psnow-red)'
+weight: 4.84
+weight_unit: kg
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 100
+  - name: RPS
+    type: dc-terminal
+    maximum_draw: 100
+interfaces:
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-t
+  - name: '28'
+    type: 1000base-t
+  - name: '29'
+    type: 1000base-t
+  - name: '30'
+    type: 1000base-t
+  - name: '31'
+    type: 1000base-t
+  - name: '32'
+    type: 1000base-t
+  - name: '33'
+    type: 1000base-t
+  - name: '34'
+    type: 1000base-t
+  - name: '35'
+    type: 1000base-t
+  - name: '36'
+    type: 1000base-t
+  - name: '37'
+    type: 1000base-t
+  - name: '38'
+    type: 1000base-t
+  - name: '39'
+    type: 1000base-t
+  - name: '40'
+    type: 1000base-t
+  - name: '41'
+    type: 1000base-t
+  - name: '42'
+    type: 1000base-t
+  - name: '43'
+    type: 1000base-t
+  - name: '44'
+    type: 1000base-t
+# dual personality port
+  - name: '45'
+    type: 1000base-t
+# - name: '45'
+#   type: 1000base-x-sfp
+  - name: '46'
+    type: 1000base-t
+# - name: '46'
+#   type: 1000base-x-sfp
+  - name: '47'
+    type: 1000base-t
+# - name: '47'
+#   type: 1000base-x-sfp
+  - name: '48'
+    type: 1000base-t
+# - name: '48'
+#   type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-2900-48G.yaml b/device-types/HPE/ProCurve-2900-48G.yaml
new file mode 100644
index 00000000..5b125e88
--- /dev/null
+++ b/device-types/HPE/ProCurve-2900-48G.yaml
@@ -0,0 +1,137 @@
+---
+manufacturer: HPE
+model: ProCurve 2900-48G
+slug: hpe-procurve-2900-48g
+part_number: J9050A
+u_height: 1
+is_full_depth: false
+weight: 7
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 200
+  - name: RPS
+    type: dc-terminal
+    maximum_draw: 200
+console-ports:
+  - name: Console
+    type: de-9
+interfaces:
+  - name: Management
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-t
+  - name: '28'
+    type: 1000base-t
+  - name: '29'
+    type: 1000base-t
+  - name: '30'
+    type: 1000base-t
+  - name: '31'
+    type: 1000base-t
+  - name: '32'
+    type: 1000base-t
+  - name: '33'
+    type: 1000base-t
+  - name: '34'
+    type: 1000base-t
+  - name: '35'
+    type: 1000base-t
+  - name: '36'
+    type: 1000base-t
+  - name: '37'
+    type: 1000base-t
+  - name: '38'
+    type: 1000base-t
+  - name: '39'
+    type: 1000base-t
+  - name: '40'
+    type: 1000base-t
+  - name: '41'
+    type: 1000base-t
+  - name: '42'
+    type: 1000base-t
+  - name: '43'
+    type: 1000base-t
+  - name: '44'
+    type: 1000base-t
+# dual personality, 1000base-t
+  - name: '45'
+    type: 1000base-t
+  - name: '46'
+    type: 1000base-t
+  - name: '47'
+    type: 1000base-t
+  - name: '48'
+    type: 1000base-t
+# dual personality, 1000base-x-sfp
+#  - name: '45'
+#    type: 1000base-x-sfp
+#  - name: '46'
+#    type: 1000base-x-sfp
+#  - name: '47'
+#    type: 1000base-x-sfp
+#  - name: '48'
+#    type: 1000base-x-sfp
+  - name: A1
+    type: 10gbase-x-x2
+  - name: A2
+    type: 10gbase-cx4
+  - name: A3
+    type: 10gbase-cx4
+  - name: A4
+    type: 10gbase-x-x2
diff --git a/device-types/HPE/ProCurve-2910al-24G.yaml b/device-types/HPE/ProCurve-2910al-24G.yaml
index e5c4e091..633f2142 100644
--- a/device-types/HPE/ProCurve-2910al-24G.yaml
+++ b/device-types/HPE/ProCurve-2910al-24G.yaml
@@ -11,6 +11,9 @@ power-ports:
   - name: PS1
     type: iec-60320-c14
     maximum_draw: 82
+  - name: RPS
+    type: dc-terminal
+    maximum_draw: 100
 comments: '[HPE 2910al Switch Series](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01844343)'
 console-ports:
   - name: Console
diff --git a/device-types/HPE/ProCurve-2910al-48G.yaml b/device-types/HPE/ProCurve-2910al-48G.yaml
new file mode 100644
index 00000000..1a706e7a
--- /dev/null
+++ b/device-types/HPE/ProCurve-2910al-48G.yaml
@@ -0,0 +1,127 @@
+---
+manufacturer: HPE
+model: ProCurve 2910al-48G
+slug: hpe-procurve-2910al-48g
+part_number: J9147A
+u_height: 1
+is_full_depth: false
+weight: 5.08
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 105
+  - name: RPS
+    type: dc-terminal
+    maximum_draw: 100
+comments: '[HPE 2910al Switch Series](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c01844343)'
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-t
+  - name: '28'
+    type: 1000base-t
+  - name: '29'
+    type: 1000base-t
+  - name: '30'
+    type: 1000base-t
+  - name: '31'
+    type: 1000base-t
+  - name: '32'
+    type: 1000base-t
+  - name: '33'
+    type: 1000base-t
+  - name: '34'
+    type: 1000base-t
+  - name: '35'
+    type: 1000base-t
+  - name: '36'
+    type: 1000base-t
+  - name: '37'
+    type: 1000base-t
+  - name: '38'
+    type: 1000base-t
+  - name: '39'
+    type: 1000base-t
+  - name: '40'
+    type: 1000base-t
+  - name: '41'
+    type: 1000base-t
+  - name: '42'
+    type: 1000base-t
+  - name: '43'
+    type: 1000base-t
+  - name: '44'
+    type: 1000base-t
+# dual personality option 1000base-t
+  - name: '45'
+    type: 1000base-t
+  - name: '46'
+    type: 1000base-t
+  - name: '47'
+    type: 1000base-t
+  - name: '48'
+    type: 1000base-t
+# dual personality option SFP
+#  - name: '45'
+#    type: 1000base-x-sfp
+#  - name: '46'
+#    type: 1000base-x-sfp
+#  - name: '47'
+#    type: 1000base-x-sfp
+#  - name: '48'
+#    type: 1000base-x-sfp
diff --git a/device-types/HPE/ProCurve-600.yaml b/device-types/HPE/ProCurve-600.yaml
new file mode 100644
index 00000000..34b712b0
--- /dev/null
+++ b/device-types/HPE/ProCurve-600.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: HPE
+model: ProCurve 600
+slug: hpe-procurve-600
+part_number: J8168A
+u_height: 1
+is_full_depth: false
+comments: '[HP ProCurve 600](https://ftp.hp.com/pub/networking/software/59906035-e1.pdf)'
+weight: 5.3
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 821
+power-outlets:
+  - name: RPS1
+    type: dc-terminal
+    power_port: PS1
+  - name: RPS2
+    type: dc-terminal
+    power_port: PS1
+  - name: RPS3
+    type: dc-terminal
+    power_port: PS1
+  - name: RPS4
+    type: dc-terminal
+    power_port: PS1
+  - name: RPS5
+    type: dc-terminal
+    power_port: PS1
+  - name: RPS6
+    type: dc-terminal
+    power_port: PS1
+  - name: EPS1
+    type: dc-terminal
+    power_port: PS1
+  - name: EPS2
+    type: dc-terminal
+    power_port: PS1
diff --git a/device-types/HPE/ProCurve-630.yaml b/device-types/HPE/ProCurve-630.yaml
new file mode 100644
index 00000000..fef5e8a9
--- /dev/null
+++ b/device-types/HPE/ProCurve-630.yaml
@@ -0,0 +1,21 @@
+---
+manufacturer: HPE
+model: ProCurve 630
+slug: hpe-procurve-630
+part_number: J9443A
+u_height: 1
+is_full_depth: false
+comments: '[HP ProCurve 630](https://support.hpe.com/hpesc/public/docDisplay?docId=c01844319&page=GUID-1E1EB048-A628-446E-83DF-C2B76B71F107.html&docLocale=en_US)'
+weight: 3.58
+weight_unit: kg
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 740
+power-outlets:
+  - name: RPS
+    type: dc-terminal
+    power_port: PS1
+  - name: EPS
+    type: dc-terminal
+    power_port: PS1
diff --git a/elevation-images/Arista/arista-dcs-7160-48yc6-f.front.png b/elevation-images/Arista/arista-dcs-7160-48yc6-f.front.png
new file mode 100644
index 00000000..ac01bdb4
Binary files /dev/null and b/elevation-images/Arista/arista-dcs-7160-48yc6-f.front.png differ
diff --git a/elevation-images/Arista/arista-dcs-7160-48yc6-r.front.png b/elevation-images/Arista/arista-dcs-7160-48yc6-r.front.png
new file mode 100644
index 00000000..ac01bdb4
Binary files /dev/null and b/elevation-images/Arista/arista-dcs-7160-48yc6-r.front.png differ
diff --git a/elevation-images/Fortinet/fortinet-fg-1200d.front.png b/elevation-images/Fortinet/fortinet-fg-1200d.front.png
new file mode 100644
index 00000000..1dae2272
Binary files /dev/null and b/elevation-images/Fortinet/fortinet-fg-1200d.front.png differ
diff --git a/module-types/Brocade/RPS15-E.yaml b/module-types/Brocade/RPS15-E.yaml
new file mode 100644
index 00000000..c7812f69
--- /dev/null
+++ b/module-types/Brocade/RPS15-E.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Brocade
+model: RPS15-E
+description: Brocade ICX 6610/6650 non-PoE 250 W PSU, power-supply-side exhaust airflow
+part_number: RPS15-E
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 250
diff --git a/module-types/Brocade/RPS15-I.yaml b/module-types/Brocade/RPS15-I.yaml
new file mode 100644
index 00000000..2a692ec0
--- /dev/null
+++ b/module-types/Brocade/RPS15-I.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Brocade
+model: RPS15-I
+description: Brocade ICX 6610/6650 non-PoE 250 W PSU, power-supply-side intake airflow
+part_number: RPS15-I
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 250
diff --git a/module-types/Brocade/RPS16-E.yaml b/module-types/Brocade/RPS16-E.yaml
new file mode 100644
index 00000000..f1e2666a
--- /dev/null
+++ b/module-types/Brocade/RPS16-E.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Brocade
+model: RPS16-E
+description: 1,000 W power supply for Brocade ICX 6610 PoE models, power-supply-side exhaust airflow
+part_number: RPS16-E
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 1000
diff --git a/module-types/Brocade/RPS16-I.yaml b/module-types/Brocade/RPS16-I.yaml
new file mode 100644
index 00000000..13219f32
--- /dev/null
+++ b/module-types/Brocade/RPS16-I.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Brocade
+model: RPS16-I
+description: 1,000 W power supply for Brocade ICX 6610 PoE models, power-supply-side intake airflow
+part_number: RPS16-E
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 1000
diff --git a/module-types/F5/PWR-0187.yaml b/module-types/F5/PWR-0187.yaml
new file mode 100644
index 00000000..6d76de0b
--- /dev/null
+++ b/module-types/F5/PWR-0187.yaml
@@ -0,0 +1,7 @@
+---
+manufacturer: F5
+model: PWR-0187
+part_number: PWR-0187
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
diff --git a/module-types/Fortinet/SP-FG1240B-PS.yaml b/module-types/Fortinet/SP-FG1240B-PS.yaml
new file mode 100644
index 00000000..be82657b
--- /dev/null
+++ b/module-types/Fortinet/SP-FG1240B-PS.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: Fortinet
+model: SP-FG1240B-PS
+part_number: SP-FG1240B-PS
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 332