Merge branch 'master' into patch-95

device-types/HPE/Aruba-EC-10104.yaml

@@ -1,22 +1,26 @@
 ---
 manufacturer: HPE
-model: Aruba ec-10104
+model: Aruba EC-10104
 slug: hpe-aruba-ec-10104
-part_number: R9D72A
+part_number: '201857'
 u_height: 1
 is_full_depth: false
-airflow: right-to-left
+airflow: passive
 weight: 2.52
 weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
     type: rj-45
     label: console
+  - name: USB console
+    type: usb-micro-b
+    label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: dc-terminal
-    maximum_draw: 30
-    label: power0
+    maximum_draw: 48
 interfaces:
   - name: lan0
     type: 1000base-t

device-types/HPE/Aruba-EC-10106.yaml

@@ -0,0 +1,60 @@
+---
+manufacturer: HPE
+model: Aruba EC-10106
+slug: hpe-aruba-ec-10106
+part_number: '3510325'
+u_height: 1
+is_full_depth: false
+airflow: right-to-left
+weight: 5.08
+weight_unit: lb
+front_image: true
+rear_image: true
+console-ports:
+  - name: console
+    type: rj-45
+    label: console
+  - name: USB console
+    type: usb-c
+    label: console
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 165
+interfaces:
+  - name: lan0
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    label: lan0 (top)
+  - name: lan1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    label: lan1 (bottom)
+  - name: lan2-RJ45
+    type: 1000base-t
+    label: lan2 (combo)
+  - name: lan2-SFP
+    type: 1000base-x-sfp
+    label: lan2 (combo)
+  - name: wan0
+    type: 10gbase-x-sfpp
+    label: wan0 (top)
+  - name: wan1
+    type: 10gbase-x-sfpp
+    label: wan1 (bottom)
+  - name: wan2-RJ45
+    type: 1000base-t
+    label: wan2 (combo)
+  - name: wan2-SFP
+    type: 1000base-x-sfp
+    label: wan2 (combo)
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt0 (top)
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt1 (bottom)

device-types/HPE/Aruba-EC-10108.yaml

@@ -0,0 +1,60 @@
+---
+manufacturer: HPE
+model: Aruba EC-10108
+slug: hpe-aruba-ec-10108
+part_number: '3510326'
+u_height: 1
+is_full_depth: false
+airflow: right-to-left
+weight: 5.08
+weight_unit: lb
+front_image: true
+rear_image: true
+console-ports:
+  - name: console
+    type: rj-45
+    label: console
+  - name: USB console
+    type: usb-c
+    label: console
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 165
+interfaces:
+  - name: lan0
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    label: lan0 (top)
+  - name: lan1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    label: lan1 (bottom)
+  - name: lan2-RJ45
+    type: 1000base-t
+    label: lan2 (combo)
+  - name: lan2-SFP
+    type: 1000base-x-sfp
+    label: lan2 (combo)
+  - name: wan0
+    type: 10gbase-x-sfpp
+    label: wan0 (top)
+  - name: wan1
+    type: 10gbase-x-sfpp
+    label: wan1 (bottom)
+  - name: wan2-RJ45
+    type: 1000base-t
+    label: wan2 (combo)
+  - name: wan2-SFP
+    type: 1000base-x-sfp
+    label: wan2 (combo)
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt0 (top)
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt1 (bottom)

device-types/HPE/Aruba-EC-L-B-NM.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-l-b-nm
+model: Aruba EC-L-B-NM
 slug: hpe-aruba-ec-l-b-nm
 part_number: '201272'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-L-B.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-l-b
+model: Aruba EC-L-B
 slug: hpe-aruba-ec-l-b
 part_number: '201270'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-L-H.yaml

@@ -0,0 +1,50 @@
+---
+manufacturer: HPE
+model: Aruba EC-L-H
+slug: hpe-aruba-ec-l-h
+part_number: '201754'
+u_height: 1
+is_full_depth: true
+airflow: front-to-rear
+weight: 32.0
+weight_unit: lb
+front_image: true
+rear_image: true
+console-ports:
+  - name: console
+    type: de-9
+    label: console
+interfaces:
+  - name: tlan0
+    type: 10gbase-x-sfpp
+    label: tlan0
+  - name: twan0
+    type: 10gbase-x-sfpp
+    label: twan0
+  - name: tlan1
+    type: 10gbase-x-sfpp
+    label: tlan1
+  - name: twan1
+    type: 10gbase-x-sfpp
+    label: twan1
+  - name: tlan2
+    type: 10gbase-x-sfpp
+    label: tlan2
+  - name: twan2
+    type: 10gbase-x-sfpp
+    label: twan2
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt0
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt1
+module-bays:
+  - name: PS1
+    position: '1'
+    label: PS1
+  - name: PS2
+    position: '2'
+    label: PS2

device-types/HPE/Aruba-EC-L-NM.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-l-nm
+model: Aruba EC-L-NM
 slug: hpe-aruba-ec-l-nm
 part_number: '200887'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-L-P-NM.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-l-p-nm
+model: Aruba EC-L-P-NM
 slug: hpe-aruba-ec-l-p-nm
 part_number: '201307'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 37.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-L-P.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-l-p
+model: Aruba EC-L-P
 slug: hpe-aruba-ec-l-p
 part_number: '201305'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-L.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-l
+model: Aruba EC-L
 slug: hpe-aruba-ec-l
 part_number: '200883'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-M-B-gen2.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-m-b-gen2
+model: Aruba EC-M-B gen2
 slug: hpe-aruba-ec-m-b-gen2
 part_number: '201553'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 22
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-M-B.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-m-b
+model: Aruba EC-M-B
 slug: hpe-aruba-ec-m-b
 part_number: '200969'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 24
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-M-H-AC.yaml

@@ -1,47 +1,66 @@
 ---
 manufacturer: HPE
-model: Aruba ec-m-h-ac
+model: Aruba EC-M-H AC
 slug: hpe-aruba-ec-m-h-ac
 part_number: '201762'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 18.1
+weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
-    type: de-9
+    type: rj-45
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
 interfaces:
-  - name: lan0
-    type: 1000base-t
-    label: lan0
-  - name: lan1
-    type: 1000base-t
-    label: lan1
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
+  - name: tlan1
+    type: 10gbase-x-sfpp
+    label: tlan1
+  - name: twan1
+    type: 10gbase-x-sfpp
+    label: twan1
+  - name: lan0
+    type: 1000base-t
+    label: lan0
+  - name: lan1
+    type: 1000base-t
+    label: lan1
+  - name: lan2
+    type: 1000base-t
+    label: lan2
+  - name: lan3
+    type: 1000base-t
+    label: lan3
   - name: wan0
     type: 1000base-t
     label: wan0
   - name: wan1
     type: 1000base-t
     label: wan1
+  - name: wan2
+    type: 1000base-t
+    label: wan2
+  - name: wan3
+    type: 1000base-t
+    label: wan3
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-M-P-FIPS.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-m-p-fips
+model: Aruba EC-M-P-FIPS
 slug: hpe-aruba-ec-m-p-fips
 part_number: '201634'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 22
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-M-P-gen2.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-m-p-gen2
+model: Aruba EC-M-P gen2
 slug: hpe-aruba-ec-m-p-gen2
 part_number: '201552'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 24
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-M-P.yaml

@@ -1,24 +1,17 @@
 ---
 manufacturer: HPE
-model: Aruba ec-m-p
+model: Aruba EC-M-P
 slug: hpe-aruba-ec-m-p
 part_number: '201274'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 24
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +25,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
@@ -45,3 +39,8 @@ interfaces:
   - name: wan1
     type: 1000base-t
     label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-M.yaml

@@ -1,47 +1,46 @@
 ---
 manufacturer: HPE
-model: Aruba ec-m
+model: Aruba EC-M
 slug: hpe-aruba-ec-m
 part_number: '200890'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 26
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
-    type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
     label: lan0
+  - name: wan0
+    type: 1000base-t
+    label: wan0
   - name: lan1
     type: 1000base-t
     label: lan1
+  - name: wan1
+    type: 1000base-t
+    label: wan1
+  - name: tlan0
+    type: 10gbase-x-sfpp
+    label: tlan0
+  - name: twan0
+    type: 10gbase-x-sfpp
+    label: twan0
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
-  - name: tlan0
-    type: 10gbase-x-sfpp
-    label: tlan0
-  - name: twan0
-    type: 1000base-t
-    label: twan0
-  - name: wan0
-    type: 1000base-t
-    label: wan0
-  - name: wan1
-    type: 1000base-t
-    label: wan1
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-S-P-AC.yaml

@@ -1,43 +1,66 @@
 ---
 manufacturer: HPE
-model: Aruba ec-s-p-ac
+model: Aruba EC-S-P AC
 slug: hpe-aruba-ec-s-p-ac
 part_number: '201687'
 u_height: 1
 is_full_depth: false
 airflow: front-to-rear
+weight: 18.14
+weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
     type: rj-45
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 100
-    label: power0
 interfaces:
-  - name: lan0
-    type: 1000base-t
-    label: lan0
-  - name: lan1
-    type: 1000base-t
-    label: lan1
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
-  - name: lan2
+  - name: tlan0
     type: 10gbase-x-sfpp
-    label: lan2
-  - name: wan2
+    label: tlan0
+  - name: twan0
+    type: 10gbase-x-sfpp
+    label: twan0
+  - name: tlan1
+    type: 10gbase-x-sfpp
+    label: tlan1
+  - name: twan1
+    type: 10gbase-x-sfpp
+    label: twan1
+  - name: lan0
     type: 1000base-t
-    label: wan2
+    label: lan0
+  - name: lan1
+    type: 1000base-t
+    label: lan1
+  - name: lan2
+    type: 1000base-t
+    label: lan2
+  - name: lan3
+    type: 1000base-t
+    label: lan3
   - name: wan0
     type: 1000base-t
     label: wan0
   - name: wan1
     type: 1000base-t
     label: wan1
+  - name: wan2
+    type: 1000base-t
+    label: wan2
+  - name: wan3
+    type: 1000base-t
+    label: wan3
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-S-P-DC.yaml

@@ -1,43 +1,66 @@
 ---
 manufacturer: HPE
-model: Aruba ec-s-p-dc
+model: Aruba EC-S-P DC
 slug: hpe-aruba-ec-s-p-dc
 part_number: '201743'
 u_height: 1
 is_full_depth: false
 airflow: front-to-rear
+weight: 18.14
+weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
     type: rj-45
     label: console
-power-ports:
-  - name: power0
-    type: iec-60320-c14
-    maximum_draw: 100
-    label: power0
 interfaces:
-  - name: lan0
-    type: 1000base-t
-    label: lan0
-  - name: lan1
-    type: 1000base-t
-    label: lan1
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
-  - name: lan2
+  - name: tlan0
     type: 10gbase-x-sfpp
-    label: lan2
-  - name: wan2
+    label: tlan0
+  - name: twan0
+    type: 10gbase-x-sfpp
+    label: twan0
+  - name: tlan1
+    type: 10gbase-x-sfpp
+    label: tlan1
+  - name: twan1
+    type: 10gbase-x-sfpp
+    label: twan1
+  - name: lan0
     type: 1000base-t
-    label: wan2
+    label: lan0
+  - name: lan1
+    type: 1000base-t
+    label: lan1
+  - name: lan2
+    type: 1000base-t
+    label: lan2
+  - name: lan3
+    type: 1000base-t
+    label: lan3
   - name: wan0
     type: 1000base-t
     label: wan0
   - name: wan1
     type: 1000base-t
     label: wan1
+  - name: wan2
+    type: 1000base-t
+    label: wan2
+  - name: wan3
+    type: 1000base-t
+    label: wan3
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/HPE/Aruba-EC-S.yaml

@@ -1,43 +1,49 @@
 ---
 manufacturer: HPE
-model: Aruba ec-s
+model: Aruba EC-S
 slug: hpe-aruba-ec-s
 part_number: '200877'
 u_height: 1
 is_full_depth: false
 airflow: front-to-rear
+weight: 11.0
+weight_unit: lb
 console-ports:
   - name: console
     type: rj-45
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
     maximum_draw: 100
-    label: power0
+    label: Power
 interfaces:
   - name: lan0
     type: 1000base-t
     label: lan0
+  - name: wan0
+    type: 1000base-t
+    label: wan0
   - name: lan1
     type: 1000base-t
     label: lan1
+  - name: wan1
+    type: 1000base-t
+    label: wan1
+  - name: lan2
+    type: 1000base-t
+    label: lan2
+  - name: wan2
+    type: 1000base-t
+    label: wan2
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
-  - name: lan2
-    type: 10gbase-x-sfpp
-    label: lan2
-  - name: wan2
-    type: 1000base-t
-    label: wan2
-  - name: wan0
-    type: 1000base-t
-    label: wan0
-  - name: wan1
-    type: 1000base-t
-    label: wan1
+module-bays:
+  - name: Fiber Module
+    position: '1'

device-types/HPE/Aruba-EC-US.yaml

@@ -1,20 +1,23 @@
 ---
 manufacturer: HPE
-model: Aruba ec-us
+model: Aruba EC-US
 slug: hpe-aruba-ec-us
 part_number: '201106'
 u_height: 1
 is_full_depth: false
 airflow: passive
+weight: 1.1
+weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
     type: rj-45
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: dc-terminal
     maximum_draw: 9
-    label: power0
 interfaces:
   - name: lan0
     type: 1000base-t

device-types/HPE/Aruba-EC-XL-H.yaml

@@ -0,0 +1,50 @@
+---
+manufacturer: HPE
+model: Aruba EC-XL-H
+slug: hpe-aruba-ec-xl-h
+part_number: '201756'
+u_height: 1
+is_full_depth: true
+airflow: front-to-rear
+weight: 33.5
+weight_unit: lb
+front_image: true
+rear_image: true
+console-ports:
+  - name: console
+    type: de-9
+    label: console
+interfaces:
+  - name: tlan0
+    type: 10gbase-x-sfpp
+    label: tlan0
+  - name: twan0
+    type: 10gbase-x-sfpp
+    label: twan0
+  - name: tlan1
+    type: 10gbase-x-sfpp
+    label: tlan1
+  - name: twan1
+    type: 10gbase-x-sfpp
+    label: twan1
+  - name: tlan2
+    type: 10gbase-x-sfpp
+    label: tlan2
+  - name: twan2
+    type: 10gbase-x-sfpp
+    label: twan2
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt0
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt1
+module-bays:
+  - name: PS1
+    position: '1'
+    label: PS1
+  - name: PS2
+    position: '2'
+    label: PS2

device-types/HPE/Aruba-EC-XS-FIPS.yaml

@@ -1,20 +1,23 @@
 ---
 manufacturer: HPE
-model: Aruba ec-xs-fips
+model: Aruba EC-XS-FIPS
 slug: hpe-aruba-ec-xs-fips
 part_number: '201447'
 u_height: 1
 is_full_depth: false
 airflow: right-to-left
+weight: 3.0
+weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
     type: rj-45
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: dc-terminal
     maximum_draw: 23
-    label: power0
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -34,4 +37,5 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1

device-types/HPE/Aruba-EC-XS-gen2.yaml

@@ -1,20 +1,23 @@
 ---
 manufacturer: HPE
-model: Aruba ec-xs-gen2
+model: Aruba EC-XS gen2
 slug: hpe-aruba-ec-xs-gen2
 part_number: '201571'
 u_height: 1
 is_full_depth: false
 airflow: right-to-left
+weight: 3.5
+weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
     type: rj-45
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: dc-terminal
-    maximum_draw: 23
-    label: power0
+    maximum_draw: 34
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -34,4 +37,5 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1

device-types/HPE/Aruba-EC-XS-gen3.yaml

@@ -0,0 +1,41 @@
+---
+manufacturer: HPE
+model: Aruba EC-XS gen3
+slug: hpe-aruba-ec-xs-gen3
+part_number: '201694'
+u_height: 1
+is_full_depth: false
+airflow: right-to-left
+weight: 3.1
+weight_unit: lb
+front_image: true
+rear_image: true
+console-ports:
+  - name: console
+    type: rj-45
+    label: console
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 34
+interfaces:
+  - name: lan0
+    type: 1000base-t
+    label: lan0
+  - name: lan1
+    type: 1000base-t
+    label: lan1
+  - name: wan0
+    type: 1000base-t
+    label: wan0
+  - name: wan1
+    type: 1000base-t
+    label: wan1
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt0
+  - name: mgmt1
+    type: 1000base-t
+    mgmt_only: true
+    label: mgmt1

device-types/HPE/Aruba-EC-XS.yaml

@@ -1,20 +1,23 @@
 ---
 manufacturer: HPE
-model: Aruba ec-xs
+model: Aruba EC-XS
 slug: hpe-aruba-ec-xs
 part_number: '200889'
 u_height: 1
 is_full_depth: false
 airflow: right-to-left
+weight: 3.0
+weight_unit: lb
+front_image: true
+rear_image: true
 console-ports:
   - name: console
     type: rj-45
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: dc-terminal
     maximum_draw: 23
-    label: power0
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -34,4 +37,5 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1

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

@@ -1,30 +0,0 @@
----
-manufacturer: HPE
-model: Aruba ec-v
-slug: hpe-aruba-ec-v
-u_height: 1
-is_full_depth: false
-airflow: passive
-power-ports:
-  - name: Power
-    type: dc-terminal
-interfaces:
-  - name: lan0
-    type: virtual
-    label: lan0
-  - name: lan1
-    type: virtual
-    label: lan1
-  - name: wan0
-    type: virtual
-    label: wan0
-  - name: wan1
-    type: virtual
-    label: wan1
-  - name: mgmt0
-    type: virtual
-    mgmt_only: true
-    label: mgmt0
-  - name: mgmt1
-    type: virtual
-    label: mgmt1

module-types/HPE/Aruba-EC-H-PSU-800W.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-H-PSU-800W
+part_number: 500646-001 / JZ887A
+comments: Compatible with Aruba EC-L-H (404W) and EC-XL-H (435W)
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 435

module-types/HPE/Aruba-EC-M-H-PSU-AC.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-M-H-PSU-AC
+part_number: 500615-001
+comments: Compatible with Aruba EC-M-H
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 153

module-types/HPE/Aruba-EC-NX-PSU-350W.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-NX-PSU-350W
+part_number: 500225-001
+comments: Compatible with Aruba EC-M (126W), EC-M-B (132W), EC-M-B gen2 (162W), EC-M-P (132W), EC-M-P gen2 (162W), EC-M-P-FIPS (162W)
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 162

module-types/HPE/Aruba-EC-NX-PSU-750W.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-NX-PSU-750W
+part_number: 500223-001
+comments: Compatible with Aruba EC-L (401W), EC-L-B (440W), EC-L-P (440W), EC-L-NM (440W), EC-L-B-NM (370W), EC-L-P-NM (370W)
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 440

module-types/HPE/Aruba-EC-S-P-PSU-AC.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-S-P-PSU-AC
+part_number: 500615-001
+comments: Compatible with Aruba EC-S-P (AC)
+power-ports:
+  - name: PS{module}
+    type: iec-60320-c14
+    maximum_draw: 111

module-types/HPE/Aruba-EC-S-P-PSU-DC.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: HPE
+model: Aruba EC-S-P-PSU-DC
+part_number: 500619-001
+comments: Compatible with Aruba EC-S-P (DC)
+power-ports:
+  - name: PS{module}
+    type: dc-terminal
+    maximum_draw: 103