Adding Tests: Device Power (#1463)

* broke component validation out to its own function. Adding logic for validating device power input.

* Added console-port poe true for adapters. Updating devices to add proper power sources.

* Adding switches to allow for tests to properly determine POE status.

* Fixing files with missing power definitions.

README.md

@@ -41,7 +41,7 @@ The following fields may **optionally** be declared:
 > :test_tube: **Example**: `part_number: D109-C3`
 - `u_height`: The height of the device type in rack units. Increments of 0.5U are supported. (**Default: 1**)
   - Type: number (minimum of `0`, multiple of `0.5`)
-> :test_tube: **Example**: `u_height: 12.5` 
+> :test_tube: **Example**: `u_height: 12.5`
 - `is_full_depth`: A boolean which indicates whether the device type consumes both the front and rear rack faces. (**Default: true**)
   - Type: Boolean
 > :test_tube: **Example**: `is_full_depth: false`
@@ -87,6 +87,9 @@ The following fields may **optionally** be declared:
 >weight: 12.21
 >weight_unit: lb
 >```
+- `is_powered`: A boolean which indicates whether the device type does not take power. This is mainly used as a workaround for validation testing on non-devices (i.e. rackmount kits for mounting desktop devices) (**Default: True**)
+  - Type: Boolean
+> :test_tube: **Example**: `is_powered: false`
 
 For further detail on these attributes and those listed below, please reference the
 [schema definitions](schema/) and the [Component Definitions](#component-definitions) below.
@@ -114,6 +117,7 @@ The available fields for each type of component are listed below.
 - `name`: Name
 - `label`: Label
 - `type`: Port type slug (Array)
+- `poe`: Does this port access/provide POE? (Boolean)
 
 #### Console Server Ports
 
@@ -158,6 +162,7 @@ The available fields for each type of component are listed below.
 - `label`: Label
 - `type`: Port type slug (Array)
 - `positions`: The number of front ports that can map to this rear port (default: 1)
+- `poe`: Does this port access/provide POE? (Boolean)
 
 #### Module Bays
 

device-types/APC/AR8425A.yaml

@@ -1,8 +0,0 @@
----
-manufacturer: APC
-model: AR8425A
-slug: apc-ar8425a
-part_number: AR8425A
-u_height: 1
-is_full_depth: false
-airflow: passive

device-types/APC/BN450M.yaml

@@ -5,6 +5,9 @@ slug: apc-bn450m
 u_height: 3
 is_full_depth: false
 comments: '[APC BN450M Datasheet](https://www.se.com/ww/en/product/download-pdf/BN450M)'
+power-ports:
+  - name: Input
+    type: nema-5-15p
 power-outlets:
   - name: Batery + Surge - Outlet 1
     type: nema-5-15r

device-types/APC/SMX120BP.yaml

@@ -6,3 +6,6 @@ part_number: SMX120BP
 comments: APC Smart-UPS X 120V External Battery Pack Rack/Tower
 u_height: 4
 is_full_depth: true
+power-ports:
+  - name: UPS Input
+    type: other

device-types/APC/SRT5KRMXLI.yaml

@@ -9,6 +9,9 @@ comments: Hard wire 3-wire (1P + N + E) power port
 console-ports:
   - name: Serial
     type: rj-45
+power-ports:
+  - name: UPS Input
+    type: hardwired
 power-outlets:
   - name: Group 1 Outlet 1
     type: iec-60320-c13

device-types/APC/SRT5KRMXLW-HW.yaml

@@ -9,6 +9,9 @@ comments: All power ports and outlets are hardwired
 console-ports:
   - name: Serial
     type: rj-45
+power-ports:
+  - name: UPS Input
+    type: hardwired
 interfaces:
   - name: Ethernet
     type: 100base-tx

device-types/APC/SRT6KRMXLI.yaml

@@ -9,6 +9,9 @@ comments: Hard wire 3-wire (1P + N + E) power port
 console-ports:
   - name: Serial
     type: rj-45
+power-ports:
+  - name: UPS Input
+    type: hardwired
 power-outlets:
   - name: Group 1 Outlet 1
     type: iec-60320-c13

device-types/APC/SRT8KRMXLT.yaml

@@ -9,6 +9,9 @@ comments: Hard wire 3-wire (2P + E) power port
 console-ports:
   - name: Serial
     type: rj-45
+power-ports:
+  - name: UPS Input
+    type: hardwired
 power-outlets:
   - name: Group 1 Outlet 1
     type: nema-l6-20r

device-types/Apple/A1427.yaml

@@ -6,6 +6,9 @@ part_number: A1427
 is_full_depth: false
 comments: "- Order Number: MD199LL/A\r\n- Model Number: A1427\r\n- EMC: 2633\r\n- Edition: 3th Gen\r\n- Processor Speed: 1 GHz\r\n- Processor Type: Apple\
   \ A5\r\n- Processors (Cores): 1\r\n- Hard Drive: 8 GB NAND flash\r\n- RAM: 512 MB\r\n- Input: Apple Remote (aluminum)\r\n- Release Date: March 7, 2012"
+power-ports:
+  - name: Power
+    type: nema-1-15p
 interfaces:
   - name: eth
     type: 100base-tx

device-types/Apple/A1469.yaml

@@ -6,6 +6,9 @@ part_number: A1469
 is_full_depth: false
 comments: "- Order Number: MD199LL/A\r\n- Model Number: A1469\r\n- EMC: 2633\r\n- Edition: 3th Gen\r\n- Processor Speed: 1 GHz\r\n- Processor Type: Apple\
   \ A5\r\n- Processors (Cores): 1\r\n- Hard Drive: 8 GB NAND flash\r\n- RAM: 512 MB\r\n- Input: Apple Remote (aluminum)\r\n- Release Date: March 7, 2012"
+power-ports:
+  - name: Power
+    type: nema-1-15p
 interfaces:
   - name: eth
     type: 100base-tx

device-types/Apple/A1625.yaml

@@ -7,6 +7,9 @@ is_full_depth: false
 u_height: 0
 comments: "- Order Number: MGY52LL/A\r\n- Model Number: A1625\r\n- EMC: 2907\r\n- Edition: 4th Gen\r\n- Processor Speed: 1.4GHz\r\n- Processor Type: Apple\
   \ A8\r\n- Processors (Cores): 1\r\n- Hard Drive: 32GB\r\n- RAM: 2GB\r\n- Input: Siri Remote\r\n- Release Date: September 9th 2015"
+power-ports:
+  - name: Power
+    type: nema-1-15p
 interfaces:
   - name: eth
     type: 1000base-t

device-types/Apple/A1842.yaml

@@ -7,6 +7,9 @@ is_full_depth: false
 u_height: 0
 comments: "- Order Number: \tMQD22LL/A\r\n- Model Number: A1842\r\n- EMC: 2907\r\n- Edition: 4K\r\n- Processor Speed: 2.3 GHz\r\n- Processor Type: A10X\
   \ Fusion\r\n- Processors (Cores): 1\r\n- Hard Drive: \t32, 64 GB\r\n- RAM: 3GB\r\n- Input: Black Siri Remote\r\n- Release Date: September 12, 2017"
+power-ports:
+  - name: Power
+    type: nema-1-15p
 interfaces:
   - name: eth
     type: 1000base-t

device-types/Apple/A2169.yaml

@@ -7,6 +7,9 @@ is_full_depth: false
 u_height: 0
 comments: "- Order Number: \tMXGY2LL/A\r\n- Model Number: A2169\r\n- EMC: 3111\r\n- Edition: 4K (2nd Gen)\r\n- Processor Speed: 2.49 GHz\r\n- Processor\
   \ Type: A12 Bionic\r\n- Processors (Cores): 1\r\n- Hard Drive: \t32, 64 GB\r\n- RAM: 3GB\r\n- Input: Silver Siri Remote\r\n- Release Date: April 20, 2021"
+power-ports:
+  - name: Power
+    type: nema-1-15p
 interfaces:
   - name: eth
     type: 1000base-t

device-types/Avocent/DSRIQ-PS2.yaml

@@ -7,6 +7,7 @@ is_full_depth: false
 console-ports:
   - name: DSR
     type: rj-45
+    poe: true
 console-server-ports:
   - name: VGA
     type: other

device-types/Avocent/DSRIQ-USB.yaml

@@ -7,6 +7,7 @@ is_full_depth: false
 console-ports:
   - name: DSR
     type: rj-45
+    poe: true
 console-server-ports:
   - name: VGA
     type: other

device-types/Avocent/DSRIQ-VSN.yaml

@@ -7,6 +7,7 @@ is_full_depth: false
 console-ports:
   - name: DSR
     type: rj-45
+    poe: true
 console-server-ports:
   - name: VGA
     type: other

device-types/Avocent/MPUIQ-SRL.yaml

@@ -10,6 +10,7 @@ comments: MPU IQ Serial Adapter
 console-ports:
   - name: KVM
     type: rj-45
+    poe: true
 console-server-ports:
   - name: con0
     type: rj-45

device-types/Avocent/MPUIQ-VMCHS.yaml

@@ -10,6 +10,7 @@ comments: MPU IQ Serial Adapter
 console-ports:
   - name: KVM
     type: rj-45
+    poe: true
 console-server-ports:
   - name: vga0
     type: other

device-types/Check Point/CPAC-1500-3600-3800-RM-DUAL.yaml

@@ -5,6 +5,7 @@ slug: check-point-cpac-1500-3600-3800-rm-dual
 part_number: CPAC-1500/3600/3800-RM-DUAL
 u_height: 1
 is_full_depth: false
+is_powered: false
 comments: Rack Mount shelf for Single/Dual for 1500/ 3600/ 3800 desktop appliances
 subdevice_role: parent
 device-bays:

device-types/Cisco/AIR-AP1562D-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-AP1562D-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-AP1562I-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-AP1562I-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-AP1572EAC-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-AP1572EAC-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-AP2802E-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-AP2802E-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-AP2802I-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-AP2802I-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-AP3802E-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-AP3802E-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-AP3802I-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-AP3802I-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-BR1310G-A-K9-R.yaml

@@ -6,5 +6,8 @@ part_number: AIR-BR1310G-A-K9-R
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 100base-tx
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11g

device-types/Cisco/AIR-BR1410A-A-K9-N.yaml

@@ -1,7 +0,0 @@
----
-manufacturer: Cisco
-model: Aironet BR1410A-A
-slug: cisco-air-br1410a-a-k9-n
-part_number: AIR-BR1410A-A-K9-N
-u_height: 0
-is_full_depth: false

device-types/Cisco/AIR-CAP1532E-A-K9.yaml

@@ -11,6 +11,7 @@ console-ports:
 interfaces:
   - name: Port 1
     type: 1000base-t
+    poe_mode: pd
   - name: Port 2
     type: 1000base-t
   - name: WiFi

device-types/Cisco/AIR-CAP1552H-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP1552H-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP1552H-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP1552H-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP2602E-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP2602E-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP2602I-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP2602I-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP2602I-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP2602I-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP3502E-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3502E-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP3602E-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3602E-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP3602I-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3602I-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP3602I-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3602I-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11n

device-types/Cisco/AIR-CAP3702E-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3702E-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-CAP3702E-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3702E-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-CAP3702I-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3702I-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-CAP3702I-B-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-CAP3702I-B-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 1000base-t
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11ac

device-types/Cisco/AIR-LAP1242AG-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-LAP1242AG-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 100base-tx
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11g

device-types/Cisco/AIR-LAP1522HZ-A-K9.yaml

@@ -6,5 +6,8 @@ part_number: AIR-LAP1522HZ-A-K9
 u_height: 0
 is_full_depth: false
 interfaces:
+  - name: WAN
+    type: 100base-tx
+    poe_mode: pd
   - name: WiFi
     type: ieee802.11g

device-types/Cisco/C9120AXI-E.yaml

@@ -10,6 +10,7 @@ interfaces:
     type: ieee802.11ax
   - name: GigabitEthernet0
     type: 2.5gbase-t
+    poe_mode: pd
 console-ports:
   - name: console
     type: rj-45

device-types/Cisco/C9130AXI-B.yaml

@@ -10,6 +10,7 @@ interfaces:
     type: ieee802.11ax
   - name: GigabitEthernet0
     type: 5gbase-t
+    poe_mode: pd
 console-ports:
   - name: console
     type: rj-45

device-types/Cisco/C9130AXI-E.yaml

@@ -10,6 +10,7 @@ interfaces:
     type: ieee802.11ax
   - name: GigabitEthernet0
     type: 5gbase-t
+    poe_mode: pd
 console-ports:
   - name: console
     type: rj-45

device-types/Cisco/IE-2000-16PTC-G-E.yaml

@@ -5,6 +5,16 @@ part_number: IE-2000-16PTC-G-E
 slug: cisco-ie-2000-16ptc-g-e
 u_height: 3
 is_full_depth: false
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: usb
+    type: usb-mini-b
+power-ports:
+  - name: DC-A
+    type: dc-terminal
+  - name: DC-B
+    type: dc-terminal
 interfaces:
   - name: FastEthernet1/1
     type: 100base-tx
@@ -42,8 +52,3 @@ interfaces:
     type: 1000base-t
   - name: GigabitEthernet1/2
     type: 1000base-t
-console-ports:
-  - name: con 0
-    type: rj-45
-  - name: usb
-    type: usb-mini-b

device-types/Cisco/IE-2000-16PTC-G-NX.yaml

@@ -5,6 +5,16 @@ part_number: IE-2000-16PTC-G-NX
 slug: cisco-ie-2000-16ptc-g-nx
 u_height: 3
 is_full_depth: false
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: usb
+    type: usb-mini-b
+power-ports:
+  - name: DC-A
+    type: dc-terminal
+  - name: DC-B
+    type: dc-terminal
 interfaces:
   - name: FastEthernet1/1
     type: 100base-tx
@@ -42,8 +52,3 @@ interfaces:
     type: 1000base-t
   - name: GigabitEthernet1/2
     type: 1000base-t
-console-ports:
-  - name: con 0
-    type: rj-45
-  - name: usb
-    type: usb-mini-b

device-types/Cisco/IE-2000-4TS-G-B.yaml

@@ -5,6 +5,16 @@ part_number: IE-2000-4TS-G-B
 slug: cisco-ie-2000-4ts-g-b
 u_height: 3
 is_full_depth: false
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: usb
+    type: usb-mini-b
+power-ports:
+  - name: DC-A
+    type: dc-terminal
+  - name: DC-B
+    type: dc-terminal
 interfaces:
   - name: FastEthernet1/1
     type: 100base-tx
@@ -18,8 +28,3 @@ interfaces:
     type: 1000base-t
   - name: GigabitEthernet1/2
     type: 1000base-t
-console-ports:
-  - name: con 0
-    type: rj-45
-  - name: usb
-    type: usb-mini-b

device-types/Cisco/IE-4000-4GC4GP4G-E.yaml

@@ -11,6 +11,11 @@ console-ports:
     type: usb-mini-b
   - name: console port
     type: rj-45
+power-ports:
+  - name: DC-A
+    type: dc-terminal
+  - name: DC-B
+    type: dc-terminal
 interfaces:
   - name: GigabitEthernet1/1
     type: 1000base-t

device-types/Cisco/IE-4000-8GT8GP4G-E.yaml

@@ -5,6 +5,14 @@ part_number: IE-4000-8GT8GP4G-E
 slug: cisco-ie-4000-8gt8gp4g-e
 u_height: 3
 is_full_depth: false
+console-ports:
+  - name: usb
+    type: usb-mini-b
+power-ports:
+  - name: DC-A
+    type: dc-terminal
+  - name: DC-B
+    type: dc-terminal
 interfaces:
   - name: GigabitEthernet1/1
     type: 1000base-t
@@ -46,6 +54,3 @@ interfaces:
     type: 1000base-t
   - name: GigabitEthernet1/20
     type: 1000base-t
-console-ports:
-  - name: usb
-    type: usb-mini-b

device-types/Cisco/IR829GW-LTE-NA-AK9.yaml

@@ -5,6 +5,12 @@ part_number: IR829GW-LTE-NA-AK9
 slug: cisco-ir829gw-lte-na-ak9
 u_height: 1
 is_full_depth: false
+console-ports:
+  - name: usb
+    type: usb-mini-b
+power-ports:
+  - name: DC-A
+    type: dc-terminal
 interfaces:
   - name: GigabitEthernet1
     type: 1000base-t
@@ -20,6 +26,3 @@ interfaces:
     type: lte
   - name: cellular1
     type: lte
-console-ports:
-  - name: usb
-    type: usb-mini-b

device-types/Cisco/ME-3600X-24FS-M.yaml

@@ -8,6 +8,11 @@ u_height: 1
 console-ports:
   - name: Console
     type: rj-45
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
 interfaces:
   - name: Gi0
     type: 1000base-t

device-types/Cisco/ME-3600X-24TS-M.yaml

@@ -8,6 +8,11 @@ u_height: 1
 console-ports:
   - name: Console
     type: rj-45
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
 interfaces:
   - name: Gi0
     type: 1000base-t

device-types/Cisco/ME-3750-24TE-M.yaml

@@ -5,6 +5,14 @@ slug: cisco-me-3750-24te-m
 part_number: ME-3750-24TE-M
 is_full_depth: true
 u_height: 1
+console-ports:
+  - name: con0
+    type: rj-45
+module-bays:
+  - name: PSU0
+    position: '1'
+  - name: PSU1
+    position: '2'
 interfaces:
   - name: Fa1/0/1
     type: 100base-tx
@@ -62,9 +70,3 @@ interfaces:
     type: 1000base-t
   - name: Gi1/1/2
     type: 1000base-t
-console-ports:
-  - name: con0
-    type: rj-45
-power-ports:
-  - name: PSU0
-    type: iec-60320-c14

device-types/Cisco/ME-3800X-24FS-M.yaml

@@ -5,6 +5,14 @@ slug: cisco-me-3800x-24fs-m
 part_number: ME-3800X-24FS-M
 is_full_depth: false
 u_height: 1
+console-ports:
+  - name: con0
+    type: rj-45
+module-bays:
+  - name: PSU0
+    position: '1'
+  - name: PSU1
+    position: '2'
 interfaces:
   - name: GigabitEthernet0/1
     type: 1000base-x-sfp
@@ -61,13 +69,3 @@ interfaces:
   - name: GigabitEthernet1
     type: 1000base-t
     mgmt_only: true
-console-ports:
-  - name: con0
-    type: rj-45
-power-ports:
-  - name: PSU0
-    type: iec-60320-c14
-    maximum_draw: 233
-  - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 233

device-types/Cisco/Meraki-MR36.yaml

@@ -10,6 +10,7 @@ comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Spe
 interfaces:
   - name: main
     type: 2.5gbase-t
+    poe_mode: pd
   - name: wlan0
     type: ieee802.11n
   - name: wlan1

device-types/Cisco/Meraki-MR42.yaml

@@ -12,8 +12,8 @@ comments: "- Datasheet: [https://meraki.cisco.com/lib/pdf/meraki_datasheet_MR42.
 interfaces:
   - name: main
     type: 1000base-t
-    poe-mode: pse
-    poe-type: type2-ieee802.3at
+    poe_mode: pd
+    poe_type: type2-ieee802.3at
   - name: wlan0
     type: ieee802.11n
   - name: wlan1

device-types/Cisco/Meraki-MR44.yaml

@@ -10,6 +10,7 @@ comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Spe
 interfaces:
   - name: main
     type: 2.5gbase-t
+    poe_mode: pd
   - name: wlan0
     type: ieee802.11n
   - name: wlan1

device-types/Cisco/Meraki-MR52.yaml

@@ -12,6 +12,7 @@ comments: "[Cisco Meraki MR52 Datasheet](https://meraki.cisco.com/product-collat
 interfaces:
   - name: eth0
     type: 1000base-t
+    poe_mode: pd
   - name: eth1
     type: 1000base-t
   - name: wlan0

device-types/Cisco/Meraki-MR53.yaml

@@ -10,6 +10,7 @@ comments: "- Datasheet: [https://meraki.cisco.com/product-collateral/mr53-datash
 interfaces:
   - name: eth0
     type: 2.5gbase-t
+    poe_mode: pd
   - name: eth1
     type: 1000base-t
   - name: wlan0

device-types/Cisco/Meraki-MR53E.yaml

@@ -10,6 +10,7 @@ comments: "- Datasheet: [https://meraki.cisco.com/product-collateral/mr53e-datas
 interfaces:
   - name: main
     type: 2.5gbase-t
+    poe_mode: pd
   - name: secondary
     type: 1000base-t
   - name: wlan0

device-types/Cisco/Meraki-MR56.yaml

@@ -10,6 +10,7 @@ comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Spe
 interfaces:
   - name: main
     type: 2.5gbase-t
+    poe_mode: pd
   - name: wlan0
     type: ieee802.11n
   - name: wlan1

device-types/Cisco/Meraki-MR57.yaml

@@ -10,6 +10,7 @@ comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Spe
 interfaces:
   - name: main
     type: 2.5gbase-t
+    poe_mode: pd
   - name: secondary
     type: 2.5gbase-t
   - name: wlan0

device-types/Cisco/Meraki-MR74.yaml

@@ -12,6 +12,7 @@ comments: "- Datasheet: [https://meraki.cisco.com/lib/pdf/meraki_datasheet_MR74.
 interfaces:
   - name: main
     type: 1000base-t
+    poe_mode: pd
   - name: wlan0
     type: ieee802.11n
   - name: wlan1

device-types/Dell/PowerEdge-C6400.yaml

@@ -4,3 +4,8 @@ model: PowerEdge C6400
 slug: dell-poweredge-c6400
 u_height: 2
 is_full_depth: false
+module-bays:
+  - name: Power 1
+    position: '1'
+  - name: Power 2
+    position: '2'

device-types/Dell/PowerEdge-C6420.yaml

@@ -6,14 +6,11 @@ u_height: 2
 is_full_depth: false
 comments: |
   [Dell C6420 Spec Sheet](https://www.delltechnologies.com/asset/en-us/products/servers/technical-support/dell-emc-poweredge-c6520-spec-sheet.pdf)
-console-ports:
-  - name: Mini-DP
-    type: other
-power-ports:
+module-bays:
   - name: Power 1
-    type: iec-60320-c14
+    position: '1'
   - name: Power 2
-    type: iec-60320-c14
+    position: '2'
 interfaces:
   - name: Gig-E 1
     type: 1000base-t

device-types/Eaton/9PXEBM180.yaml

@@ -7,6 +7,9 @@ u_height: 3
 is_full_depth: true
 airflow: front-to-rear
 comments: Eaton 9PX extended battery moduel (EBM), 180V, Rack/tower, 3U [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/backup-power-ups/eaton-9px-ups/eaton-9sx-9px-ups-5-6-kva-ebm-180v-installation-and-user-manual.pdf)
+power-ports:
+  - name: UPS Input
+    type: other
 interfaces:
   - name: Battery connector, top
     type: other

device-types/Eaton/9PXEBM72RT2U.yaml

@@ -7,6 +7,9 @@ u_height: 2
 is_full_depth: true
 airflow: front-to-rear
 comments: Eaton 9PX EBM 2U 72V Sealed Lead Acid VRLA 9PXEBM72RT2U [Manual](https://www.eaton.com/content/dam/eaton/products/backup-power-ups-surge-it-power-distribution/backup-power-ups/eaton-9px-ups/eaton-9px-1-3kva-ups-manual.pdf)
+power-ports:
+  - name: UPS Input
+    type: other
 interfaces:
   - name: Battery connector, left
     type: other

device-types/Ericsson/R6672.yml

@@ -5,10 +5,14 @@ slug: ericsson-r6672
 part_number: R6672
 u_height: 1
 is_full_depth: true
+airflow: front-to-rear
 console-ports:
   - name: console
     type: rj-45
     description: baudrate 115200
+power-ports:
+  - name: PSU1
+    type: iec-60320-c16
 interfaces:
   - name: 1/1
     type: 1000base-x-sfp

device-types/Extreme Networks/5520-24T.yaml

@@ -79,7 +79,7 @@ interfaces:
   - name: Mgmt
     type: 1000base-t
     mgmt_only: true
-device-bays:
+module-bays:
   - name: PSU-1
   - name: PSU-2
   - name: VIM-2

device-types/Extreme Networks/X460-G2-24t-10GE4.yaml

@@ -87,7 +87,7 @@ interfaces:
   - name: Mgmt
     type: 1000base-t
     mgmt_only: true
-device-bays:
+module-bays:
   - name: PSU-1
   - name: PSU-2
   - name: VIM-2

device-types/Extreme Networks/X460-G2-48p-10GE4.yaml

@@ -114,16 +114,11 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: '52'
     type: 10gbase-x-sfpp
-  - name: '53'
-    type: other
-    description: either Stacking-Ports or additional SFP+; only with VIM-2 module
-  - name: '54'
-    type: other
-    description: either Stacking-Ports or additional SFP+; only with VIM-2 module
   - name: Mgmt
     type: 1000base-t
     mgmt_only: true
-device-bays:
+module-bays:
   - name: PSU-1
   - name: PSU-2
   - name: VIM-2
+    position: VIM

device-types/FS/FHU-FPP48FLCSMF.yaml

@@ -6,6 +6,7 @@ part_number: FHU-FPP48FLCSMF (#35530)
 u_height: 1.0
 is_full_depth: true
 comments: FHU 1U 19" Fiber Adapter Panel, 48 Fibers OS2 Single Mode, 24 x LC UPC Duplex (Blue) Adapter, Ceramic Sleeve
+is_powered: false
 front-ports:
   - name: Front Port 1
     type: lc

device-types/FS/FMU-1UFMX-N.yaml

@@ -8,6 +8,7 @@ u_height: 1
 is_full_depth: false
 airflow: passive
 subdevice_role: parent
+is_powered: false
 device-bays:
   - name: '1'
   - name: '2'

device-types/FS/FMU-C182761M.yaml

@@ -6,6 +6,7 @@ part_number: FMU-C182761M
 u_height: 1
 is_full_depth: false
 comments: 18 Channels 1270-1610nm, with Monitor Port, LC/UPC, Dual Fiber CWDM Mux Demux, 1U Rack Mount
+is_powered: false
 front-ports:
   - name: 1270nm
     type: lc

device-types/FS/FMU-D402160M.yaml

@@ -6,6 +6,7 @@ part_number: FMU-D402160M
 u_height: 1
 is_full_depth: false
 comments: 40 Channels 100GHz C21-C60, with Monitor Port, LC/UPC, Dual Fiber DWDM Mux Demux, 1U Rack Mount
+is_powered: false
 front-ports:
   - name: C21
     type: lc

device-types/Fortinet/SP-RACKTRAY-02.yaml

@@ -7,6 +7,7 @@ u_height: 1.0
 is_full_depth: false
 subdevice_role: parent
 comments: '[Fortinet Rack Mount Tray QuickStart Guide](https://fortinetweb.s3.amazonaws.com/docs.fortinet.com/v2/attachments/d3b3c280-1a08-11e9-9685-f8bc1258b856/Fortinet-Rack-Mount-Tray-QSG.pdf)'
+is_powered: false
 device-bays:
   - name: Left
   - name: Right

device-types/Fujitsu/primergy-bx2560-m1.yaml

@@ -4,6 +4,7 @@ model: Primergy BX2560 M1
 slug: fujitsu-primergy-bx2560-m1
 u_height: 0
 is_full_depth: true
+subdevice_role: child
 console-ports:
   - name: Console
     type: rj-45

device-types/Fujitsu/primergy-bx2560-m2.yaml

@@ -4,6 +4,7 @@ model: Primergy BX2560 M2
 slug: fujitsu-primergy-bx2560-m2
 u_height: 0
 is_full_depth: true
+subdevice_role: child
 console-ports:
   - name: Console
     type: rj-45

device-types/Fujitsu/primergy-bx924-s4.yaml

@@ -4,6 +4,7 @@ model: Primergy BX924 S4
 slug: fujitsu-primergy-bx924-s4
 u_height: 0
 is_full_depth: true
+subdevice_role: child
 console-ports:
   - name: Console
     type: rj-45

device-types/Generic/24-port-copper-patch-panel-half-depth.yaml

@@ -5,6 +5,7 @@ slug: generic-24-port-copper-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: 8p8c

device-types/Generic/24-port-copper-patch-panel.yaml

@@ -4,6 +4,7 @@ model: 24-port Copper Patch Panel
 slug: generic-24-port-copper-patch-panel
 u_height: 1
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: 8p8c

device-types/Generic/48-port-copper-patch-panel-half-depth.yaml

@@ -5,6 +5,7 @@ slug: generic-48-port-copper-patch-panel-half-depth
 u_height: 2
 is_full_depth: false
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: 8p8c

device-types/Generic/48-port-copper-patch-panel.yaml

@@ -4,6 +4,7 @@ model: 48-port Copper Patch Panel
 slug: generic-48-port-copper-patch-panel
 u_height: 2
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: 8p8c

device-types/Generic/LC-12-port-fiber-patch-panel-half-depth.yaml

@@ -5,6 +5,7 @@ slug: generic-lc-12-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: lc

device-types/Generic/LC-12-port-fiber-patch-panel.yaml

@@ -4,6 +4,7 @@ model: LC-12-port Fiber Patch Panel
 slug: generic-lc-12-port-fiber-patch-panel
 u_height: 1
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: lc

device-types/Generic/LC-24-port-fiber-patch-panel-half-depth.yaml

@@ -5,6 +5,7 @@ slug: generic-lc-24-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: lc

device-types/Generic/LC-24-port-fiber-patch-panel.yaml

@@ -4,6 +4,7 @@ model: LC-24-port Fiber Patch Panel
 slug: generic-lc-24-port-fiber-patch-panel
 u_height: 1
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: lc

device-types/Generic/LC-48-port-fiber-patch-panel-half-depth.yaml

@@ -5,6 +5,7 @@ slug: generic-lc-48-port-fiber-patch-panel-half-depth
 u_height: 2
 is_full_depth: false
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: lc

device-types/Generic/LC-48-port-fiber-patch-panel.yaml

@@ -4,6 +4,7 @@ model: LC-48-port Fiber Patch Panel
 slug: generic-lc-48-port-fiber-patch-panel
 u_height: 2
 airflow: passive
+is_powered: false
 front-ports:
   - name: Port 1
     type: lc

device-types/Generic/SC-24-double-port-fiber-patch-panel-half-depth.yaml

@@ -5,6 +5,7 @@ slug: generic-sc-24-double-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
+is_powered: false
 front-ports:
   - name: '1.1'
     type: sc

device-types/Generic/SC-24-double-port-fiber-patch-panel.yaml

@@ -5,6 +5,7 @@ slug: generic-sc-24-double-port-fiber-patch-panel
 u_height: 1
 is_full_depth: true
 airflow: passive
+is_powered: false
 front-ports:
   - name: '1.1'
     type: sc

device-types/Generic/SC-24-port-fiber-patch-panel-half-depth.yaml

@@ -5,6 +5,7 @@ slug: generic-sc-24-port-fiber-patch-panel-half-depth
 u_height: 1
 is_full_depth: false
 airflow: passive
+is_powered: false
 front-ports:
   - name: '1'
     type: sc

device-types/Generic/SC-24-port-fiber-patch-panel.yaml

@@ -5,6 +5,7 @@ slug: generic-sc-24-port-fiber-patch-panel
 u_height: 1
 is_full_depth: true
 airflow: passive
+is_powered: false
 front-ports:
   - name: '1'
     type: sc

device-types/Generic/cable-management-panel-1ru.yaml

@@ -5,3 +5,4 @@ slug: generic-cable-management-panel-1ru
 u_height: 1
 is_full_depth: false
 airflow: passive
+is_powered: false

device-types/Generic/cable-management-panel-2ru.yaml

@@ -5,3 +5,4 @@ slug: generic-cable-management-panel-2ru
 u_height: 2
 is_full_depth: false
 airflow: passive
+is_powered: false

device-types/Generic/shelf-1he.yaml

@@ -5,3 +5,4 @@ slug: generic-shelf-1he
 u_height: 1
 is_full_depth: false
 airflow: passive
+is_powered: false

device-types/Generic/shelf-2he.yaml

@@ -5,3 +5,4 @@ slug: generic-shelf-2he
 u_height: 2
 is_full_depth: false
 airflow: passive
+is_powered: false