HPE Aruba Merge & Cleanup (#1142)

* Added Aruba to model names in prep for migration to HPE

* Migrated Aruba manufacturer to HPE

* fixed the poep to poe+ and naming

* Removed sitch from model names

* Fixed power type

* Fixed model names for Aruba 2540s

* fixed Aruba 54 series models

* Updated model names to match the manufacturer

* Fixed slug. Added part number to Aruba 7000 series

* fixed multiple aruba 8000 series part numbers, they had As which are the SFP modules, the actual devices has Cs. Added airflow to the device already there, and added their increment device for reverse airflow.

* fixed airflow definitions for aruba 8000 series

* Fixed aruba 8000 series names and slugs. Added Aruba 10000 rear to front device and added airflow for the front to rear one as well

* Added  prefix to slugs

* Adding pn to aruba 10000 series

* migrating Aruva devices to HPE folder as per discussion 1137. https://github.com/netbox-community/devicetype-library/discussions/1137

* migrating officeconnect switches to new standard format

* Migrated Aruba switches to proper naming

* Updated files to include their product lines and renamed applicable files

* reverted poe-plus to poep to align

* Adding product lines to more HPE devices

* Fixing slug issue

* updating slug to include manuf. and product line

* migrated proliant device file names to -. Also fixed their slugs

device-types/HPE/Alletra-6050.yaml

@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
 model: Alletra 6050
-slug: alletra-6050
+slug: hpe-alletra-6050
 u_height: 4
 is_full_depth: true
 subdevice_role: parent

device-types/HPE/Aruba-10000-48Y6C-R8P13A.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 10000-48Y6C
-slug: 10000-48Y6C
+manufacturer: HPE
+model: Aruba 10000-48Y6C Front-to-Back
+slug: hpe-aruba-10000-48y6c-r8p13a
 part_number: R8P13A
 u_height: 1
 is_full_depth: false
-comments: R8P13A for Front to Back, R8P14A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-10000-48Y6C-R8P14A.yaml

@@ -0,0 +1,134 @@
+---
+manufacturer: HPE
+model: Aruba 10000-48Y6C Back-to-Front
+slug: hpe-aruba-10000-48y6c-r8p14a
+part_number: R8P14A
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 750
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 750
+interfaces:
+  - name: 1/1/1
+    type: 25gbase-x-sfp28
+  - name: 1/1/2
+    type: 25gbase-x-sfp28
+  - name: 1/1/3
+    type: 25gbase-x-sfp28
+  - name: 1/1/4
+    type: 25gbase-x-sfp28
+  - name: 1/1/5
+    type: 25gbase-x-sfp28
+  - name: 1/1/6
+    type: 25gbase-x-sfp28
+  - name: 1/1/7
+    type: 25gbase-x-sfp28
+  - name: 1/1/8
+    type: 25gbase-x-sfp28
+  - name: 1/1/9
+    type: 25gbase-x-sfp28
+  - name: 1/1/10
+    type: 25gbase-x-sfp28
+  - name: 1/1/11
+    type: 25gbase-x-sfp28
+  - name: 1/1/12
+    type: 25gbase-x-sfp28
+  - name: 1/1/13
+    type: 25gbase-x-sfp28
+  - name: 1/1/14
+    type: 25gbase-x-sfp28
+  - name: 1/1/15
+    type: 25gbase-x-sfp28
+  - name: 1/1/16
+    type: 25gbase-x-sfp28
+  - name: 1/1/17
+    type: 25gbase-x-sfp28
+  - name: 1/1/18
+    type: 25gbase-x-sfp28
+  - name: 1/1/19
+    type: 25gbase-x-sfp28
+  - name: 1/1/20
+    type: 25gbase-x-sfp28
+  - name: 1/1/21
+    type: 25gbase-x-sfp28
+  - name: 1/1/22
+    type: 25gbase-x-sfp28
+  - name: 1/1/23
+    type: 25gbase-x-sfp28
+  - name: 1/1/24
+    type: 25gbase-x-sfp28
+  - name: 1/1/25
+    type: 25gbase-x-sfp28
+  - name: 1/1/26
+    type: 25gbase-x-sfp28
+  - name: 1/1/27
+    type: 25gbase-x-sfp28
+  - name: 1/1/28
+    type: 25gbase-x-sfp28
+  - name: 1/1/29
+    type: 25gbase-x-sfp28
+  - name: 1/1/30
+    type: 25gbase-x-sfp28
+  - name: 1/1/31
+    type: 25gbase-x-sfp28
+  - name: 1/1/32
+    type: 25gbase-x-sfp28
+  - name: 1/1/33
+    type: 25gbase-x-sfp28
+  - name: 1/1/34
+    type: 25gbase-x-sfp28
+  - name: 1/1/35
+    type: 25gbase-x-sfp28
+  - name: 1/1/36
+    type: 25gbase-x-sfp28
+  - name: 1/1/37
+    type: 25gbase-x-sfp28
+  - name: 1/1/38
+    type: 25gbase-x-sfp28
+  - name: 1/1/39
+    type: 25gbase-x-sfp28
+  - name: 1/1/40
+    type: 25gbase-x-sfp28
+  - name: 1/1/41
+    type: 25gbase-x-sfp28
+  - name: 1/1/42
+    type: 25gbase-x-sfp28
+  - name: 1/1/43
+    type: 25gbase-x-sfp28
+  - name: 1/1/44
+    type: 25gbase-x-sfp28
+  - name: 1/1/45
+    type: 25gbase-x-sfp28
+  - name: 1/1/46
+    type: 25gbase-x-sfp28
+  - name: 1/1/47
+    type: 25gbase-x-sfp28
+  - name: 1/1/48
+    type: 25gbase-x-sfp28
+  - name: 1/1/49
+    type: 100gbase-x-qsfp28
+  - name: 1/1/50
+    type: 100gbase-x-qsfp28
+  - name: 1/1/51
+    type: 100gbase-x-qsfp28
+  - name: 1/1/52
+    type: 100gbase-x-qsfp28
+  - name: 1/1/53
+    type: 100gbase-x-qsfp28
+  - name: 1/1/54
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-2530-24-PoEP.yml

@@ -1,10 +1,13 @@
 ---
 manufacturer: HPE
-model: 2530-24-PoEP Switch
-slug: 2530-24-poep
+model: Aruba 2530-24-PoEP Switch
+slug: hpe-aruba-2530-24-poep
 part_number: J9779A
 u_height: 1
 is_full_depth: false
+weight:
+  - value: 8
+    unit: lb
 console-ports:
   - name: console
     type: rj-45

device-types/HPE/Aruba-2530-24G-PoEP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2530-24G-PoEP Switch
-slug: 2530-24g-poep
+manufacturer: HPE
+model: Aruba 2530-24G-PoE+
+slug: hpe-aruba-2530-24g-poep
 part_number: J9773A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2530-24G.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2530-24G Switch
-slug: 2530-24g
+manufacturer: HPE
+model: Aruba 2530-24G
+slug: hpe-aruba-2530-24g
 part_number: J9782A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2530-48-PoEP.yml

@@ -1,10 +1,13 @@
 ---
 manufacturer: HPE
-model: 2530-48-PoEP Switch
-slug: 2530-48-poep
+model: Aruba 2530-48-PoE+ Switch
+slug: hpe-aruba-2530-48-poep
 part_number: J9778A
 u_height: 1
 is_full_depth: false
+weight:
+  - value: 10
+    unit: lb
 console-ports:
   - name: console
     type: rj-45

device-types/HPE/Aruba-2530-48G-PoEP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2530-48G-PoEP Switch
-slug: 2530-48g-poep
+manufacturer: HPE
+model: Aruba 2530-48G-PoE+
+slug: hpe-aruba-2530-48g-poep
 part_number: J9772A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2530-48G.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2530-48G Switch
-slug: 2530-48g
+manufacturer: HPE
+model: Aruba 2530-48G
+slug: hpe-aruba-2530-48g
 part_number: J9781A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2530-8-PoEP.yml

@@ -1,17 +1,20 @@
 ---
 manufacturer: HPE
-model: 2530-8-PoEP Switch
-slug: 2530-8-poep
+model: Aruba 2530-8-PoE+
+slug: hpe-aruba-2530-8-poep
 part_number: J9780A
 u_height: 1
 is_full_depth: false
+weight:
+  - value: 2
+    unit: lb
 console-ports:
   - name: console
     type: rj-45
 power-ports:
   - name: PS1
     type: iec-60320-c14
-    maximum_draw: 76
+    maximum_draw: 77
 interfaces:
   - name: '1'
     type: 100base-tx

device-types/HPE/Aruba-2530-8G-PoEP.yaml

@@ -1,13 +1,13 @@
 ---
-manufacturer: Aruba
-model: 2530-8G-PoEP Switch
-slug: 2530-8g-poep
+manufacturer: HPE
+model: Aruba 2530-8G-PoE+
+slug: hpe-aruba-2530-8g-poep
 part_number: J9774A
 u_height: 1
 is_full_depth: false
 power-ports:
   - name: PS1
-    type: iec-60320-c14
+    type: dc-terminal
     maximum_draw: 86
 console-ports:
   - name: Console

device-types/HPE/Aruba-2530-8G.yaml

@@ -1,13 +1,13 @@
 ---
-manufacturer: Aruba
-model: 2530-8G Switch
-slug: 2530-8g
+manufacturer: HPE
+model: Aruba 2530-8G
+slug: hpe-aruba-2530-8g
 part_number: J9783A
 u_height: 1
 is_full_depth: false
 power-ports:
   - name: PS1
-    type: iec-60320-c14
+    type: dc-terminal
     maximum_draw: 8
 console-ports:
   - name: Console

device-types/HPE/Aruba-2540-24G-4SFPP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2540 24G 4SFP+
-slug: 2540-24g-4sfpp
+manufacturer: HPE
+model: Aruba 2540-24G-4SFP+
+slug: hpe-aruba-2540-24g-4sfpp
 part_number: JL354A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2540M-48G-JL355A.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 2540 48G 4SFP+
-slug: 2540-48g-4sfpp
+manufacturer: HPE
+model: Aruba 2540-48G-4SFP+
+slug: hpe-aruba-2540-48g-4sfpp
 part_number: JL355A
 u_height: 1
 is_full_depth: false
-comments: '- Datasheet: [https://www.arubanetworks.com/assets/ds/DS_2540SwitchSeries.pdf](https://www.arubanetworks.com/assets/ds/DS_2540SwitchSeries.pdf)'
+comments: '[Aruba 2540-48G-4SFP+ Datasheet](https://www.arubanetworks.com/assets/ds/DS_2540SwitchSeries.pdf)'
 power-ports:
   - name: PS1
     type: iec-60320-c14

device-types/HPE/Aruba-2620-24-PoEP.yml

@@ -1,7 +1,7 @@
 ---
 manufacturer: HPE
-model: 2620 24 PoE+ Switch
-slug: 2620-24-poep
+model: Aruba 2620-24-PoE+
+slug: hpe-aruba-2620-24-poep
 part_number: J9625A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2920-24G-PoEP.yml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2920-24G-PoEP
-slug: 2920-24g-poep
+manufacturer: HPE
+model: Aruba 2920-24G-PoE+
+slug: hpe-aruba-2920-24g-poep
 part_number: 9727AJ
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2920-24G.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2920-24G
-slug: 2920-24g
+manufacturer: HPE
+model: Aruba 2920-24G
+slug: hpe-aruba-2920-24g
 part_number: J9726A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2920-48G-PoEP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2920-48G-PoE+
-slug: 2920-48g-poep
+manufacturer: HPE
+model: Aruba 2920-48G-PoE+
+slug: hpe-aruba-2920-48g-poep
 part_number: J9729A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2920-48G.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2920-48G
-slug: 2920-48g
+manufacturer: HPE
+model: Aruba 2920-48G
+slug: hpe-aruba-2920-48g
 part_number: J9728A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2930F-24G-4SFPP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2930F-24G-4SFP+
-slug: 2930f-24g-4sfpp
+manufacturer: HPE
+model: Aruba 2930F-24G-4SFP+
+slug: hpe-aruba-2930f-24g-4sfpp
 part_number: JL253A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2930F-24G-PoEP-4SFPP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2930F-24G-PoE+-4SFP+
-slug: 2930f-24g-poep-4sfpp
+manufacturer: HPE
+model: Aruba 2930F-24G-PoE+-4SFP+
+slug: hpe-aruba-2930f-24g-poep-4sfpp
 part_number: JL255A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2930F-48G-4SFPP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2930F-48G-4SFP+
-slug: 2930f-48g-4sfpp
+manufacturer: HPE
+model: Aruba 2930F-48G-4SFP+
+slug: hpe-aruba-2930f-48g-4sfpp
 part_number: JL254A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2930F-48G-PoEP-4SFPP.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2930F-48G-PoE+-4SFP+
-slug: 2930f-48g-poep-4sfpp
+manufacturer: HPE
+model: Aruba 2930F-48G-PoE+-4SFP+
+slug: hpe-aruba-2930f-48g-poep-4sfpp
 part_number: JL256ACM
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-2930M-24G.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 2930M-24G
-slug: 2930M-24G
+manufacturer: HPE
+model: Aruba 2930M-24G
+slug: hpe-aruba-2930M-24G
 part_number: JL319A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-3810M-40G-8SR.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 3810M-40G-8SR
-slug: 3810M-40G-8SR
+manufacturer: HPE
+model: Aruba 3810M-40G-8SR
+slug: hpe-aruba-3810M-40G-8SR
 part_number: JL076A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-5406R-zl2.yaml

@@ -0,0 +1,31 @@
+---
+manufacturer: HPE
+model: 5406R-zl2
+slug: hpe-aruba-hpe-5406r-zl2
+part_number: J9850A
+u_height: 4
+is_full_depth: false
+subdevice_role: parent
+airflow: front-to-rear
+comments: Chassis device (J9850A) for the HP 5406R zl2 switch (J9821A)
+module-bays:
+  - name: A
+    position: A
+  - name: B
+    position: B
+  - name: C
+    position: C
+  - name: D
+    position: D
+  - name: E
+    position: E
+  - name: F
+    position: F
+  - name: MM1
+    position: MM1
+  - name: MM2
+    position: MM2
+  - name: PS1
+    position: PS1
+  - name: PS2
+    position: PS2

device-types/HPE/Aruba-5406rzl2-j9850a.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 5406Rzl2 J9850A
-slug: 5406rzl2-j9850a
+manufacturer: HPE
+model: Aruba 5406Rzl2 J9850A
+slug: hpe-aruba-5406rzl2-j9850a
 part_number: J9850A
 u_height: 4
 is_full_depth: false

device-types/HPE/Aruba-5412R-zl2.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 5412Rzl2 J9851A
-slug: 5412rzl2-j9851a
+manufacturer: HPE
+model: Aruba 5412R-zl2
+slug: hpe-aruba-5412r-zl2
 part_number: J9851A
 u_height: 7
 is_full_depth: false

device-types/HPE/Aruba-5412rzl2-j9851a.yaml

@@ -0,0 +1,36 @@
+---
+manufacturer: HPE
+model: Aruba 5412Rzl2 J9851A
+slug: hpe-aruba-5412rzl2-j9851a
+part_number: J9851A
+u_height: 7
+is_full_depth: false
+subdevice_role: parent
+airflow: front-to-rear
+module-bays:
+  - name: A
+    position: A
+  - name: B
+    position: B
+  - name: C
+    position: C
+  - name: D
+    position: D
+  - name: E
+    position: E
+  - name: F
+    position: F
+  - name: G
+    position: G
+  - name: H
+    position: H
+  - name: I
+    position: I
+  - name: MM1
+    position: MM1
+  - name: MM2
+    position: MM2
+  - name: PS1
+    position: PS1
+  - name: PS2
+    position: PS2

device-types/HPE/Aruba-6000-12G-R8N89A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6000-12G-POE4-2SFP-139W
-slug: 6000-12g-poe4-2sfp-139w
+manufacturer: HPE
+model: Aruba 6000-12G-POE4-2SFP 139W
+slug: hpe-aruba-6000-12g-poe4-2sfp-139w
 part_number: R8N89A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6000-24G-PoE-370W-R8N87A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6000-24G-POE4-4SFP-370W
-slug: 6000-24g-poe4-4sfp-370w
+manufacturer: HPE
+model: Aruba 6000-24G-POE4-4SFP 370W
+slug: hpe-aruba-6000-24g-poe4-4sfp-370w
 part_number: R8N87A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6000-24G-R8N88A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6000-24G-4SFP
-slug: 6000-24g-4sfp
+manufacturer: HPE
+model: Aruba 6000-24G-4SFP
+slug: hpe-aruba-6000-24g-4sfp
 part_number: R8N88A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6000-48G-PoE-370W-R8N85A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6000-48G-POE4-4SFP-370W
-slug: 6000-48g-poe4-4sfp-370w
+manufacturer: HPE
+model: Aruba 6000-48G-POE4-4SFP 370W
+slug: hpe-aruba-6000-48g-poe4-4sfp-370w
 part_number: R8N85A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6000-48G-R8N86A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6000-48G-4SFP
-slug: 6000-48g-4sfp
+manufacturer: HPE
+model: Aruba 6000-48G-4SFP
+slug: hpe-aruba-6000-48g-4sfp
 part_number: R8N86A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6100-12G-JL679A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6100-12G-POE4-2SFP+-139W
-slug: 6100-12g-poe4-2sfpp-139w
+manufacturer: HPE
+model: Aruba 6100-12G-POE4-2SFP+ 139W
+slug: hpe-aruba-6100-12g-poe4-2sfpp-139w
 part_number: JL679A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6100-24G-JL678A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6100-24G-4SFP+
-slug: 6100-24g-4sfpp
+manufacturer: HPE
+model: Aruba 6100-24G-4SFP+
+slug: hpe-aruba-6100-24g-4sfpp
 part_number: JL678A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6100-24G-PoE-370W-JL677A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6100-24G-POE4-4SFP+-370W
-slug: 6100-24g-poe4-4sfpp-370w
+manufacturer: HPE
+model: Aruba 6100-24G-POE4-4SFP+ 370W
+slug: hpe-aruba-6100-24g-poe4-4sfpp-370w
 part_number: JL677A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6100-48G-JL676A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6100-48G-4SFP+
-slug: 6100-48g-4sfpp
+manufacturer: HPE
+model: Aruba 6100-48G-4SFP+
+slug: hpe-aruba-6100-48g-4sfpp
 part_number: JL675A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6100-48G-PoE-370W-JL675A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6100-48G-POE4-4SFP+-370W
-slug: 6100-48g-poe4-4sfpp-370w
+manufacturer: HPE
+model: Aruba 6100-48G-POE4-4SFP+ 370W
+slug: hpe-aruba-6100-48g-poe4-4sfpp-370w
 part_number: JL675A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6200F-24G-JL724A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6200F-24G-POE4-4SFP+-370W
-slug: 6200f-24g-poe4-4sfpp-370w
+manufacturer: HPE
+model: Aruba 6200F-24G-POE4-4SFP+ 370W
+slug: hpe-aruba-6200f-24g-poe4-4sfpp-370w
 part_number: JL725A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6200F-24G-PoE-370W-JL725A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6200F-24G-4SFP+
-slug: 6200f-24g-4sfpp
+manufacturer: HPE
+model: Aruba 6200F-24G-4SFP+
+slug: hpe-aruba-6200f-24g-4sfpp
 part_number: JL724A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6200F-48G-JL726A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6200F-48G-4SFP+
-slug: 6200f-48g-4sfpp
+manufacturer: HPE
+model: Aruba 6200F-48G-4SFP+
+slug: hpe-aruba-6200f-48g-4sfpp
 part_number: JL726A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6200F-48G-PoE-370W-JL727A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6200F-48G-POE4-4SFP+-370W
-slug: 6200f-48g-poe4-4sfpp-370w
+manufacturer: HPE
+model: Aruba 6200F-48G-POE4-4SFP+ 370W
+slug: hpe-aruba-6200f-48g-poe4-4sfpp-370w
 part_number: JL727A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6200F-48G-PoE-740W-JL728A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6200F-48G-POE4-4SFP+-740W
-slug: 6200f-48g-poe4-4sfpp-740w
+manufacturer: HPE
+model: Aruba 6200F-48G-POE4-4SFP+ 740W
+slug: hpe-aruba-6200f-48g-poe4-4sfpp-740w
 part_number: JL728A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300F-24G-JL666A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300F-24G-POE4-4SFP56
-slug: 6300f-24g-poe4-4sfp56
+manufacturer: HPE
+model: Aruba 6300F-24G-POE4-4SFP56
+slug: hpe-aruba-6300f-24g-poe4-4sfp56
 part_number: JL666A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300F-24G-JL668A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300F-24G-4SFP56
-slug: 6300f-24g-4sfp56
+manufacturer: HPE
+model: Aruba 6300F-24G-4SFP56
+slug: hpe-aruba-6300f-24g-4sfp56
 part_number: JL668A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300F-48G-JL665A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300F-48G-POE4-4SFP56
-slug: 6300f-48g-poe4-4sfp56
+manufacturer: HPE
+model: Aruba 6300F-48G-POE4-4SFP56
+slug: hpe-aruba-6300f-48g-poe4-4sfp56
 part_number: JL665A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300F-48G-JL667A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300F-48G-4SFP56
-slug: 6300f-48g-4sfp56
+manufacturer: HPE
+model: Aruba 6300F-48G-4SFP56
+slug: hpe-aruba-6300f-48g-4sfp56
 part_number: JL667A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300M-24G-JL658A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300M-24SFPP-4SFP56
-slug: 6300m-24sfpp-4sfp56
+manufacturer: HPE
+model: Aruba 6300M-24SFPP-4SFP56
+slug: hpe-aruba-6300m-24sfpp-4sfp56
 part_number: JL658A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300M-24G-JL660A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300M-24GSR-POE6-4SFP56
-slug: 6300m-24gsr-poe6-4sfp56
+manufacturer: HPE
+model: Aruba 6300M-24GSR-POE6-4SFP56
+slug: hpe-aruba-6300m-24gsr-poe6-4sfp56
 part_number: JL660A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300M-24G-JL662A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300M-24G-POE4-4SFP56
-slug: 6300m-24g-poe4-4sfp56
+manufacturer: HPE
+model: Aruba 6300M-24G-POE4-4SFP56
+slug: hpe-aruba-6300m-24g-poe4-4sfp56
 part_number: JL662A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300M-24G-JL664A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300M-24G-4SFP56
-slug: 6300m-24g-4sfp56
+manufacturer: HPE
+model: Aruba 6300M-24G-4SFP56
+slug: hpe-aruba-6300m-24g-4sfp56
 part_number: JL664A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300M-48G-JL659A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300M-48GSR-POE6-4SFP56
-slug: 6300m-48gsr-poe6-4sfp56
+manufacturer: HPE
+model: Aruba 6300M-48GSR-POE6-4SFP56
+slug: hpe-aruba-6300m-48gsr-poe6-4sfp56
 part_number: JL659A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300M-48G-JL661A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300M-48G-POE4-4SFP56
-slug: 6300m-48g-poe4-4sfp56
+manufacturer: HPE
+model: Aruba 6300M-48G-POE4-4SFP56
+slug: hpe-aruba-6300m-48g-poe4-4sfp56
 part_number: JL661A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-6300M-48G-JL663A.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 6300M-48G-4SFP56
-slug: 6300m-48g-4sfp56
+manufacturer: HPE
+model: Aruba 6300M-48G-4SFP56
+slug: hpe-aruba-6300m-48g-4sfp56
 part_number: JL663A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-7005.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7005
-slug: aruba7005
+manufacturer: HPE
+model: Aruba 7005
+slug: hpe-aruba-7005
+part_number: JW634A
 is_full_depth: false
 u_height: 1
 interfaces:

device-types/HPE/Aruba-7010.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7010
-slug: aruba7010
+manufacturer: HPE
+model: Aruba 7010
+slug: hpe-aruba-7010
+part_number: JW679A
 is_full_depth: false
 u_height: 1
 interfaces:

device-types/HPE/Aruba-7030.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7030
-slug: aruba7030
+manufacturer: HPE
+model: Aruba 7030
+slug: hpe-aruba-7030
+part_number: JW687A
 is_full_depth: false
 u_height: 1
 interfaces:

device-types/HPE/Aruba-7205.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7205
-slug: aruba7205
+manufacturer: HPE
+model: Aruba 7205
+slug: hpe-aruba-7205
+part_number: JW736A
 is_full_depth: false
 u_height: 1
 interfaces:

device-types/HPE/Aruba-7210.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7240
-slug: aruba7240
+manufacturer: HPE
+model: Aruba 7210
+slug: hpe-aruba-7210
+part_number: JW744A
 is_full_depth: true
 u_height: 1
 interfaces:

device-types/HPE/Aruba-7220.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7220
-slug: aruba7220
+manufacturer: HPE
+model: Aruba 7220
+slug: hpe-aruba-7220
+part_number: JW752A
 is_full_depth: true
 u_height: 1
 interfaces:

device-types/HPE/Aruba-7240.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7210
-slug: aruba7210
+manufacturer: HPE
+model: Aruba 7240
+slug: hpe-aruba-7240
+part_number: JW760A
 is_full_depth: true
 u_height: 1
 interfaces:

device-types/HPE/Aruba-7280.yaml

@@ -1,7 +1,8 @@
 ---
-manufacturer: Aruba
-model: Aruba7280
-slug: aruba7280
+manufacturer: HPE
+model: Aruba 7280
+slug: hpe-aruba-7280
+part_number: JX910A
 is_full_depth: true
 u_height: 1
 interfaces:

device-types/HPE/Aruba-8320-32Q.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 8320-32Q
-slug: 8320-32q
+manufacturer: HPE
+model: Aruba 8320-32Q
+slug: hpe-aruba-8320-32q
 part_number: JL579A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-8320-48XF6Q.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 8320-48XF6Q
-slug: 8320-48xf6q
+manufacturer: HPE
+model: Aruba 8320-48XF6Q
+slug: hpe-aruba-8320-48xf6q
 part_number: JL479A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-8320-48XT6Q.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: 8320-48XT6Q
-slug: 8320-48xt6q
+manufacturer: HPE
+model: Aruba 8320-48XT6Q
+slug: hpe-aruba-8320-48xt6q
 part_number: JL581A
 u_height: 1
 is_full_depth: false

device-types/HPE/Aruba-8325-32C-JL626A.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8325-32C
-slug: 8325-32c
-part_number: JL636A
+manufacturer: HPE
+model: Aruba 8325-32C Front-to-Back
+slug: hpe-aruba-8325-32c-ja626a
+part_number: JL626A
 u_height: 1
 is_full_depth: false
-comments: JL626A for Front to Back, JL627A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8325-32C-JL627A.yaml

@@ -0,0 +1,92 @@
+---
+manufacturer: HPE
+model: Aruba 8325-32C Back-to-Front
+slug: hpe-aruba-8325-32c-jl627a
+part_number: JL627A
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 650
+    allocated_draw: 550
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 650
+    allocated_draw: 550
+interfaces:
+  - name: 1/1/1
+    type: 100gbase-x-qsfp28
+  - name: 1/1/2
+    type: 100gbase-x-qsfp28
+  - name: 1/1/3
+    type: 100gbase-x-qsfp28
+  - name: 1/1/4
+    type: 100gbase-x-qsfp28
+  - name: 1/1/5
+    type: 100gbase-x-qsfp28
+  - name: 1/1/6
+    type: 100gbase-x-qsfp28
+  - name: 1/1/7
+    type: 100gbase-x-qsfp28
+  - name: 1/1/8
+    type: 100gbase-x-qsfp28
+  - name: 1/1/9
+    type: 100gbase-x-qsfp28
+  - name: 1/1/10
+    type: 100gbase-x-qsfp28
+  - name: 1/1/11
+    type: 100gbase-x-qsfp28
+  - name: 1/1/12
+    type: 100gbase-x-qsfp28
+  - name: 1/1/13
+    type: 100gbase-x-qsfp28
+  - name: 1/1/14
+    type: 100gbase-x-qsfp28
+  - name: 1/1/15
+    type: 100gbase-x-qsfp28
+  - name: 1/1/16
+    type: 100gbase-x-qsfp28
+  - name: 1/1/17
+    type: 100gbase-x-qsfp28
+  - name: 1/1/18
+    type: 100gbase-x-qsfp28
+  - name: 1/1/19
+    type: 100gbase-x-qsfp28
+  - name: 1/1/20
+    type: 100gbase-x-qsfp28
+  - name: 1/1/21
+    type: 100gbase-x-qsfp28
+  - name: 1/1/22
+    type: 100gbase-x-qsfp28
+  - name: 1/1/23
+    type: 100gbase-x-qsfp28
+  - name: 1/1/24
+    type: 100gbase-x-qsfp28
+  - name: 1/1/25
+    type: 100gbase-x-qsfp28
+  - name: 1/1/26
+    type: 100gbase-x-qsfp28
+  - name: 1/1/27
+    type: 100gbase-x-qsfp28
+  - name: 1/1/28
+    type: 100gbase-x-qsfp28
+  - name: 1/1/29
+    type: 100gbase-x-qsfp28
+  - name: 1/1/30
+    type: 100gbase-x-qsfp28
+  - name: 1/1/31
+    type: 100gbase-x-qsfp28
+  - name: 1/1/32
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-8325-48Y8C-JL624A.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8325-48Y8C
-slug: 8325-48Y8C
-part_number: JL635A
+manufacturer: HPE
+model: Aruba 8325-48Y8C Front-to-Back
+slug: hpe-aruba-8325-48Y8C-jl624a
+part_number: JL624A
 u_height: 1
 is_full_depth: false
-comments: JL624A for Front to Back, JL625A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8325-48Y8C-JL625A.yaml

@@ -0,0 +1,140 @@
+---
+manufacturer: HPE
+model: Aruba 8325-48Y8C Back-to-Front
+slug: hpe-aruba-8325-48Y8C-jl625a
+part_number: JL625A
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 650
+    allocated_draw: 550
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 650
+    allocated_draw: 550
+interfaces:
+  - name: 1/1/1
+    type: 25gbase-x-sfp28
+  - name: 1/1/2
+    type: 25gbase-x-sfp28
+  - name: 1/1/3
+    type: 25gbase-x-sfp28
+  - name: 1/1/4
+    type: 25gbase-x-sfp28
+  - name: 1/1/5
+    type: 25gbase-x-sfp28
+  - name: 1/1/6
+    type: 25gbase-x-sfp28
+  - name: 1/1/7
+    type: 25gbase-x-sfp28
+  - name: 1/1/8
+    type: 25gbase-x-sfp28
+  - name: 1/1/9
+    type: 25gbase-x-sfp28
+  - name: 1/1/10
+    type: 25gbase-x-sfp28
+  - name: 1/1/11
+    type: 25gbase-x-sfp28
+  - name: 1/1/12
+    type: 25gbase-x-sfp28
+  - name: 1/1/13
+    type: 25gbase-x-sfp28
+  - name: 1/1/14
+    type: 25gbase-x-sfp28
+  - name: 1/1/15
+    type: 25gbase-x-sfp28
+  - name: 1/1/16
+    type: 25gbase-x-sfp28
+  - name: 1/1/17
+    type: 25gbase-x-sfp28
+  - name: 1/1/18
+    type: 25gbase-x-sfp28
+  - name: 1/1/19
+    type: 25gbase-x-sfp28
+  - name: 1/1/20
+    type: 25gbase-x-sfp28
+  - name: 1/1/21
+    type: 25gbase-x-sfp28
+  - name: 1/1/22
+    type: 25gbase-x-sfp28
+  - name: 1/1/23
+    type: 25gbase-x-sfp28
+  - name: 1/1/24
+    type: 25gbase-x-sfp28
+  - name: 1/1/25
+    type: 25gbase-x-sfp28
+  - name: 1/1/26
+    type: 25gbase-x-sfp28
+  - name: 1/1/27
+    type: 25gbase-x-sfp28
+  - name: 1/1/28
+    type: 25gbase-x-sfp28
+  - name: 1/1/29
+    type: 25gbase-x-sfp28
+  - name: 1/1/30
+    type: 25gbase-x-sfp28
+  - name: 1/1/31
+    type: 25gbase-x-sfp28
+  - name: 1/1/32
+    type: 25gbase-x-sfp28
+  - name: 1/1/33
+    type: 25gbase-x-sfp28
+  - name: 1/1/34
+    type: 25gbase-x-sfp28
+  - name: 1/1/35
+    type: 25gbase-x-sfp28
+  - name: 1/1/36
+    type: 25gbase-x-sfp28
+  - name: 1/1/37
+    type: 25gbase-x-sfp28
+  - name: 1/1/38
+    type: 25gbase-x-sfp28
+  - name: 1/1/39
+    type: 25gbase-x-sfp28
+  - name: 1/1/40
+    type: 25gbase-x-sfp28
+  - name: 1/1/41
+    type: 25gbase-x-sfp28
+  - name: 1/1/42
+    type: 25gbase-x-sfp28
+  - name: 1/1/43
+    type: 25gbase-x-sfp28
+  - name: 1/1/44
+    type: 25gbase-x-sfp28
+  - name: 1/1/45
+    type: 25gbase-x-sfp28
+  - name: 1/1/46
+    type: 25gbase-x-sfp28
+  - name: 1/1/47
+    type: 25gbase-x-sfp28
+  - name: 1/1/48
+    type: 25gbase-x-sfp28
+  - name: 1/1/49
+    type: 100gbase-x-qsfp28
+  - name: 1/1/50
+    type: 100gbase-x-qsfp28
+  - name: 1/1/51
+    type: 100gbase-x-qsfp28
+  - name: 1/1/52
+    type: 100gbase-x-qsfp28
+  - name: 1/1/53
+    type: 100gbase-x-qsfp28
+  - name: 1/1/54
+    type: 100gbase-x-qsfp28
+  - name: 1/1/55
+    type: 100gbase-x-qsfp28
+  - name: 1/1/56
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-8360-12C-JL708C.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8360-12C
-slug: 8360-12c
-part_number: JL708A
+manufacturer: HPE
+model: Aruba 8360-12C Front-to-Back
+slug: hpe-aruba-8360-12c-jl708c
+part_number: JL708C
 u_height: 1
 is_full_depth: false
-comments: JL708A for Front to Back, JL709A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8360-12C-JL709C.yaml

@@ -0,0 +1,52 @@
+---
+manufacturer: HPE
+model: Aruba 8360-12C Back-to-Front
+slug: hpe-aruba-8360-12c-jl709c
+part_number: JL709C
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 375
+    allocated_draw: 120
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 375
+    allocated_draw: 120
+interfaces:
+  - name: 1/1/1
+    type: 100gbase-x-qsfp28
+  - name: 1/1/2
+    type: 100gbase-x-qsfp28
+  - name: 1/1/3
+    type: 100gbase-x-qsfp28
+  - name: 1/1/4
+    type: 100gbase-x-qsfp28
+  - name: 1/1/5
+    type: 100gbase-x-qsfp28
+  - name: 1/1/6
+    type: 100gbase-x-qsfp28
+  - name: 1/1/7
+    type: 100gbase-x-qsfp28
+  - name: 1/1/8
+    type: 100gbase-x-qsfp28
+  - name: 1/1/9
+    type: 100gbase-x-qsfp28
+  - name: 1/1/10
+    type: 100gbase-x-qsfp28
+  - name: 1/1/11
+    type: 100gbase-x-qsfp28
+  - name: 1/1/12
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-8360-16Y2C-JL702C.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8360-16Y2C
-slug: 8360-16y2c
-part_number: JL702A
+manufacturer: HPE
+model: Aruba 8360-16Y2C Front-to-Back
+slug: hpe-aruba-8360-16y2c-jl702c
+part_number: JL702C
 u_height: 1
 is_full_depth: false
-comments: JL702A for Front to Back, JL703A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8360-16Y2C-JL703C.yaml

@@ -0,0 +1,64 @@
+---
+manufacturer: HPE
+model: Aruba 8360-16Y2C Back-to-Front
+slug: hpe-aruba-8360-16y2c-jl703c
+part_number: JL703C
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 325
+    allocated_draw: 110
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 325
+    allocated_draw: 110
+interfaces:
+  - name: 1/1/1
+    type: 25gbase-x-sfp28
+  - name: 1/1/2
+    type: 25gbase-x-sfp28
+  - name: 1/1/3
+    type: 25gbase-x-sfp28
+  - name: 1/1/4
+    type: 25gbase-x-sfp28
+  - name: 1/1/5
+    type: 25gbase-x-sfp28
+  - name: 1/1/6
+    type: 25gbase-x-sfp28
+  - name: 1/1/7
+    type: 25gbase-x-sfp28
+  - name: 1/1/8
+    type: 25gbase-x-sfp28
+  - name: 1/1/9
+    type: 25gbase-x-sfp28
+  - name: 1/1/10
+    type: 25gbase-x-sfp28
+  - name: 1/1/11
+    type: 25gbase-x-sfp28
+  - name: 1/1/12
+    type: 25gbase-x-sfp28
+  - name: 1/1/13
+    type: 25gbase-x-sfp28
+  - name: 1/1/14
+    type: 25gbase-x-sfp28
+  - name: 1/1/15
+    type: 25gbase-x-sfp28
+  - name: 1/1/16
+    type: 25gbase-x-sfp28
+  - name: 1/1/17
+    type: 100gbase-x-qsfp28
+  - name: 1/1/18
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-8360-24XF2C-JL710C.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8320-24XF2C
-slug: 8320-24xf2c
-part_number: JL710A
+manufacturer: HPE
+model: Aruba 8320-24XF2C Front-to-Back
+slug: hpe-aruba-8320-24xf2c-jl710c
+part_number: JL710C
 u_height: 1
 is_full_depth: false
-comments: JL710A for Front to Back, JL711A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8360-24XF2C-JL711C.yaml

@@ -0,0 +1,80 @@
+---
+manufacturer: HPE
+model: Aruba 8320-24XF2C Back-to-Front
+slug: hpe-aruba-8320-24xf2c-jl711c
+part_number: JL711C
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 375
+    allocated_draw: 120
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 375
+    allocated_draw: 120
+interfaces:
+  - name: 1/1/1
+    type: 10gbase-x-sfpp
+  - name: 1/1/2
+    type: 10gbase-x-sfpp
+  - name: 1/1/3
+    type: 10gbase-x-sfpp
+  - name: 1/1/4
+    type: 10gbase-x-sfpp
+  - name: 1/1/5
+    type: 10gbase-x-sfpp
+  - name: 1/1/6
+    type: 10gbase-x-sfpp
+  - name: 1/1/7
+    type: 10gbase-x-sfpp
+  - name: 1/1/8
+    type: 10gbase-x-sfpp
+  - name: 1/1/9
+    type: 10gbase-x-sfpp
+  - name: 1/1/10
+    type: 10gbase-x-sfpp
+  - name: 1/1/11
+    type: 10gbase-x-sfpp
+  - name: 1/1/12
+    type: 10gbase-x-sfpp
+  - name: 1/1/13
+    type: 10gbase-x-sfpp
+  - name: 1/1/14
+    type: 10gbase-x-sfpp
+  - name: 1/1/15
+    type: 10gbase-x-sfpp
+  - name: 1/1/16
+    type: 10gbase-x-sfpp
+  - name: 1/1/17
+    type: 10gbase-x-sfpp
+  - name: 1/1/18
+    type: 10gbase-x-sfpp
+  - name: 1/1/19
+    type: 10gbase-x-sfpp
+  - name: 1/1/20
+    type: 10gbase-x-sfpp
+  - name: 1/1/21
+    type: 10gbase-x-sfpp
+  - name: 1/1/22
+    type: 10gbase-x-sfpp
+  - name: 1/1/23
+    type: 10gbase-x-sfpp
+  - name: 1/1/24
+    type: 10gbase-x-sfpp
+  - name: 1/1/25
+    type: 100gbase-x-qsfp28
+  - name: 1/1/26
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-8360-32Y4C-JL700C.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8360-32Y4C
-slug: 8360-32y4c
-part_number: JL700A
+manufacturer: HPE
+model: Aruba 8360-32Y4C Front-to-Back
+slug: hpe-aruba-8360-32y4c-jl700c
+part_number: JL700C
 u_height: 1
 is_full_depth: false
-comments: JL700A for Front to Back, JL701A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8360-32Y4C-JL701C.yaml

@@ -0,0 +1,100 @@
+---
+manufacturer: HPE
+model: Aruba 8360-32Y4C Back-to-Front
+slug: hpe-aruba-8360-32y4c-jl701c
+part_number: JL701C
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 425
+    allocated_draw: 120
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 425
+    allocated_draw: 120
+interfaces:
+  - name: 1/1/1
+    type: 25gbase-x-sfp28
+  - name: 1/1/2
+    type: 25gbase-x-sfp28
+  - name: 1/1/3
+    type: 25gbase-x-sfp28
+  - name: 1/1/4
+    type: 25gbase-x-sfp28
+  - name: 1/1/5
+    type: 25gbase-x-sfp28
+  - name: 1/1/6
+    type: 25gbase-x-sfp28
+  - name: 1/1/7
+    type: 25gbase-x-sfp28
+  - name: 1/1/8
+    type: 25gbase-x-sfp28
+  - name: 1/1/9
+    type: 25gbase-x-sfp28
+  - name: 1/1/10
+    type: 25gbase-x-sfp28
+  - name: 1/1/11
+    type: 25gbase-x-sfp28
+  - name: 1/1/12
+    type: 25gbase-x-sfp28
+  - name: 1/1/13
+    type: 25gbase-x-sfp28
+  - name: 1/1/14
+    type: 25gbase-x-sfp28
+  - name: 1/1/15
+    type: 25gbase-x-sfp28
+  - name: 1/1/16
+    type: 25gbase-x-sfp28
+  - name: 1/1/17
+    type: 25gbase-x-sfp28
+  - name: 1/1/18
+    type: 25gbase-x-sfp28
+  - name: 1/1/19
+    type: 25gbase-x-sfp28
+  - name: 1/1/20
+    type: 25gbase-x-sfp28
+  - name: 1/1/21
+    type: 25gbase-x-sfp28
+  - name: 1/1/22
+    type: 25gbase-x-sfp28
+  - name: 1/1/23
+    type: 25gbase-x-sfp28
+  - name: 1/1/24
+    type: 25gbase-x-sfp28
+  - name: 1/1/25
+    type: 25gbase-x-sfp28
+  - name: 1/1/26
+    type: 25gbase-x-sfp28
+  - name: 1/1/27
+    type: 25gbase-x-sfp28
+  - name: 1/1/28
+    type: 25gbase-x-sfp28
+  - name: 1/1/29
+    type: 25gbase-x-sfp28
+  - name: 1/1/30
+    type: 25gbase-x-sfp28
+  - name: 1/1/31
+    type: 25gbase-x-sfp28
+  - name: 1/1/32
+    type: 25gbase-x-sfp28
+  - name: 1/1/33
+    type: 100gbase-x-qsfp28
+  - name: 1/1/34
+    type: 100gbase-x-qsfp28
+  - name: 1/1/35
+    type: 100gbase-x-qsfp28
+  - name: 1/1/36
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-8360-48XT4C-JL706C.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8360-48XT4C
-slug: 8360-48xt4c
-part_number: JL706A
+manufacturer: HPE
+model: Aruba 8360-48XT4C Front-to-Back
+slug: hpe-aruba-8360-48xt4c-jl706c
+part_number: JL706C
 u_height: 1
 is_full_depth: false
-comments: JL706A for Front to Back, JL707A for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8360-48XT4C-JL707C.yaml

@@ -0,0 +1,130 @@
+---
+manufacturer: HPE
+model: Aruba 8360-48XT4C Back-to-Front
+slug: hpe-aruba-8360-48xt4c-jl707c
+part_number: JL707C
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 500
+    allocated_draw: 120
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 500
+    allocated_draw: 120
+interfaces:
+  - name: 1/1/1
+    type: 10gbase-t
+  - name: 1/1/2
+    type: 10gbase-t
+  - name: 1/1/3
+    type: 10gbase-t
+  - name: 1/1/4
+    type: 10gbase-t
+  - name: 1/1/5
+    type: 10gbase-t
+  - name: 1/1/6
+    type: 10gbase-t
+  - name: 1/1/7
+    type: 10gbase-t
+  - name: 1/1/8
+    type: 10gbase-t
+  - name: 1/1/9
+    type: 10gbase-t
+  - name: 1/1/10
+    type: 10gbase-t
+  - name: 1/1/11
+    type: 10gbase-t
+  - name: 1/1/12
+    type: 10gbase-t
+  - name: 1/1/13
+    type: 10gbase-t
+  - name: 1/1/14
+    type: 10gbase-t
+  - name: 1/1/15
+    type: 10gbase-t
+  - name: 1/1/16
+    type: 10gbase-t
+  - name: 1/1/17
+    type: 10gbase-t
+  - name: 1/1/18
+    type: 10gbase-t
+  - name: 1/1/19
+    type: 10gbase-t
+  - name: 1/1/20
+    type: 10gbase-t
+  - name: 1/1/21
+    type: 10gbase-t
+  - name: 1/1/22
+    type: 10gbase-t
+  - name: 1/1/23
+    type: 10gbase-t
+  - name: 1/1/24
+    type: 10gbase-t
+  - name: 1/1/25
+    type: 10gbase-t
+  - name: 1/1/26
+    type: 10gbase-t
+  - name: 1/1/27
+    type: 10gbase-t
+  - name: 1/1/28
+    type: 10gbase-t
+  - name: 1/1/29
+    type: 10gbase-t
+  - name: 1/1/30
+    type: 10gbase-t
+  - name: 1/1/31
+    type: 10gbase-t
+  - name: 1/1/32
+    type: 10gbase-t
+  - name: 1/1/33
+    type: 10gbase-t
+  - name: 1/1/34
+    type: 10gbase-t
+  - name: 1/1/35
+    type: 10gbase-t
+  - name: 1/1/36
+    type: 10gbase-t
+  - name: 1/1/37
+    type: 10gbase-t
+  - name: 1/1/38
+    type: 10gbase-t
+  - name: 1/1/39
+    type: 10gbase-t
+  - name: 1/1/40
+    type: 10gbase-t
+  - name: 1/1/41
+    type: 10gbase-t
+  - name: 1/1/42
+    type: 10gbase-t
+  - name: 1/1/43
+    type: 10gbase-t
+  - name: 1/1/44
+    type: 10gbase-t
+  - name: 1/1/45
+    type: 10gbase-t
+  - name: 1/1/46
+    type: 10gbase-t
+  - name: 1/1/47
+    type: 10gbase-t
+  - name: 1/1/48
+    type: 10gbase-t
+  - name: 1/1/49
+    type: 100gbase-x-qsfp28
+  - name: 1/1/50
+    type: 100gbase-x-qsfp28
+  - name: 1/1/51
+    type: 100gbase-x-qsfp28
+  - name: 1/1/52
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-8360-48Y6C-JL704C.yaml

@@ -1,11 +1,11 @@
 ---
-manufacturer: Aruba
-model: 8360-48Y6C
-slug: 8360-48y6c
+manufacturer: HPE
+model: Aruba 8360-48Y6C Front-to-Back
+slug: hpe-aruba-8360-48y6c-jl704c
 part_number: JL704C
 u_height: 1
 is_full_depth: false
-comments: JL704C for Front to Back, JL705C for Back to Front
+airflow: front-to-rear
 console-ports:
   - name: rj45-console
     type: rj-45

device-types/HPE/Aruba-8360-48Y6C-JL705C.yaml

@@ -0,0 +1,136 @@
+---
+manufacturer: HPE
+model: Aruba 8360-48Y6C Back-to-Front
+slug: hpe-aruba-8360-48y6c-jl705c
+part_number: JL705C
+u_height: 1
+is_full_depth: false
+airflow: rear-to-front
+console-ports:
+  - name: rj45-console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-b
+  - name: usb-ble
+    type: usb-a
+power-ports:
+  - name: ps1
+    type: iec-60320-c14
+    maximum_draw: 725
+    allocated_draw: 230
+  - name: ps2
+    type: iec-60320-c14
+    maximum_draw: 725
+    allocated_draw: 230
+interfaces:
+  - name: 1/1/1
+    type: 25gbase-x-sfp28
+  - name: 1/1/2
+    type: 25gbase-x-sfp28
+  - name: 1/1/3
+    type: 25gbase-x-sfp28
+  - name: 1/1/4
+    type: 25gbase-x-sfp28
+  - name: 1/1/5
+    type: 25gbase-x-sfp28
+  - name: 1/1/6
+    type: 25gbase-x-sfp28
+  - name: 1/1/7
+    type: 25gbase-x-sfp28
+  - name: 1/1/8
+    type: 25gbase-x-sfp28
+  - name: 1/1/9
+    type: 25gbase-x-sfp28
+  - name: 1/1/10
+    type: 25gbase-x-sfp28
+  - name: 1/1/11
+    type: 25gbase-x-sfp28
+  - name: 1/1/12
+    type: 25gbase-x-sfp28
+  - name: 1/1/13
+    type: 25gbase-x-sfp28
+  - name: 1/1/14
+    type: 25gbase-x-sfp28
+  - name: 1/1/15
+    type: 25gbase-x-sfp28
+  - name: 1/1/16
+    type: 25gbase-x-sfp28
+  - name: 1/1/17
+    type: 25gbase-x-sfp28
+  - name: 1/1/18
+    type: 25gbase-x-sfp28
+  - name: 1/1/19
+    type: 25gbase-x-sfp28
+  - name: 1/1/20
+    type: 25gbase-x-sfp28
+  - name: 1/1/21
+    type: 25gbase-x-sfp28
+  - name: 1/1/22
+    type: 25gbase-x-sfp28
+  - name: 1/1/23
+    type: 25gbase-x-sfp28
+  - name: 1/1/24
+    type: 25gbase-x-sfp28
+  - name: 1/1/25
+    type: 25gbase-x-sfp28
+  - name: 1/1/26
+    type: 25gbase-x-sfp28
+  - name: 1/1/27
+    type: 25gbase-x-sfp28
+  - name: 1/1/28
+    type: 25gbase-x-sfp28
+  - name: 1/1/29
+    type: 25gbase-x-sfp28
+  - name: 1/1/30
+    type: 25gbase-x-sfp28
+  - name: 1/1/31
+    type: 25gbase-x-sfp28
+  - name: 1/1/32
+    type: 25gbase-x-sfp28
+  - name: 1/1/33
+    type: 25gbase-x-sfp28
+  - name: 1/1/34
+    type: 25gbase-x-sfp28
+  - name: 1/1/35
+    type: 25gbase-x-sfp28
+  - name: 1/1/36
+    type: 25gbase-x-sfp28
+  - name: 1/1/37
+    type: 25gbase-x-sfp28
+  - name: 1/1/38
+    type: 25gbase-x-sfp28
+  - name: 1/1/39
+    type: 25gbase-x-sfp28
+  - name: 1/1/40
+    type: 25gbase-x-sfp28
+  - name: 1/1/41
+    type: 25gbase-x-sfp28
+  - name: 1/1/42
+    type: 25gbase-x-sfp28
+  - name: 1/1/43
+    type: 25gbase-x-sfp28
+  - name: 1/1/44
+    type: 25gbase-x-sfp28
+  - name: 1/1/45
+    type: 25gbase-x-sfp28
+  - name: 1/1/46
+    type: 25gbase-x-sfp28
+  - name: 1/1/47
+    type: 25gbase-x-sfp28
+  - name: 1/1/48
+    type: 25gbase-x-sfp28
+  - name: 1/1/49
+    type: 100gbase-x-qsfp28
+  - name: 1/1/50
+    type: 100gbase-x-qsfp28
+  - name: 1/1/51
+    type: 100gbase-x-qsfp28
+  - name: 1/1/52
+    type: 100gbase-x-qsfp28
+  - name: 1/1/53
+    type: 100gbase-x-qsfp28
+  - name: 1/1/54
+    type: 100gbase-x-qsfp28
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true

device-types/HPE/Aruba-IAP-205.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: IAP-205
-slug: iap-205
+manufacturer: HPE
+model: Aruba IAP-205
+slug: hpe-aruba-iap-205
 part_number: IAP-205
 u_height: 0
 is_full_depth: false

device-types/HPE/Aruba-IAP-304.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: IAP-304
-slug: iap-304
+manufacturer: HPE
+model: Aruba IAP-304
+slug: hpe-aruba-iap-304
 part_number: IAP-304
 u_height: 0
 is_full_depth: false

device-types/HPE/Aruba-IAP-305.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: IAP-305
-slug: iap-305
+manufacturer: HPE
+model: Aruba IAP-305
+slug: hpe-aruba-iap-305
 part_number: IAP-305
 u_height: 0
 is_full_depth: false

device-types/HPE/Aruba-IAP-315.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: IAP-315
-slug: iap-315
+manufacturer: HPE
+model: Aruba IAP-315
+slug: hpe-aruba-iap-315
 part_number: IAP-315
 u_height: 0
 is_full_depth: false

device-types/HPE/Aruba-IAP-515.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: IAP-515
-slug: iap-515
+manufacturer: HPE
+model: Aruba IAP-515
+slug: hpe-aruba-iap-515
 part_number: IAP-515
 u_height: 0
 is_full_depth: false

device-types/HPE/Aruba-MC-3200.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: Aruba3200
-slug: aruba3200
+manufacturer: HPE
+model: Aruba 3200
+slug: hpe-aruba-3200
 is_full_depth: false
 u_height: 1
 interfaces:

device-types/HPE/Aruba-MC-3400.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: Aruba3400
-slug: aruba3400
+manufacturer: HPE
+model: Aruba 3400
+slug: hpe-aruba-3400
 is_full_depth: false
 u_height: 1
 interfaces:

device-types/HPE/Aruba-MM-HW-10K.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ArubaMM-HW-5K
-slug: arubamm-hw-5k
+manufacturer: HPE
+model: Aruba MM-HW-10K
+slug: hpe-aruba-mm-hw-10k
 is_full_depth: true
 u_height: 1
 interfaces:

device-types/HPE/Aruba-MM-HW-1K.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ArubaMM-HW-10K
-slug: arubamm-hw-10k
+manufacturer: HPE
+model: Aruba MM-HW-1K
+slug: hpe-aruba-mm-hw-1k
 is_full_depth: true
 u_height: 1
 interfaces:

device-types/HPE/Aruba-MM-HW-5K.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ArubaMM-HW-1K
-slug: arubamm-hw-1k
+manufacturer: HPE
+model: Aruba MM-HW-5K
+slug: hpe-aruba-mm-hw-5k
 is_full_depth: true
 u_height: 1
 interfaces:

device-types/HPE/Aruba-ec-l-b-nm.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-l-b-nm
-slug: ec-l-b-nm
+manufacturer: HPE
+model: Aruba ec-l-b-nm
+slug: hpe-aruba-ec-l-b-nm
 part_number: '201272'
 u_height: 1
 is_full_depth: true

device-types/HPE/Aruba-ec-l-b.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-l-b
-slug: ec-l-b
+manufacturer: HPE
+model: Aruba ec-l-b
+slug: hpe-aruba-ec-l-b
 part_number: '201270'
 u_height: 1
 is_full_depth: true

device-types/HPE/Aruba-ec-l-h.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-l-h
-slug: ec-l-h
+manufacturer: HPE
+model: Aruba ec-l-h
+slug: hpe-aruba-ec-l-h
 part_number: '201754'
 u_height: 1
 is_full_depth: true

device-types/HPE/Aruba-ec-l-nm.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-l-nm
-slug: ec-l-nm
+manufacturer: HPE
+model: Aruba ec-l-nm
+slug: hpe-aruba-ec-l-nm
 part_number: '200887'
 u_height: 1
 is_full_depth: true

device-types/HPE/Aruba-ec-l-p-nm.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-l-p-nm
-slug: ec-l-p-nm
+manufacturer: HPE
+model: Aruba ec-l-p-nm
+slug: hpe-aruba-ec-l-p-nm
 part_number: '201307'
 u_height: 1
 is_full_depth: true

device-types/HPE/Aruba-ec-l-p.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-l-p
-slug: ec-l-p
+manufacturer: HPE
+model: Aruba ec-l-p
+slug: hpe-aruba-ec-l-p
 part_number: '201305'
 u_height: 1
 is_full_depth: true

device-types/HPE/Aruba-ec-l.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-l
-slug: ec-l
+manufacturer: HPE
+model: Aruba ec-l
+slug: hpe-aruba-ec-l
 part_number: '200883'
 u_height: 1
 is_full_depth: true

device-types/HPE/Aruba-ec-m-b-gen2.yaml

@@ -1,7 +1,7 @@
 ---
-manufacturer: Aruba
-model: ec-m-b-gen2
-slug: ec-m-b-gen2
+manufacturer: HPE
+model: Aruba ec-m-b-gen2
+slug: hpe-aruba-ec-m-b-gen2
 part_number: '201553'
 u_height: 1
 is_full_depth: true