diff --git a/device-types/Arista/CCS-720XP-24Y6-2F.yaml b/device-types/Arista/CCS-720XP-24Y6-2F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d0e8fa7626fd5a9a240184f1882fd7b91bd8c7f9
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-24Y6-2F.yaml
@@ -0,0 +1,131 @@
+---
+manufacturer: Arista
+model: CCS-720XP-24Y6-2F
+slug: arista-ccs-720xp-24y6-2f
+part_number: CCS-720XP-24Y6-2F
+u_height: 1
+weight: 13.3
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - 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
diff --git a/device-types/Arista/CCS-720XP-24Y6-F.yaml b/device-types/Arista/CCS-720XP-24Y6-F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..282f455d80a157b4aef8ee2f9f5c22b908b618af
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-24Y6-F.yaml
@@ -0,0 +1,131 @@
+---
+manufacturer: Arista
+model: CCS-720XP-24Y6-F
+slug: arista-ccs-720xp-24y6-f
+part_number: CCS-720XP-24Y6-F
+u_height: 1
+weight: 13.3
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - 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
diff --git a/device-types/Arista/CCS-720XP-24Y6.yaml b/device-types/Arista/CCS-720XP-24Y6.yaml
deleted file mode 100644
index c2d23b1dcbd29fb70bd0f114639478a98251e402..0000000000000000000000000000000000000000
--- a/device-types/Arista/CCS-720XP-24Y6.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-manufacturer: Arista
-model: CCS-720XP-24Y6
-slug: arista-ccs-720xp-24y6
-part_number: CCS-720XP-24Y6
-u_height: 1
-is_full_depth: false
-console-ports:
-  - name: Console
-    type: rj-45
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-interfaces:
-  - name: Ethernet1
-    type: 1000base-t
-  - name: Ethernet2
-    type: 1000base-t
-  - name: Ethernet3
-    type: 1000base-t
-  - name: Ethernet4
-    type: 1000base-t
-  - name: Ethernet5
-    type: 1000base-t
-  - name: Ethernet6
-    type: 1000base-t
-  - name: Ethernet7
-    type: 1000base-t
-  - name: Ethernet8
-    type: 1000base-t
-  - name: Ethernet9
-    type: 1000base-t
-  - name: Ethernet10
-    type: 1000base-t
-  - name: Ethernet11
-    type: 1000base-t
-  - name: Ethernet12
-    type: 1000base-t
-  - name: Ethernet13
-    type: 1000base-t
-  - name: Ethernet14
-    type: 1000base-t
-  - name: Ethernet15
-    type: 1000base-t
-  - name: Ethernet16
-    type: 1000base-t
-  - name: Ethernet17
-    type: 1000base-t
-  - name: Ethernet18
-    type: 1000base-t
-  - name: Ethernet19
-    type: 1000base-t
-  - name: Ethernet20
-    type: 1000base-t
-  - name: Ethernet21
-    type: 1000base-t
-  - name: Ethernet22
-    type: 1000base-t
-  - name: Ethernet23
-    type: 1000base-t
-  - name: Ethernet24
-    type: 1000base-t
-  - 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: Management1
-    type: 1000base-t
-    mgmt_only: true
diff --git a/device-types/Arista/CCS-720XP-24ZY4-2F.yaml b/device-types/Arista/CCS-720XP-24ZY4-2F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6dc4236379fc107adb0119638cd9530a15c435a9
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-24ZY4-2F.yaml
@@ -0,0 +1,127 @@
+---
+manufacturer: Arista
+model: CCS-720XP-24ZY4-2F
+slug: arista-ccs-720xp-24zy4-2f
+part_number: CCS-720XP-24ZY4-2F
+u_height: 1
+weight: 13.6
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet18
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet19
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet20
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet21
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet22
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet23
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet24
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet25
+    type: 25gbase-x-sfp28
+  - name: Ethernet26
+    type: 25gbase-x-sfp28
+  - name: Ethernet27
+    type: 25gbase-x-sfp28
+  - name: Ethernet28
+    type: 25gbase-x-sfp28
diff --git a/device-types/Arista/CCS-720XP-24ZY4-F.yaml b/device-types/Arista/CCS-720XP-24ZY4-F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1161f95e1b78d273f461941138429e0db320e62e
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-24ZY4-F.yaml
@@ -0,0 +1,127 @@
+---
+manufacturer: Arista
+model: CCS-720XP-24ZY4-F
+slug: arista-ccs-720xp-24zy4-f
+part_number: CCS-720XP-24ZY4-F
+u_height: 1
+weight: 13.6
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet18
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet19
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet20
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet21
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet22
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet23
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet24
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet25
+    type: 25gbase-x-sfp28
+  - name: Ethernet26
+    type: 25gbase-x-sfp28
+  - name: Ethernet27
+    type: 25gbase-x-sfp28
+  - name: Ethernet28
+    type: 25gbase-x-sfp28
diff --git a/device-types/Arista/CCS-720XP-24ZY4.yaml b/device-types/Arista/CCS-720XP-24ZY4.yaml
deleted file mode 100644
index 6e0c95e82c16298f7c8fafaf8c9cbde12f4d971f..0000000000000000000000000000000000000000
--- a/device-types/Arista/CCS-720XP-24ZY4.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-manufacturer: Arista
-model: CCS-720XP-24ZY4
-slug: arista-ccs-720xp-24zy4
-part_number: CCS-720XP-24ZY4
-u_height: 1
-is_full_depth: false
-console-ports:
-  - name: Console
-    type: rj-45
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-interfaces:
-  - name: Ethernet1
-    type: 2.5gbase-t
-  - name: Ethernet2
-    type: 2.5gbase-t
-  - name: Ethernet3
-    type: 2.5gbase-t
-  - name: Ethernet4
-    type: 2.5gbase-t
-  - name: Ethernet5
-    type: 2.5gbase-t
-  - name: Ethernet6
-    type: 2.5gbase-t
-  - name: Ethernet7
-    type: 2.5gbase-t
-  - name: Ethernet8
-    type: 2.5gbase-t
-  - name: Ethernet9
-    type: 2.5gbase-t
-  - name: Ethernet10
-    type: 2.5gbase-t
-  - name: Ethernet11
-    type: 2.5gbase-t
-  - name: Ethernet12
-    type: 2.5gbase-t
-  - name: Ethernet13
-    type: 2.5gbase-t
-  - name: Ethernet14
-    type: 2.5gbase-t
-  - name: Ethernet15
-    type: 2.5gbase-t
-  - name: Ethernet16
-    type: 2.5gbase-t
-  - name: Ethernet17
-    type: 5gbase-t
-  - name: Ethernet18
-    type: 5gbase-t
-  - name: Ethernet19
-    type: 5gbase-t
-  - name: Ethernet20
-    type: 5gbase-t
-  - name: Ethernet21
-    type: 5gbase-t
-  - name: Ethernet22
-    type: 5gbase-t
-  - name: Ethernet23
-    type: 5gbase-t
-  - name: Ethernet24
-    type: 5gbase-t
-  - 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: Management1
-    type: 1000base-t
-    mgmt_only: true
diff --git a/device-types/Arista/CCS-720XP-48Y6-2F.yaml b/device-types/Arista/CCS-720XP-48Y6-2F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..626e1abcc25a023d88be9ebdf1b20c3754a62df4
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-48Y6-2F.yaml
@@ -0,0 +1,227 @@
+---
+manufacturer: Arista
+model: CCS-720XP-48Y6-2F
+slug: arista-ccs-720xp-48y6-2f
+part_number: CCS-720XP-48Y6-2F
+u_height: 1
+weight: 15.3
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet33
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet34
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet35
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet36
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet37
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet38
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet39
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet40
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet41
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet42
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet43
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet44
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet45
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet46
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet47
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet48
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet49
+    type: 25gbase-x-sfp28
+  - name: Ethernet50
+    type: 25gbase-x-sfp28
+  - name: Ethernet51
+    type: 25gbase-x-sfp28
+  - name: Ethernet52
+    type: 25gbase-x-sfp28
+  - name: Ethernet53
+    type: 25gbase-x-sfp28
+  - name: Ethernet54
+    type: 25gbase-x-sfp28
diff --git a/device-types/Arista/CCS-720XP-48Y6-F.yaml b/device-types/Arista/CCS-720XP-48Y6-F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d92a15490d0a89e727c15bfaeb750d5099788ab9
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-48Y6-F.yaml
@@ -0,0 +1,227 @@
+---
+manufacturer: Arista
+model: CCS-720XP-48Y6-F
+slug: arista-ccs-720xp-48y6-f
+part_number: CCS-720XP-48Y6-F
+u_height: 1
+weight: 15.3
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet33
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet34
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet35
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet36
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet37
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet38
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet39
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet40
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet41
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet42
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet43
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet44
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet45
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet46
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet47
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet48
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet49
+    type: 25gbase-x-sfp28
+  - name: Ethernet50
+    type: 25gbase-x-sfp28
+  - name: Ethernet51
+    type: 25gbase-x-sfp28
+  - name: Ethernet52
+    type: 25gbase-x-sfp28
+  - name: Ethernet53
+    type: 25gbase-x-sfp28
+  - name: Ethernet54
+    type: 25gbase-x-sfp28
diff --git a/device-types/Arista/CCS-720XP-48Y6.yaml b/device-types/Arista/CCS-720XP-48Y6.yaml
deleted file mode 100644
index 93a361f21b6a2445df3f9985d5081b93bc1c6028..0000000000000000000000000000000000000000
--- a/device-types/Arista/CCS-720XP-48Y6.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
----
-manufacturer: Arista
-model: CCS-720XP-48Y6
-slug: arista-ccs-720xp-48y6
-part_number: CCS-720XP-48Y6
-u_height: 1
-is_full_depth: false
-console-ports:
-  - name: Console
-    type: rj-45
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-interfaces:
-  - name: Ethernet1
-    type: 1000base-t
-  - name: Ethernet2
-    type: 1000base-t
-  - name: Ethernet3
-    type: 1000base-t
-  - name: Ethernet4
-    type: 1000base-t
-  - name: Ethernet5
-    type: 1000base-t
-  - name: Ethernet6
-    type: 1000base-t
-  - name: Ethernet7
-    type: 1000base-t
-  - name: Ethernet8
-    type: 1000base-t
-  - name: Ethernet9
-    type: 1000base-t
-  - name: Ethernet10
-    type: 1000base-t
-  - name: Ethernet11
-    type: 1000base-t
-  - name: Ethernet12
-    type: 1000base-t
-  - name: Ethernet13
-    type: 1000base-t
-  - name: Ethernet14
-    type: 1000base-t
-  - name: Ethernet15
-    type: 1000base-t
-  - name: Ethernet16
-    type: 1000base-t
-  - name: Ethernet17
-    type: 1000base-t
-  - name: Ethernet18
-    type: 1000base-t
-  - name: Ethernet19
-    type: 1000base-t
-  - name: Ethernet20
-    type: 1000base-t
-  - name: Ethernet21
-    type: 1000base-t
-  - name: Ethernet22
-    type: 1000base-t
-  - name: Ethernet23
-    type: 1000base-t
-  - name: Ethernet24
-    type: 1000base-t
-  - name: Ethernet25
-    type: 1000base-t
-  - name: Ethernet26
-    type: 1000base-t
-  - name: Ethernet27
-    type: 1000base-t
-  - name: Ethernet28
-    type: 1000base-t
-  - name: Ethernet29
-    type: 1000base-t
-  - name: Ethernet30
-    type: 1000base-t
-  - name: Ethernet31
-    type: 1000base-t
-  - name: Ethernet32
-    type: 1000base-t
-  - name: Ethernet33
-    type: 1000base-t
-  - name: Ethernet34
-    type: 1000base-t
-  - name: Ethernet35
-    type: 1000base-t
-  - name: Ethernet36
-    type: 1000base-t
-  - name: Ethernet37
-    type: 1000base-t
-  - name: Ethernet38
-    type: 1000base-t
-  - name: Ethernet39
-    type: 1000base-t
-  - name: Ethernet40
-    type: 1000base-t
-  - name: Ethernet41
-    type: 1000base-t
-  - name: Ethernet42
-    type: 1000base-t
-  - name: Ethernet43
-    type: 1000base-t
-  - name: Ethernet44
-    type: 1000base-t
-  - name: Ethernet45
-    type: 1000base-t
-  - name: Ethernet46
-    type: 1000base-t
-  - name: Ethernet47
-    type: 1000base-t
-  - name: Ethernet48
-    type: 1000base-t
-  - name: Ethernet49
-    type: 25gbase-x-sfp28
-  - name: Ethernet50
-    type: 25gbase-x-sfp28
-  - name: Ethernet51
-    type: 25gbase-x-sfp28
-  - name: Ethernet52
-    type: 25gbase-x-sfp28
-  - name: Ethernet53
-    type: 25gbase-x-sfp28
-  - name: Ethernet54
-    type: 25gbase-x-sfp28
-  - name: Management1
-    type: 1000base-t
-    mgmt_only: true
diff --git a/device-types/Arista/CCS-720XP-48ZC2-2F.yaml b/device-types/Arista/CCS-720XP-48ZC2-2F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..16f73ca56bc9ae1c6d4b29b97adca16db9f0e9fc
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-48ZC2-2F.yaml
@@ -0,0 +1,228 @@
+---
+manufacturer: Arista
+model: CCS-720XP-48ZC2-2F
+slug: arista-ccs-720xp-48zc2-2f
+part_number: CCS-720XP-48ZC2-2F
+u_height: 1
+weight: 15.6
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet18
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet19
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet20
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet21
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet22
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet23
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet24
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet25
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet26
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet27
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet28
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet29
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet30
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet31
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet32
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet33
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet34
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet35
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet36
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet37
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet38
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet39
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet40
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet41
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet42
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet43
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet44
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet45
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet46
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet47
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet48
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet49
+    type: 25gbase-x-sfp28
+  - name: Ethernet50
+    type: 25gbase-x-sfp28
+  - name: Ethernet51
+    type: 25gbase-x-sfp28
+  - name: Ethernet52
+    type: 25gbase-x-sfp28
+# QSFP28(100G) ports can be broke into 4x25 with a model of [53-54]/[1-4]
+  - name: Ethernet53/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet54/1
+    type: 100gbase-x-qsfp28
diff --git a/device-types/Arista/CCS-720XP-48ZC2-F.yaml b/device-types/Arista/CCS-720XP-48ZC2-F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..48b525e82ba3334179b6379b652eb32781ab923a
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-48ZC2-F.yaml
@@ -0,0 +1,228 @@
+---
+manufacturer: Arista
+model: CCS-720XP-48ZC2-F
+slug: arista-ccs-720xp-48zc2-f
+part_number: CCS-720XP-48ZC2-F
+u_height: 1
+weight: 15.6
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet2
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet3
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet4
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet5
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet6
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet7
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet8
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet9
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet10
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet11
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet12
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet17
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet18
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet19
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet20
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet21
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet22
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet23
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet24
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet25
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet26
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet27
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet28
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet29
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet30
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet31
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet32
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet33
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet34
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet35
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet36
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet37
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet38
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet39
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet40
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type1-ieee802.3af
+  - name: Ethernet41
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet42
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet43
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet44
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet45
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet46
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet47
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet48
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet49
+    type: 25gbase-x-sfp28
+  - name: Ethernet50
+    type: 25gbase-x-sfp28
+  - name: Ethernet51
+    type: 25gbase-x-sfp28
+  - name: Ethernet52
+    type: 25gbase-x-sfp28
+# QSFP28(100G) ports can be broke into 4x25 with a model of [53-54]/[1-4]
+  - name: Ethernet53/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet54/1
+    type: 100gbase-x-qsfp28
diff --git a/device-types/Arista/CCS-720XP-48ZC2.yaml b/device-types/Arista/CCS-720XP-48ZC2.yaml
deleted file mode 100644
index a3e67019846cae16b46f274eeb80e6cbc41aa12d..0000000000000000000000000000000000000000
--- a/device-types/Arista/CCS-720XP-48ZC2.yaml
+++ /dev/null
@@ -1,132 +0,0 @@
----
-manufacturer: Arista
-model: CCS-720XP-48ZC2
-slug: arista-ccs-720xp-48zc2
-part_number: CCS-720XP-48ZC2
-u_height: 1
-is_full_depth: false
-console-ports:
-  - name: Console
-    type: rj-45
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 177
-    allocated_draw: 164
-interfaces:
-  - name: Ethernet1
-    type: 1000base-t
-  - name: Ethernet2
-    type: 2.5gbase-t
-  - name: Ethernet3
-    type: 2.5gbase-t
-  - name: Ethernet4
-    type: 2.5gbase-t
-  - name: Ethernet5
-    type: 2.5gbase-t
-  - name: Ethernet6
-    type: 2.5gbase-t
-  - name: Ethernet7
-    type: 2.5gbase-t
-  - name: Ethernet8
-    type: 2.5gbase-t
-  - name: Ethernet9
-    type: 2.5gbase-t
-  - name: Ethernet10
-    type: 2.5gbase-t
-  - name: Ethernet11
-    type: 2.5gbase-t
-  - name: Ethernet12
-    type: 2.5gbase-t
-  - name: Ethernet13
-    type: 2.5gbase-t
-  - name: Ethernet14
-    type: 2.5gbase-t
-  - name: Ethernet15
-    type: 2.5gbase-t
-  - name: Ethernet16
-    type: 2.5gbase-t
-  - name: Ethernet17
-    type: 2.5gbase-t
-  - name: Ethernet18
-    type: 2.5gbase-t
-  - name: Ethernet19
-    type: 2.5gbase-t
-  - name: Ethernet20
-    type: 2.5gbase-t
-  - name: Ethernet21
-    type: 2.5gbase-t
-  - name: Ethernet22
-    type: 2.5gbase-t
-  - name: Ethernet23
-    type: 2.5gbase-t
-  - name: Ethernet24
-    type: 2.5gbase-t
-  - name: Ethernet25
-    type: 2.5gbase-t
-  - name: Ethernet26
-    type: 2.5gbase-t
-  - name: Ethernet27
-    type: 2.5gbase-t
-  - name: Ethernet28
-    type: 2.5gbase-t
-  - name: Ethernet29
-    type: 2.5gbase-t
-  - name: Ethernet30
-    type: 2.5gbase-t
-  - name: Ethernet31
-    type: 2.5gbase-t
-  - name: Ethernet32
-    type: 2.5gbase-t
-  - name: Ethernet33
-    type: 2.5gbase-t
-  - name: Ethernet34
-    type: 2.5gbase-t
-  - name: Ethernet35
-    type: 2.5gbase-t
-  - name: Ethernet36
-    type: 2.5gbase-t
-  - name: Ethernet37
-    type: 2.5gbase-t
-  - name: Ethernet38
-    type: 2.5gbase-t
-  - name: Ethernet39
-    type: 2.5gbase-t
-  - name: Ethernet40
-    type: 2.5gbase-t
-  - name: Ethernet41
-    type: 5gbase-t
-  - name: Ethernet42
-    type: 5gbase-t
-  - name: Ethernet43
-    type: 5gbase-t
-  - name: Ethernet44
-    type: 5gbase-t
-  - name: Ethernet45
-    type: 5gbase-t
-  - name: Ethernet46
-    type: 5gbase-t
-  - name: Ethernet47
-    type: 5gbase-t
-  - name: Ethernet48
-    type: 5gbase-t
-  - name: Ethernet49
-    type: 25gbase-x-sfp28
-  - name: Ethernet50
-    type: 25gbase-x-sfp28
-  - name: Ethernet51
-    type: 25gbase-x-sfp28
-  - name: Ethernet52
-    type: 25gbase-x-sfp28
-# QSFP28(100G) ports can be broke into 4x25 with a model of [53-54]/[1-4]
-  - name: Ethernet53/1
-    type: 100gbase-x-qsfp28
-  - name: Ethernet54/1
-    type: 100gbase-x-qsfp28
-  - name: Management1
-    type: 1000base-t
-    mgmt_only: true
diff --git a/device-types/Arista/CCS-720XP-96ZC2-2F.yaml b/device-types/Arista/CCS-720XP-96ZC2-2F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..560926ab8b0dc65b7251bb8872b36608e494eae2
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-96ZC2-2F.yaml
@@ -0,0 +1,420 @@
+---
+manufacturer: Arista
+model: CCS-720XP-96ZC2-2F
+slug: arista-ccs-720xp-96zc2-2f
+part_number: CCS-720XP-96ZC2-2F
+u_height: 2
+weight: 31
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet2
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet3
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet4
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet5
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet6
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet7
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet8
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet9
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet10
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet11
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet12
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet17
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet18
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet19
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet20
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet21
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet22
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet23
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet24
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet25
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet26
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet27
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet28
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet29
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet30
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet31
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet32
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet33
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet34
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet35
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet36
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet37
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet38
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet39
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet40
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet41
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet42
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet43
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet44
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet45
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet46
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet47
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet48
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet49
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet50
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet51
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet52
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet53
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet54
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet55
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet56
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet57
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet58
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet59
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet60
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet61
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet62
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet63
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet64
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet65
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet66
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet67
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet68
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet69
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet70
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet71
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet72
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet73
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet74
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet75
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet76
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet77
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet78
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet79
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet80
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet81
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet82
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet83
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet84
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet85
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet86
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet87
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet88
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet89
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet90
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet91
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet92
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet93
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet94
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet95
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet96
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet97
+    type: 25gbase-x-sfp28
+  - name: Ethernet98
+    type: 25gbase-x-sfp28
+  - name: Ethernet99
+    type: 25gbase-x-sfp28
+  - name: Ethernet100
+    type: 25gbase-x-sfp28
+# QSFP28(100G) ports can be broke into 4x25 with a model of [101-102]/[1-4]
+  - name: Ethernet101/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet102/1
+    type: 100gbase-x-qsfp28
diff --git a/device-types/Arista/CCS-720XP-96ZC2-4F.yaml b/device-types/Arista/CCS-720XP-96ZC2-4F.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ea558717f01d9460782212c91c5680f68a2fad71
--- /dev/null
+++ b/device-types/Arista/CCS-720XP-96ZC2-4F.yaml
@@ -0,0 +1,424 @@
+---
+manufacturer: Arista
+model: CCS-720XP-96ZC2-4F
+slug: arista-ccs-720xp-96zc2-4f
+part_number: CCS-720XP-96ZC2-4F
+u_height: 2
+weight: 31
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 720XP Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-720XP-Datasheet.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+  - name: PS3
+    position: '2'
+  - name: PS4
+    position: '3'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet2
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet3
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet4
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet5
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet6
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet7
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet8
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet9
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet10
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet11
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet12
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet17
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet18
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet19
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet20
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet21
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet22
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet23
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet24
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet25
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet26
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet27
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet28
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet29
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet30
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet31
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet32
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet33
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet34
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet35
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet36
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet37
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet38
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet39
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet40
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet41
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet42
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet43
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet44
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet45
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet46
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet47
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet48
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet49
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet50
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet51
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet52
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet53
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet54
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet55
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet56
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet57
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet58
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet59
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet60
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet61
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet62
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet63
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet64
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet65
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet66
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet67
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet68
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet69
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet70
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet71
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet72
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet73
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet74
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet75
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet76
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet77
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet78
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet79
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet80
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet81
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet82
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet83
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet84
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet85
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet86
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet87
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet88
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet89
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet90
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet91
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet92
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet93
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet94
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet95
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet96
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet97
+    type: 25gbase-x-sfp28
+  - name: Ethernet98
+    type: 25gbase-x-sfp28
+  - name: Ethernet99
+    type: 25gbase-x-sfp28
+  - name: Ethernet100
+    type: 25gbase-x-sfp28
+# QSFP28(100G) ports can be broke into 4x25 with a model of [101-102]/[1-4]
+  - name: Ethernet101/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet102/1
+    type: 100gbase-x-qsfp28
diff --git a/device-types/Arista/CCS-720XP-96ZC2.yaml b/device-types/Arista/CCS-720XP-96ZC2.yaml
deleted file mode 100644
index bc33790d23987ba5c81c357c5894bf1deff7c76a..0000000000000000000000000000000000000000
--- a/device-types/Arista/CCS-720XP-96ZC2.yaml
+++ /dev/null
@@ -1,229 +0,0 @@
----
-manufacturer: Arista
-model: CCS-720XP-96ZC2
-slug: arista-ccs-720xp-96zc2
-part_number: CCS-720XP-96ZC2
-u_height: 2
-is_full_depth: false
-console-ports:
-  - name: Console
-    type: rj-45
-power-ports:
-# Up to 4 PSUs can be bundled; a minimum of 2 come with a chassis.
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 378
-    allocated_draw: 245
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 378
-    allocated_draw: 245
-interfaces:
-  - name: Ethernet1
-    type: 1000base-t
-  - name: Ethernet2
-    type: 2.5gbase-t
-  - name: Ethernet3
-    type: 2.5gbase-t
-  - name: Ethernet4
-    type: 2.5gbase-t
-  - name: Ethernet5
-    type: 2.5gbase-t
-  - name: Ethernet6
-    type: 2.5gbase-t
-  - name: Ethernet7
-    type: 2.5gbase-t
-  - name: Ethernet8
-    type: 2.5gbase-t
-  - name: Ethernet9
-    type: 2.5gbase-t
-  - name: Ethernet10
-    type: 2.5gbase-t
-  - name: Ethernet11
-    type: 2.5gbase-t
-  - name: Ethernet12
-    type: 2.5gbase-t
-  - name: Ethernet13
-    type: 2.5gbase-t
-  - name: Ethernet14
-    type: 2.5gbase-t
-  - name: Ethernet15
-    type: 2.5gbase-t
-  - name: Ethernet16
-    type: 2.5gbase-t
-  - name: Ethernet17
-    type: 2.5gbase-t
-  - name: Ethernet18
-    type: 2.5gbase-t
-  - name: Ethernet19
-    type: 2.5gbase-t
-  - name: Ethernet20
-    type: 2.5gbase-t
-  - name: Ethernet21
-    type: 2.5gbase-t
-  - name: Ethernet22
-    type: 2.5gbase-t
-  - name: Ethernet23
-    type: 2.5gbase-t
-  - name: Ethernet24
-    type: 2.5gbase-t
-  - name: Ethernet25
-    type: 2.5gbase-t
-  - name: Ethernet26
-    type: 2.5gbase-t
-  - name: Ethernet27
-    type: 2.5gbase-t
-  - name: Ethernet28
-    type: 2.5gbase-t
-  - name: Ethernet29
-    type: 2.5gbase-t
-  - name: Ethernet30
-    type: 2.5gbase-t
-  - name: Ethernet31
-    type: 2.5gbase-t
-  - name: Ethernet32
-    type: 2.5gbase-t
-  - name: Ethernet33
-    type: 2.5gbase-t
-  - name: Ethernet34
-    type: 2.5gbase-t
-  - name: Ethernet35
-    type: 2.5gbase-t
-  - name: Ethernet36
-    type: 2.5gbase-t
-  - name: Ethernet37
-    type: 2.5gbase-t
-  - name: Ethernet38
-    type: 2.5gbase-t
-  - name: Ethernet39
-    type: 2.5gbase-t
-  - name: Ethernet40
-    type: 2.5gbase-t
-  - name: Ethernet41
-    type: 1000base-t
-  - name: Ethernet42
-    type: 2.5gbase-t
-  - name: Ethernet43
-    type: 2.5gbase-t
-  - name: Ethernet44
-    type: 2.5gbase-t
-  - name: Ethernet45
-    type: 2.5gbase-t
-  - name: Ethernet46
-    type: 2.5gbase-t
-  - name: Ethernet47
-    type: 2.5gbase-t
-  - name: Ethernet48
-    type: 2.5gbase-t
-  - name: Ethernet49
-    type: 2.5gbase-t
-  - name: Ethernet50
-    type: 2.5gbase-t
-  - name: Ethernet51
-    type: 2.5gbase-t
-  - name: Ethernet52
-    type: 2.5gbase-t
-  - name: Ethernet53
-    type: 2.5gbase-t
-  - name: Ethernet54
-    type: 2.5gbase-t
-  - name: Ethernet55
-    type: 2.5gbase-t
-  - name: Ethernet56
-    type: 2.5gbase-t
-  - name: Ethernet57
-    type: 2.5gbase-t
-  - name: Ethernet58
-    type: 2.5gbase-t
-  - name: Ethernet59
-    type: 2.5gbase-t
-  - name: Ethernet60
-    type: 2.5gbase-t
-  - name: Ethernet61
-    type: 2.5gbase-t
-  - name: Ethernet62
-    type: 2.5gbase-t
-  - name: Ethernet63
-    type: 2.5gbase-t
-  - name: Ethernet64
-    type: 2.5gbase-t
-  - name: Ethernet65
-    type: 2.5gbase-t
-  - name: Ethernet66
-    type: 2.5gbase-t
-  - name: Ethernet67
-    type: 2.5gbase-t
-  - name: Ethernet68
-    type: 2.5gbase-t
-  - name: Ethernet69
-    type: 2.5gbase-t
-  - name: Ethernet70
-    type: 2.5gbase-t
-  - name: Ethernet71
-    type: 2.5gbase-t
-  - name: Ethernet72
-    type: 2.5gbase-t
-  - name: Ethernet73
-    type: 2.5gbase-t
-  - name: Ethernet74
-    type: 2.5gbase-t
-  - name: Ethernet75
-    type: 2.5gbase-t
-  - name: Ethernet76
-    type: 2.5gbase-t
-  - name: Ethernet77
-    type: 2.5gbase-t
-  - name: Ethernet78
-    type: 2.5gbase-t
-  - name: Ethernet79
-    type: 2.5gbase-t
-  - name: Ethernet80
-    type: 2.5gbase-t
-  - name: Ethernet81
-    type: 5gbase-t
-  - name: Ethernet82
-    type: 5gbase-t
-  - name: Ethernet83
-    type: 5gbase-t
-  - name: Ethernet84
-    type: 5gbase-t
-  - name: Ethernet85
-    type: 5gbase-t
-  - name: Ethernet86
-    type: 5gbase-t
-  - name: Ethernet87
-    type: 5gbase-t
-  - name: Ethernet88
-    type: 5gbase-t
-  - name: Ethernet89
-    type: 5gbase-t
-  - name: Ethernet90
-    type: 5gbase-t
-  - name: Ethernet91
-    type: 5gbase-t
-  - name: Ethernet92
-    type: 5gbase-t
-  - name: Ethernet93
-    type: 5gbase-t
-  - name: Ethernet94
-    type: 5gbase-t
-  - name: Ethernet95
-    type: 5gbase-t
-  - name: Ethernet96
-    type: 5gbase-t
-  - name: Ethernet97
-    type: 25gbase-x-sfp28
-  - name: Ethernet98
-    type: 25gbase-x-sfp28
-  - name: Ethernet99
-    type: 25gbase-x-sfp28
-  - name: Ethernet100
-    type: 25gbase-x-sfp28
-# QSFP28(100G) ports can be broke into 4x25 with a model of [101-102]/[1-4]
-  - name: Ethernet101/1
-    type: 100gbase-x-qsfp28
-  - name: Ethernet102/1
-    type: 100gbase-x-qsfp28
-  - name: Management1
-    type: 1000base-t
-    mgmt_only: true
diff --git a/module-types/Arista/PWR-1021-AC-RED.yaml b/module-types/Arista/PWR-1021-AC-RED.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f00eaf69b4894fdf946f92e583175bb857043b7e
--- /dev/null
+++ b/module-types/Arista/PWR-1021-AC-RED.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Arista
+model: PWR-1021-AC-RED
+part_number: PWR-1021-AC-RED
+# airflow: front-to-rear
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 1050
diff --git a/module-types/Arista/PWR-2021-AC-RED.yaml b/module-types/Arista/PWR-2021-AC-RED.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1462834a3bcb228f83816a8691565051399a9534
--- /dev/null
+++ b/module-types/Arista/PWR-2021-AC-RED.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Arista
+model: PWR-2021-AC-RED
+part_number: PWR-2021-AC-RED
+# airflow: front-to-rear
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 2000
diff --git a/module-types/Arista/PWR-521-DC-RED.yaml b/module-types/Arista/PWR-521-DC-RED.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e1f29dd6ceb0718ad47cd0eb3e8f690586fe00d9
--- /dev/null
+++ b/module-types/Arista/PWR-521-DC-RED.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Arista
+model: PWR-521-DC-RED
+part_number: PWR-521-DC-RED
+# airflow: front-to-rear
+power-ports:
+  - name: '{module}'
+    type: dc-terminal
+    maximum_draw: 500
diff --git a/module-types/Arista/PWR-621-AC-BLUE.yaml b/module-types/Arista/PWR-621-AC-BLUE.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e63218e1bc85aaf8d5ddaecd097e78a44aab7aa5
--- /dev/null
+++ b/module-types/Arista/PWR-621-AC-BLUE.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Arista
+model: PWR-621-AC-BLUE
+part_number: PWR-621-AC-BLUE
+# airflow: rear-to-front
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 650
diff --git a/module-types/Arista/PWR-621-AC-RED.yaml b/module-types/Arista/PWR-621-AC-RED.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5a4db296b157e844f84cdc4a9f2cd6cb61706779
--- /dev/null
+++ b/module-types/Arista/PWR-621-AC-RED.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Arista
+model: PWR-621-AC-RED
+part_number: PWR-621-AC-RED
+# airflow: front-to-rear
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 650
diff --git a/module-types/Arista/PWR-721-DC-RED.yaml b/module-types/Arista/PWR-721-DC-RED.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..eddf50f80a0dd29d070412c3d5e64698e6b81947
--- /dev/null
+++ b/module-types/Arista/PWR-721-DC-RED.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Arista
+model: PWR-721-DC-RED
+part_number: PWR-721-DC-RED
+# airflow: front-to-rear
+power-ports:
+  - name: '{module}'
+    type: dc-terminal
+    maximum_draw: 700