Added / Modified Cisco Nexus switches and modules (#2196)

* Added / Modified Cisco Nexus switches and modules

device-types/Cisco/N2K-C2232TM-E-10GE.yaml

@@ -4,6 +4,8 @@ model: N2K-C2232TM-E-10GE
 slug: cisco-n2k-c2232tm-e-10ge
 part_number: N2K-C2232TM-E-10GE
 u_height: 1
+weight: 8.4
+weight_unit: kg
 is_full_depth: false
 interfaces:
   - name: Ethernet1/1/1
@@ -89,5 +91,9 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'

device-types/Cisco/N2K-C2248TP-1GE.yaml

@@ -4,6 +4,8 @@ model: N2K-C2248TP-1GE
 slug: cisco-n2k-c2248tp-1ge
 part_number: N2K-C2248TP-1GE
 u_height: 1
+weight: 8
+weight_unit: kg
 is_full_depth: true
 front_image: true
 rear_image: false
@@ -117,5 +119,9 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'

device-types/Cisco/N5K-C5548UP.yaml

@@ -3,11 +3,15 @@ manufacturer: Cisco
 model: Nexus 5548UP
 slug: cisco-n5k-c5548up
 part_number: N5K-C5548UP
+front_image: true
+rear_image: true
 u_height: 1
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
-  - name: mgmt0
-    type: 1000base-t
-    mgmt_only: true
   - name: Ethernet1/1
     type: 10gbase-x-sfpp
   - name: Ethernet1/2
@@ -72,13 +76,27 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: Ethernet1/32
     type: 10gbase-x-sfpp
-console-ports:
-  - name: Console
-    type: rj-45
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+  - name: L1
+    type: 1000base-t
+  - name: L2
+    type: 1000base-t
 module-bays:
   - name: Slot 2
     position: '2'
+    description: Expansion Module
+  - name: Slot 3
+    position: '3'
+    description: L3 Daughter Card
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'

device-types/Cisco/N5K-C5696Q.yaml

@@ -3,14 +3,22 @@ manufacturer: Cisco
 model: Nexus 5696Q
 slug: cisco-n5k-c5696q
 part_number: N5K-C5696Q
+front_image: true
+rear_image: true
 u_height: 4
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
-console-ports:
-  - name: Console
-    type: rj-45
+  - name: L1
+    type: 1000base-t
+  - name: L2
+    type: 1000base-t
 module-bays:
   - name: Slot 1
     position: '1'
@@ -29,14 +37,28 @@ module-bays:
   - name: Slot 8
     position: '8'
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
   - name: PS3
+    label: Power Supply 3
     position: '3'
   - name: PS4
+    label: Power Supply 4
     position: '4'
   - name: PS5
+    label: Power Supply 5
     position: '5'
   - name: PS6
+    label: Power Supply 6
     position: '6'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N77-C7706.yaml

@@ -5,11 +5,6 @@ slug: cisco-n77-c7706
 part_number: N77-C7706
 u_height: 9
 is_full_depth: true
-console-ports:
-  - name: con0
-    type: rj-45
-  - name: con1
-    type: rj-45
 module-bays:
   - name: Slot 1
     position: '1'
@@ -29,11 +24,42 @@ module-bays:
   - name: Slot 6
     position: '6'
     description: Line Card
-  - name: PSU0
-    position: '0'
-  - name: PSU1
+  - name: PS1
+    label: Power Supply 1
     position: '1'
-  - name: PSU2
+  - name: PS2
+    label: Power Supply 2
     position: '2'
-  - name: PSU3
+  - name: PS3
+    label: Power Supply 3
     position: '3'
+  - name: PS4
+    label: Power Supply 4
+    position: '4'
+  - name: Slot 7
+    label: Fabric Module 1
+    position: '7'
+  - name: Slot 8
+    label: Fabric Module 2
+    position: '8'
+  - name: Slot 9
+    label: Fabric Module 3
+    position: '9'
+  - name: Slot 10
+    label: Fabric Module 4
+    position: '10'
+  - name: Slot 11
+    label: Fabric Module 5
+    position: '11'
+  - name: Slot 12
+    label: Fabric Module 6
+    position: '12'
+  - name: Slot 37
+    label: FAN1
+    position: '37'
+  - name: Slot 38
+    label: FAN2
+    position: '38'
+  - name: Slot 39
+    label: FAN3
+    position: '39'

device-types/Cisco/N9K-C93108TC-EX.yaml

@@ -3,11 +3,17 @@ manufacturer: Cisco
 model: Nexus 93108TC-EX
 slug: cisco-n9k-c93108tc-ex
 part_number: N9K-C93108TC-EX
+front_image: true
+rear_image: true
 u_height: 1
 is_full_depth: true
 console-ports:
   - name: Console
     type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
 interfaces:
   - name: mgmt0
     type: 1000base-t
@@ -123,5 +129,15 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C93108TC-FX.yaml

@@ -3,11 +3,17 @@ manufacturer: Cisco
 model: Nexus 93108TC-FX
 slug: cisco-n9k-c93108tc-fx
 part_number: N9K-C93108TC-FX
+front_image: true
+rear_image: true
 u_height: 1
+weight: 7.9
+weight_unit: kg
 is_full_depth: true
 console-ports:
   - name: Console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: mgmt0
     type: 1000base-t
@@ -122,6 +128,16 @@ interfaces:
     type: 100gbase-x-qsfp28
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C93108TC-FX3.yaml

@@ -0,0 +1,144 @@
+---
+manufacturer: Cisco
+model: Nexus 93108TC-FX3
+slug: cisco-n9k-c93108tc-fx3
+part_number: N9K-C93108TC-FX3
+description: 48 x 100M/1/10 Gbps BASE-T ports and 6 x 40/100 Gbps QSFP28 ports
+front_image: true
+rear_image: true
+u_height: 1
+weight: 7.1
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+interfaces:
+  - name: Ethernet1/1
+    type: 10gbase-t
+  - name: Ethernet1/2
+    type: 10gbase-t
+  - name: Ethernet1/3
+    type: 10gbase-t
+  - name: Ethernet1/4
+    type: 10gbase-t
+  - name: Ethernet1/5
+    type: 10gbase-t
+  - name: Ethernet1/6
+    type: 10gbase-t
+  - name: Ethernet1/7
+    type: 10gbase-t
+  - name: Ethernet1/8
+    type: 10gbase-t
+  - name: Ethernet1/9
+    type: 10gbase-t
+  - name: Ethernet1/10
+    type: 10gbase-t
+  - name: Ethernet1/11
+    type: 10gbase-t
+  - name: Ethernet1/12
+    type: 10gbase-t
+  - name: Ethernet1/13
+    type: 10gbase-t
+  - name: Ethernet1/14
+    type: 10gbase-t
+  - name: Ethernet1/15
+    type: 10gbase-t
+  - name: Ethernet1/16
+    type: 10gbase-t
+  - name: Ethernet1/17
+    type: 10gbase-t
+  - name: Ethernet1/18
+    type: 10gbase-t
+  - name: Ethernet1/19
+    type: 10gbase-t
+  - name: Ethernet1/20
+    type: 10gbase-t
+  - name: Ethernet1/21
+    type: 10gbase-t
+  - name: Ethernet1/22
+    type: 10gbase-t
+  - name: Ethernet1/23
+    type: 10gbase-t
+  - name: Ethernet1/24
+    type: 10gbase-t
+  - name: Ethernet1/25
+    type: 10gbase-t
+  - name: Ethernet1/26
+    type: 10gbase-t
+  - name: Ethernet1/27
+    type: 10gbase-t
+  - name: Ethernet1/28
+    type: 10gbase-t
+  - name: Ethernet1/29
+    type: 10gbase-t
+  - name: Ethernet1/30
+    type: 10gbase-t
+  - name: Ethernet1/31
+    type: 10gbase-t
+  - name: Ethernet1/32
+    type: 10gbase-t
+  - name: Ethernet1/33
+    type: 10gbase-t
+  - name: Ethernet1/34
+    type: 10gbase-t
+  - name: Ethernet1/35
+    type: 10gbase-t
+  - name: Ethernet1/36
+    type: 10gbase-t
+  - name: Ethernet1/37
+    type: 10gbase-t
+  - name: Ethernet1/38
+    type: 10gbase-t
+  - name: Ethernet1/39
+    type: 10gbase-t
+  - name: Ethernet1/40
+    type: 10gbase-t
+  - name: Ethernet1/41
+    type: 10gbase-t
+  - name: Ethernet1/42
+    type: 10gbase-t
+  - name: Ethernet1/43
+    type: 10gbase-t
+  - name: Ethernet1/44
+    type: 10gbase-t
+  - name: Ethernet1/45
+    type: 10gbase-t
+  - name: Ethernet1/46
+    type: 10gbase-t
+  - name: Ethernet1/47
+    type: 10gbase-t
+  - name: Ethernet1/48
+    type: 10gbase-t
+  - name: Ethernet1/49
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/50
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/51
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/52
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/53
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/54
+    type: 100gbase-x-qsfp28
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: PS1
+    position: '1'
+    label: Power Supply 1
+  - name: PS2
+    position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C93108TC-FX3P.yaml

@@ -3,11 +3,17 @@ manufacturer: Cisco
 model: Nexus 93108TC-FX3P
 slug: cisco-n9k-c93108tc-fx3p
 part_number: N9K-C93108TC-FX3P
+description: 48 x 100M/1/2.5/5/10 Gbps BASE-T ports and 6 x 40/100 Gbps QSFP28 ports
+front_image: true
 u_height: 1
+weight: 7.25
+weight_unit: kg
 is_full_depth: true
 console-ports:
   - name: Console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 10gbase-t
@@ -123,5 +129,15 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C93120TX.yaml

@@ -3,204 +3,216 @@ manufacturer: Cisco
 model: Nexus 93120TX
 slug: cisco-n9k-c93120tx
 part_number: N9K-C93120TX
+description: Nexus 9300 with 96p 100M/1/10G-T and 6p 40G QSFP
+front_image: true
+rear_image: true
 u_height: 2
+weight: 11.8
+weight_unit: kg
 is_full_depth: true
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
 interfaces:
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
   - name: Ethernet1/1
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/2
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/3
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/4
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/5
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/6
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/7
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/8
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/9
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/10
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/11
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/12
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/13
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/14
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/15
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/16
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/17
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/18
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/19
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/20
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/21
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/22
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/23
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/24
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/25
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/26
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/27
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/28
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/29
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/30
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/31
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/32
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/33
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/34
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/35
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/36
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/37
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/38
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/39
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/40
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/41
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/42
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/43
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/44
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/45
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/46
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/47
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/48
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/49
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/50
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/51
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/52
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/53
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/54
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/55
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/56
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/57
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/58
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/59
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/60
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/61
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/62
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/63
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/64
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/65
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/66
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/67
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/68
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/69
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/70
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/71
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/72
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/73
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/74
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/75
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/76
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/77
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/78
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/79
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/80
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/81
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/82
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/83
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/84
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/85
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/86
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/87
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/88
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/89
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/90
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/91
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/92
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/93
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/94
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/95
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/96
-    type: 10gbase-x-sfpp
+    type: 10gbase-t
   - name: Ethernet1/97
     type: 40gbase-x-qsfpp
   - name: Ethernet1/98
@@ -213,24 +225,14 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: Ethernet1/102
     type: 40gbase-x-qsfpp
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    allocated_draw: 542
-    maximum_draw: 948
-  - name: PS2
-    type: iec-60320-c14
-    allocated_draw: 542
-    maximum_draw: 948
-console-ports:
-  - name: Console
-    type: rj-45
-  - name: usb0
-    type: usb-mini-b
-  - name: usb1
-    type: usb-mini-b
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'

device-types/Cisco/N9K-C93128TX.yaml

@@ -0,0 +1,230 @@
+---
+manufacturer: Cisco
+model: Nexus 93128TX
+slug: cisco-n9k-c93128tx
+part_number: N9K-C93128TX
+description: Nexus 9300 with 96p 100M/1/10G-T and Expansion Module
+front_image: true
+rear_image: true
+u_height: 3
+weight: 14.8
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
+interfaces:
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1/1
+    type: 10gbase-t
+  - name: Ethernet1/2
+    type: 10gbase-t
+  - name: Ethernet1/3
+    type: 10gbase-t
+  - name: Ethernet1/4
+    type: 10gbase-t
+  - name: Ethernet1/5
+    type: 10gbase-t
+  - name: Ethernet1/6
+    type: 10gbase-t
+  - name: Ethernet1/7
+    type: 10gbase-t
+  - name: Ethernet1/8
+    type: 10gbase-t
+  - name: Ethernet1/9
+    type: 10gbase-t
+  - name: Ethernet1/10
+    type: 10gbase-t
+  - name: Ethernet1/11
+    type: 10gbase-t
+  - name: Ethernet1/12
+    type: 10gbase-t
+  - name: Ethernet1/13
+    type: 10gbase-t
+  - name: Ethernet1/14
+    type: 10gbase-t
+  - name: Ethernet1/15
+    type: 10gbase-t
+  - name: Ethernet1/16
+    type: 10gbase-t
+  - name: Ethernet1/17
+    type: 10gbase-t
+  - name: Ethernet1/18
+    type: 10gbase-t
+  - name: Ethernet1/19
+    type: 10gbase-t
+  - name: Ethernet1/20
+    type: 10gbase-t
+  - name: Ethernet1/21
+    type: 10gbase-t
+  - name: Ethernet1/22
+    type: 10gbase-t
+  - name: Ethernet1/23
+    type: 10gbase-t
+  - name: Ethernet1/24
+    type: 10gbase-t
+  - name: Ethernet1/25
+    type: 10gbase-t
+  - name: Ethernet1/26
+    type: 10gbase-t
+  - name: Ethernet1/27
+    type: 10gbase-t
+  - name: Ethernet1/28
+    type: 10gbase-t
+  - name: Ethernet1/29
+    type: 10gbase-t
+  - name: Ethernet1/30
+    type: 10gbase-t
+  - name: Ethernet1/31
+    type: 10gbase-t
+  - name: Ethernet1/32
+    type: 10gbase-t
+  - name: Ethernet1/33
+    type: 10gbase-t
+  - name: Ethernet1/34
+    type: 10gbase-t
+  - name: Ethernet1/35
+    type: 10gbase-t
+  - name: Ethernet1/36
+    type: 10gbase-t
+  - name: Ethernet1/37
+    type: 10gbase-t
+  - name: Ethernet1/38
+    type: 10gbase-t
+  - name: Ethernet1/39
+    type: 10gbase-t
+  - name: Ethernet1/40
+    type: 10gbase-t
+  - name: Ethernet1/41
+    type: 10gbase-t
+  - name: Ethernet1/42
+    type: 10gbase-t
+  - name: Ethernet1/43
+    type: 10gbase-t
+  - name: Ethernet1/44
+    type: 10gbase-t
+  - name: Ethernet1/45
+    type: 10gbase-t
+  - name: Ethernet1/46
+    type: 10gbase-t
+  - name: Ethernet1/47
+    type: 10gbase-t
+  - name: Ethernet1/48
+    type: 10gbase-t
+  - name: Ethernet1/49
+    type: 10gbase-t
+  - name: Ethernet1/50
+    type: 10gbase-t
+  - name: Ethernet1/51
+    type: 10gbase-t
+  - name: Ethernet1/52
+    type: 10gbase-t
+  - name: Ethernet1/53
+    type: 10gbase-t
+  - name: Ethernet1/54
+    type: 10gbase-t
+  - name: Ethernet1/55
+    type: 10gbase-t
+  - name: Ethernet1/56
+    type: 10gbase-t
+  - name: Ethernet1/57
+    type: 10gbase-t
+  - name: Ethernet1/58
+    type: 10gbase-t
+  - name: Ethernet1/59
+    type: 10gbase-t
+  - name: Ethernet1/60
+    type: 10gbase-t
+  - name: Ethernet1/61
+    type: 10gbase-t
+  - name: Ethernet1/62
+    type: 10gbase-t
+  - name: Ethernet1/63
+    type: 10gbase-t
+  - name: Ethernet1/64
+    type: 10gbase-t
+  - name: Ethernet1/65
+    type: 10gbase-t
+  - name: Ethernet1/66
+    type: 10gbase-t
+  - name: Ethernet1/67
+    type: 10gbase-t
+  - name: Ethernet1/68
+    type: 10gbase-t
+  - name: Ethernet1/69
+    type: 10gbase-t
+  - name: Ethernet1/70
+    type: 10gbase-t
+  - name: Ethernet1/71
+    type: 10gbase-t
+  - name: Ethernet1/72
+    type: 10gbase-t
+  - name: Ethernet1/73
+    type: 10gbase-t
+  - name: Ethernet1/74
+    type: 10gbase-t
+  - name: Ethernet1/75
+    type: 10gbase-t
+  - name: Ethernet1/76
+    type: 10gbase-t
+  - name: Ethernet1/77
+    type: 10gbase-t
+  - name: Ethernet1/78
+    type: 10gbase-t
+  - name: Ethernet1/79
+    type: 10gbase-t
+  - name: Ethernet1/80
+    type: 10gbase-t
+  - name: Ethernet1/81
+    type: 10gbase-t
+  - name: Ethernet1/82
+    type: 10gbase-t
+  - name: Ethernet1/83
+    type: 10gbase-t
+  - name: Ethernet1/84
+    type: 10gbase-t
+  - name: Ethernet1/85
+    type: 10gbase-t
+  - name: Ethernet1/86
+    type: 10gbase-t
+  - name: Ethernet1/87
+    type: 10gbase-t
+  - name: Ethernet1/88
+    type: 10gbase-t
+  - name: Ethernet1/89
+    type: 10gbase-t
+  - name: Ethernet1/90
+    type: 10gbase-t
+  - name: Ethernet1/91
+    type: 10gbase-t
+  - name: Ethernet1/92
+    type: 10gbase-t
+  - name: Ethernet1/93
+    type: 10gbase-t
+  - name: Ethernet1/94
+    type: 10gbase-t
+  - name: Ethernet1/95
+    type: 10gbase-t
+  - name: Ethernet1/96
+    type: 10gbase-t
+module-bays:
+  - name: Slot 2
+    position: '2'
+  - name: PS1
+    label: Power Supply 1
+    position: '1'
+  - name: PS2
+    label: Power Supply 2
+    position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'

device-types/Cisco/N9K-C93180YC-FX.yaml

@@ -3,11 +3,17 @@ manufacturer: Cisco
 model: Nexus 93180YC-FX
 part_number: N9K-C93180YC-FX
 slug: cisco-n9k-c93180yc-fx
+front_image: true
+rear_image: true
 u_height: 1
+weight: 7.9
+weight_unit: kg
 is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 25gbase-x-sfp28
@@ -123,5 +129,15 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C93180YC-FX3.yaml

@@ -3,13 +3,17 @@ manufacturer: Cisco
 model: Nexus 93180YC-FX3
 part_number: N9K-C93180YC-FX3
 slug: cisco-n9k-c93180yc-fx3
-u_height: 1
-is_full_depth: true
 front_image: true
 rear_image: true
+u_height: 1
+weight: 9.52
+weight_unit: kg
+is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 25gbase-x-sfp28
@@ -125,5 +129,15 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C93240YC-FX2.yaml

@@ -3,11 +3,15 @@ manufacturer: Cisco
 model: Nexus 93240YC-FX2
 part_number: N9K-C93240YC-FX2
 slug: cisco-n9k-c93240yc-fx2
+front_image: true
+rear_image: true
 u_height: 2
 is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 25gbase-x-sfp28
@@ -134,6 +138,18 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'
+  - name: Fan 5
+    position: '5'

device-types/Cisco/N9K-C9332C.yaml

@@ -3,11 +3,17 @@ manufacturer: Cisco
 model: Nexus 9332C
 part_number: N9K-C9332C
 slug: cisco-n9k-c9332c
+front_image: true
+rear_image: true
 u_height: 1
 is_full_depth: true
+weight: 8.6
+weight_unit: kg
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 100gbase-x-qsfp28
@@ -83,5 +89,17 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'
+  - name: Fan 5
+    position: '5'

device-types/Cisco/N9K-C9332PQ.yaml

@@ -3,11 +3,18 @@ manufacturer: Cisco
 model: Nexus 9332PQ
 part_number: N9K-C9332PQ
 slug: cisco-n9k-c9332pq
+description: Nexus 9300 with 32p 40G QSFP
+front_image: true
+rear_image: true
 u_height: 1
+weight: 10
+weight_unit: kg
 is_full_depth: false
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 40gbase-x-qsfpp
@@ -73,55 +80,21 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: Ethernet1/32
     type: 40gbase-x-qsfpp
-  - name: Ethernet1/33
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/34
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/35
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/36
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/37
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/38
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/39
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/40
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/41
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/42
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/43
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/44
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/45
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/46
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/47
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/48
-    type: 10gbase-x-sfpp
-  - name: Ethernet1/49
-    type: 40gbase-x-qsfpp
-  - name: Ethernet1/50
-    type: 40gbase-x-qsfpp
-  - name: Ethernet1/51
-    type: 40gbase-x-qsfpp
-  - name: Ethernet1/52
-    type: 40gbase-x-qsfpp
-  - name: Ethernet1/53
-    type: 40gbase-x-qsfpp
-  - name: Ethernet1/54
-    type: 40gbase-x-qsfpp
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C9336C-FX2.yaml

@@ -3,6 +3,8 @@ manufacturer: Cisco
 model: Nexus 9336C-FX2
 part_number: N9K-C9336C-FX2
 slug: cisco-n9k-c9336c-fx2
+front_image: true
+rear_image: true
 u_height: 1
 is_full_depth: true
 weight: 8.5
@@ -10,6 +12,8 @@ weight_unit: kg
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 100gbase-x-qsfp28
@@ -88,8 +92,10 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
   - name: Fan 1
     position: '1'
@@ -97,5 +103,3 @@ module-bays:
     position: '2'
   - name: Fan 3
     position: '3'
-  - name: Fan 4
-    position: '4'

device-types/Cisco/N9K-C9348GC-FX3.yaml

@@ -0,0 +1,142 @@
+---
+manufacturer: Cisco
+model: Nexus 9348GC-FX3
+part_number: N9K-C9348GC-FX3
+slug: cisco-n9k-c9348gc-fx3
+description: 48 x 10M/100M/1 Gbps BASE-T ports and 4x 1/10/25 Gbps SFP28 ports and 2 x 40/100 Gbps QSFP28ports
+front_image: true
+rear_image: true
+u_height: 1
+weight: 6.5
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+interfaces:
+  - name: Ethernet1/1
+    type: 1000base-t
+  - name: Ethernet1/2
+    type: 1000base-t
+  - name: Ethernet1/3
+    type: 1000base-t
+  - name: Ethernet1/4
+    type: 1000base-t
+  - name: Ethernet1/5
+    type: 1000base-t
+  - name: Ethernet1/6
+    type: 1000base-t
+  - name: Ethernet1/7
+    type: 1000base-t
+  - name: Ethernet1/8
+    type: 1000base-t
+  - name: Ethernet1/9
+    type: 1000base-t
+  - name: Ethernet1/10
+    type: 1000base-t
+  - name: Ethernet1/11
+    type: 1000base-t
+  - name: Ethernet1/12
+    type: 1000base-t
+  - name: Ethernet1/13
+    type: 1000base-t
+  - name: Ethernet1/14
+    type: 1000base-t
+  - name: Ethernet1/15
+    type: 1000base-t
+  - name: Ethernet1/16
+    type: 1000base-t
+  - name: Ethernet1/17
+    type: 1000base-t
+  - name: Ethernet1/18
+    type: 1000base-t
+  - name: Ethernet1/19
+    type: 1000base-t
+  - name: Ethernet1/20
+    type: 1000base-t
+  - name: Ethernet1/21
+    type: 1000base-t
+  - name: Ethernet1/22
+    type: 1000base-t
+  - name: Ethernet1/23
+    type: 1000base-t
+  - name: Ethernet1/24
+    type: 1000base-t
+  - name: Ethernet1/25
+    type: 1000base-t
+  - name: Ethernet1/26
+    type: 1000base-t
+  - name: Ethernet1/27
+    type: 1000base-t
+  - name: Ethernet1/28
+    type: 1000base-t
+  - name: Ethernet1/29
+    type: 1000base-t
+  - name: Ethernet1/30
+    type: 1000base-t
+  - name: Ethernet1/31
+    type: 1000base-t
+  - name: Ethernet1/32
+    type: 1000base-t
+  - name: Ethernet1/33
+    type: 1000base-t
+  - name: Ethernet1/34
+    type: 1000base-t
+  - name: Ethernet1/35
+    type: 1000base-t
+  - name: Ethernet1/36
+    type: 1000base-t
+  - name: Ethernet1/37
+    type: 1000base-t
+  - name: Ethernet1/38
+    type: 1000base-t
+  - name: Ethernet1/39
+    type: 1000base-t
+  - name: Ethernet1/40
+    type: 1000base-t
+  - name: Ethernet1/41
+    type: 1000base-t
+  - name: Ethernet1/42
+    type: 1000base-t
+  - name: Ethernet1/43
+    type: 1000base-t
+  - name: Ethernet1/44
+    type: 1000base-t
+  - name: Ethernet1/45
+    type: 1000base-t
+  - name: Ethernet1/46
+    type: 1000base-t
+  - name: Ethernet1/47
+    type: 1000base-t
+  - name: Ethernet1/48
+    type: 1000base-t
+  - name: Ethernet1/49
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/50
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/51
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/52
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/53
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/54
+    type: 100gbase-x-qsfp28
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: PS1
+    label: Power Supply 1
+    position: '1'
+  - name: PS2
+    label: Power Supply 2
+    position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'

device-types/Cisco/N9K-C9348GC-FX3PH.yaml

@@ -0,0 +1,142 @@
+---
+manufacturer: Cisco
+model: Nexus 9348GC-FX3PH
+part_number: N9K-C9348GC-FX3PH
+slug: cisco-n9k-c9348gc-fx3ph
+description: 40x 10M/100M/1 Gbps BASE-T ports and 8x 10M/100M BASE-T half-duplex ports and 4x 1/10/25 Gbps SFP28 ports and 2 x 40/100 Gbps QSFP28 ports
+front_image: true
+rear_image: true
+u_height: 1
+weight: 6.6
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+interfaces:
+  - name: Ethernet1/1
+    type: 1000base-t
+  - name: Ethernet1/2
+    type: 1000base-t
+  - name: Ethernet1/3
+    type: 1000base-t
+  - name: Ethernet1/4
+    type: 1000base-t
+  - name: Ethernet1/5
+    type: 1000base-t
+  - name: Ethernet1/6
+    type: 1000base-t
+  - name: Ethernet1/7
+    type: 1000base-t
+  - name: Ethernet1/8
+    type: 1000base-t
+  - name: Ethernet1/9
+    type: 1000base-t
+  - name: Ethernet1/10
+    type: 1000base-t
+  - name: Ethernet1/11
+    type: 1000base-t
+  - name: Ethernet1/12
+    type: 1000base-t
+  - name: Ethernet1/13
+    type: 1000base-t
+  - name: Ethernet1/14
+    type: 1000base-t
+  - name: Ethernet1/15
+    type: 1000base-t
+  - name: Ethernet1/16
+    type: 1000base-t
+  - name: Ethernet1/17
+    type: 1000base-t
+  - name: Ethernet1/18
+    type: 1000base-t
+  - name: Ethernet1/19
+    type: 1000base-t
+  - name: Ethernet1/20
+    type: 1000base-t
+  - name: Ethernet1/21
+    type: 1000base-t
+  - name: Ethernet1/22
+    type: 1000base-t
+  - name: Ethernet1/23
+    type: 1000base-t
+  - name: Ethernet1/24
+    type: 1000base-t
+  - name: Ethernet1/25
+    type: 1000base-t
+  - name: Ethernet1/26
+    type: 1000base-t
+  - name: Ethernet1/27
+    type: 1000base-t
+  - name: Ethernet1/28
+    type: 1000base-t
+  - name: Ethernet1/29
+    type: 1000base-t
+  - name: Ethernet1/30
+    type: 1000base-t
+  - name: Ethernet1/31
+    type: 1000base-t
+  - name: Ethernet1/32
+    type: 1000base-t
+  - name: Ethernet1/33
+    type: 1000base-t
+  - name: Ethernet1/34
+    type: 1000base-t
+  - name: Ethernet1/35
+    type: 1000base-t
+  - name: Ethernet1/36
+    type: 1000base-t
+  - name: Ethernet1/37
+    type: 1000base-t
+  - name: Ethernet1/38
+    type: 1000base-t
+  - name: Ethernet1/39
+    type: 1000base-t
+  - name: Ethernet1/40
+    type: 1000base-t
+  - name: Ethernet1/41
+    type: 100base-tx
+  - name: Ethernet1/42
+    type: 100base-tx
+  - name: Ethernet1/43
+    type: 100base-tx
+  - name: Ethernet1/44
+    type: 100base-tx
+  - name: Ethernet1/45
+    type: 100base-tx
+  - name: Ethernet1/46
+    type: 100base-tx
+  - name: Ethernet1/47
+    type: 100base-tx
+  - name: Ethernet1/48
+    type: 100base-tx
+  - name: Ethernet1/49
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/50
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/51
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/52
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/53
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/54
+    type: 100gbase-x-qsfp28
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: PS1
+    label: Power Supply 1
+    position: '1'
+  - name: PS2
+    label: Power Supply 2
+    position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'

device-types/Cisco/N9K-C9348GC-FXP.yaml

@@ -3,11 +3,17 @@ manufacturer: Cisco
 model: Nexus 9348GC-FXP
 part_number: N9K-C9348GC-FXP
 slug: cisco-n9k-c9348gc-fxp
+front_image: true
+rear_image: true
 u_height: 1
+weight: 6.44
+weight_unit: kg
 is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 1000base-t
@@ -122,6 +128,14 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'

device-types/Cisco/N9K-C9364C-GX.yaml

@@ -3,11 +3,17 @@ manufacturer: Cisco
 model: Nexus 9364C-GX
 part_number: N9K-C9364C-GX
 slug: cisco-n9k-c9364c-gx
+front_image: true
+rear_image: true
 u_height: 2
+weight: 13.2
+weight_unit: kg
 is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 100gbase-x-qsfp28
@@ -142,6 +148,16 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C9364C.yaml

@@ -3,6 +3,8 @@ manufacturer: Cisco
 model: Nexus 9364C
 part_number: N9K-C9364C
 slug: cisco-n9k-c9364c
+front_image: true
+rear_image: true
 u_height: 2
 is_full_depth: true
 weight: 16.74
@@ -10,6 +12,8 @@ weight_unit: kg
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 100gbase-x-qsfp28
@@ -148,8 +152,10 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
   - name: Fan 1
     position: '1'

device-types/Cisco/N9K-C9364D-GX2A.yaml

@@ -4,10 +4,14 @@ model: Nexus 9364D-GX2A
 part_number: N9K-C9364D-GX2A
 slug: cisco-n9k-c9364d-gx2a
 u_height: 2
+weight: 26.3
+weight_unit: kg
 is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 400gbase-x-qsfpdd
@@ -146,6 +150,16 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C9372PX-E.yaml

@@ -3,15 +3,20 @@ manufacturer: Cisco
 model: Nexus 9372PX-E
 part_number: N9K-C9372PX-E
 slug: cisco-n9k-c9372px-e
+description: Nexus 9300 with 48p 1/10G SFP+ and 6p 40G QSFP+
+front_image: true
+rear_image: true
 u_height: 1
-is_full_depth: false
+weight: 10.1
+weight_unit: kg
+is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
-  - name: usb0
-    type: usb-mini-b
   - name: usb1
-    type: usb-mini-b
+    type: usb-a
+  - name: usb2
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 10gbase-x-sfpp
@@ -127,5 +132,15 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C9372PX.yaml

@@ -3,11 +3,20 @@ manufacturer: Cisco
 model: Nexus 9372PX
 part_number: N9K-C9372PX
 slug: cisco-n9k-c9372px
+description: Nexus 9300 with 48p 1/10G SFP+ and 6p 40G QSFP+
+front_image: true
+rear_image: true
 u_height: 1
+weight: 10.1
+weight_unit: kg
 is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 10gbase-x-sfpp
@@ -123,5 +132,15 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C9372TX-E.yaml

@@ -0,0 +1,146 @@
+---
+manufacturer: Cisco
+model: Nexus 9372TX-E
+part_number: N9K-C9372TX-E
+slug: cisco-n9k-c9372tx-e
+description: Nexus 9300 with 48p 100M/1/10G-T and 6p 40G QSFP+
+front_image: true
+rear_image: true
+u_height: 1
+weight: 10.25
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
+interfaces:
+  - name: Ethernet1/1
+    type: 10gbase-t
+  - name: Ethernet1/2
+    type: 10gbase-t
+  - name: Ethernet1/3
+    type: 10gbase-t
+  - name: Ethernet1/4
+    type: 10gbase-t
+  - name: Ethernet1/5
+    type: 10gbase-t
+  - name: Ethernet1/6
+    type: 10gbase-t
+  - name: Ethernet1/7
+    type: 10gbase-t
+  - name: Ethernet1/8
+    type: 10gbase-t
+  - name: Ethernet1/9
+    type: 10gbase-t
+  - name: Ethernet1/10
+    type: 10gbase-t
+  - name: Ethernet1/11
+    type: 10gbase-t
+  - name: Ethernet1/12
+    type: 10gbase-t
+  - name: Ethernet1/13
+    type: 10gbase-t
+  - name: Ethernet1/14
+    type: 10gbase-t
+  - name: Ethernet1/15
+    type: 10gbase-t
+  - name: Ethernet1/16
+    type: 10gbase-t
+  - name: Ethernet1/17
+    type: 10gbase-t
+  - name: Ethernet1/18
+    type: 10gbase-t
+  - name: Ethernet1/19
+    type: 10gbase-t
+  - name: Ethernet1/20
+    type: 10gbase-t
+  - name: Ethernet1/21
+    type: 10gbase-t
+  - name: Ethernet1/22
+    type: 10gbase-t
+  - name: Ethernet1/23
+    type: 10gbase-t
+  - name: Ethernet1/24
+    type: 10gbase-t
+  - name: Ethernet1/25
+    type: 10gbase-t
+  - name: Ethernet1/26
+    type: 10gbase-t
+  - name: Ethernet1/27
+    type: 10gbase-t
+  - name: Ethernet1/28
+    type: 10gbase-t
+  - name: Ethernet1/29
+    type: 10gbase-t
+  - name: Ethernet1/30
+    type: 10gbase-t
+  - name: Ethernet1/31
+    type: 10gbase-t
+  - name: Ethernet1/32
+    type: 10gbase-t
+  - name: Ethernet1/33
+    type: 10gbase-t
+  - name: Ethernet1/34
+    type: 10gbase-t
+  - name: Ethernet1/35
+    type: 10gbase-t
+  - name: Ethernet1/36
+    type: 10gbase-t
+  - name: Ethernet1/37
+    type: 10gbase-t
+  - name: Ethernet1/38
+    type: 10gbase-t
+  - name: Ethernet1/39
+    type: 10gbase-t
+  - name: Ethernet1/40
+    type: 10gbase-t
+  - name: Ethernet1/41
+    type: 10gbase-t
+  - name: Ethernet1/42
+    type: 10gbase-t
+  - name: Ethernet1/43
+    type: 10gbase-t
+  - name: Ethernet1/44
+    type: 10gbase-t
+  - name: Ethernet1/45
+    type: 10gbase-t
+  - name: Ethernet1/46
+    type: 10gbase-t
+  - name: Ethernet1/47
+    type: 10gbase-t
+  - name: Ethernet1/48
+    type: 10gbase-t
+  - name: Ethernet1/49
+    type: 40gbase-x-qsfpp
+  - name: Ethernet1/50
+    type: 40gbase-x-qsfpp
+  - name: Ethernet1/51
+    type: 40gbase-x-qsfpp
+  - name: Ethernet1/52
+    type: 40gbase-x-qsfpp
+  - name: Ethernet1/53
+    type: 40gbase-x-qsfpp
+  - name: Ethernet1/54
+    type: 40gbase-x-qsfpp
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: PS1
+    position: '1'
+    label: Power Supply 1
+  - name: PS2
+    position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C9372TX.yaml

@@ -3,11 +3,20 @@ manufacturer: Cisco
 model: Nexus 9372TX
 part_number: N9K-C9372TX
 slug: cisco-n9k-c9372tx
+description: Nexus 9300 with 48p 100M/1/10G-T and 6p 40G QSFP+
+front_image: true
+rear_image: true
 u_height: 1
-is_full_depth: false
+weight: 10.25
+weight_unit: kg
+is_full_depth: true
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
 interfaces:
   - name: Ethernet1/1
     type: 10gbase-t
@@ -123,5 +132,15 @@ interfaces:
 module-bays:
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/N9K-C9396PX.yaml

@@ -3,7 +3,20 @@ manufacturer: Cisco
 model: Nexus 9396PX
 slug: cisco-n9k-c9396px
 part_number: N9K-C9396PX
+description: Nexus 9300 with 48p 1/10G SFP+ and Expansion Module
+front_image: true
+rear_image: true
 u_height: 2
+weight: 10.2
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
 interfaces:
   - name: mgmt0
     type: 1000base-t
@@ -104,35 +117,18 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: Ethernet1/48
     type: 10gbase-x-sfpp
-  - name: Ethernet2/1
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/2
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/3
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/4
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/5
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/6
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/7
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/8
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/9
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/10
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/11
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/12
-    type: 40gbase-x-qsfpp
-console-ports:
-  - name: Console
-    type: rj-45
 module-bays:
+  - name: Slot 2
+    position: '2'
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'

device-types/Cisco/N9K-C9396TX.yaml

@@ -3,7 +3,18 @@ manufacturer: Cisco
 model: Nexus 9396TX
 slug: cisco-n9k-c9396tx
 part_number: N9K-C9396TX
+description: Nexus 9300 with 48p 100M/1/10G-T and Expansion Module
 u_height: 2
+weight: 10.2
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
 interfaces:
   - name: mgmt0
     type: 1000base-t
@@ -104,35 +115,18 @@ interfaces:
     type: 10gbase-t
   - name: Ethernet1/48
     type: 10gbase-t
-  - name: Ethernet2/1
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/2
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/3
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/4
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/5
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/6
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/7
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/8
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/9
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/10
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/11
-    type: 40gbase-x-qsfpp
-  - name: Ethernet2/12
-    type: 40gbase-x-qsfpp
-console-ports:
-  - name: Console
-    type: rj-45
 module-bays:
+  - name: Slot 2
+    position: '2'
   - name: PS1
+    label: Power Supply 1
     position: '1'
   - name: PS2
+    label: Power Supply 2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'

device-types/Cisco/N9K-C9504.yaml

@@ -3,22 +3,13 @@ manufacturer: Cisco
 model: Nexus 9504
 slug: cisco-n9k-c9504
 part_number: N9K-C9504
-u_height: 13
+front_image: true
+rear_image: true
+u_height: 7
+weight: 38.2
+weight_unit: kg
 is_full_depth: true
-interfaces:
-  - name: mgmt0
-    type: 1000base-t
-    mgmt_only: true
-  - name: mgmt1
-    type: 1000base-t
-    mgmt_only: true
-console-ports:
-  - name: Console
-    type: rj-45
-  - name: usb0
-    type: usb-mini-b
-  - name: usb1
-    type: usb-mini-b
+
 module-bays:
   - name: Slot 1
     position: '1'
@@ -28,13 +19,58 @@ module-bays:
     description: Line Card
   - name: Slot 3
     position: '3'
+    description: Line Card
   - name: Slot 4
     position: '4'
-  - name: SUP 1
-    position: '1'
-  - name: SUP 2
-    position: '2'
+    description: Line Card
+
+  - name: Slot 21
+    label: Fabric Module 1
+    position: '21'
+  - name: Slot 22
+    label: Fabric Module 2
+    position: '22'
+  - name: Slot 23
+    label: Fabric Module 3
+    position: '23'
+  - name: Slot 24
+    label: Fabric Module 4
+    position: '24'
+  - name: Slot 25
+    label: Fabric Module 5
+    position: '25'
+  - name: Slot 26
+    label: Fabric Module 6
+    position: '26'
+
+  - name: Slot 27
+    label: Supervisor Module 1
+    position: '27'
+  - name: Slot 28
+    label: Supervisor Module 2
+    position: '28'
+  - name: Slot 29
+    label: System Controller 1
+    position: '29'
+  - name: Slot 30
+    label: System Controller 2
+    position: '30'
+
   - name: PS1
     position: '1'
+    label: Power Supply 1
   - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: PS3
+    position: '3'
+    label: Power Supply 3
+  - name: PS4
+    position: '4'
+    label: Power Supply 4
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'

device-types/Cisco/UCS-FI-6248UP.yaml

@@ -3,88 +3,135 @@ manufacturer: Cisco
 model: UCS-FI-6248UP
 slug: cisco-ucs-fi-6248up
 part_number: UCS-FI-6248UP
+description: 48-port fabric interconnect 32 fixed ports with an additional 16 ports available through expansion module
 u_height: 1
+weight: 15.88
+weight_unit: kg
 is_full_depth: true
 airflow: front-to-rear
 console-ports:
   - name: console
     type: rj-45
+  - name: usb1
+    type: usb-a
 interfaces:
+  - name: port-1
+    label: Port 1
+    type: 10gbase-x-sfpp
+  - name: port-2
+    label: Port 2
+    type: 10gbase-x-sfpp
+  - name: port-3
+    label: Port 3
+    type: 10gbase-x-sfpp
+  - name: port-4
+    label: Port 4
+    type: 10gbase-x-sfpp
+  - name: port-5
+    label: Port 5
+    type: 10gbase-x-sfpp
+  - name: port-6
+    label: Port 6
+    type: 10gbase-x-sfpp
+  - name: port-7
+    label: Port 7
+    type: 10gbase-x-sfpp
+  - name: port-8
+    label: Port 8
+    type: 10gbase-x-sfpp
+  - name: port-9
+    label: Port 9
+    type: 10gbase-x-sfpp
+  - name: port-10
+    label: Port 10
+    type: 10gbase-x-sfpp
+  - name: port-11
+    label: Port 11
+    type: 10gbase-x-sfpp
+  - name: port-12
+    label: Port 12
+    type: 10gbase-x-sfpp
+  - name: port-13
+    label: Port 13
+    type: 10gbase-x-sfpp
+  - name: port-14
+    label: Port 14
+    type: 10gbase-x-sfpp
+  - name: port-15
+    label: Port 15
+    type: 10gbase-x-sfpp
+  - name: port-16
+    label: Port 16
+    type: 10gbase-x-sfpp
+  - name: port-17
+    label: Port 17
+    type: 10gbase-x-sfpp
+  - name: port-18
+    label: Port 18
+    type: 10gbase-x-sfpp
+  - name: port-19
+    label: Port 19
+    type: 10gbase-x-sfpp
+  - name: port-20
+    label: Port 20
+    type: 10gbase-x-sfpp
+  - name: port-21
+    label: Port 21
+    type: 10gbase-x-sfpp
+  - name: port-22
+    label: Port 22
+    type: 10gbase-x-sfpp
+  - name: port-23
+    label: Port 23
+    type: 10gbase-x-sfpp
+  - name: port-24
+    label: Port 24
+    type: 10gbase-x-sfpp
+  - name: port-25
+    label: Port 25
+    type: 10gbase-x-sfpp
+  - name: port-26
+    label: Port 26
+    type: 10gbase-x-sfpp
+  - name: port-27
+    label: Port 27
+    type: 10gbase-x-sfpp
+  - name: port-28
+    label: Port 28
+    type: 10gbase-x-sfpp
+  - name: port-29
+    label: Port 29
+    type: 10gbase-x-sfpp
+  - name: port-30
+    label: Port 30
+    type: 10gbase-x-sfpp
+  - name: port-31
+    label: Port 31
+    type: 10gbase-x-sfpp
+  - name: port-32
+    label: Port 32
+    type: 10gbase-x-sfpp
   - name: L1
     type: 1000base-t
   - name: L2
     type: 1000base-t
-  - name: MGMT
+  - name: mgmt0
     type: 1000base-t
     mgmt_only: true
-  - name: Port 1
-    type: 10gbase-x-sfpp
-  - name: Port 2
-    type: 10gbase-x-sfpp
-  - name: Port 3
-    type: 10gbase-x-sfpp
-  - name: Port 4
-    type: 10gbase-x-sfpp
-  - name: Port 5
-    type: 10gbase-x-sfpp
-  - name: Port 6
-    type: 10gbase-x-sfpp
-  - name: Port 7
-    type: 10gbase-x-sfpp
-  - name: Port 8
-    type: 10gbase-x-sfpp
-  - name: Port 9
-    type: 10gbase-x-sfpp
-  - name: Port 10
-    type: 10gbase-x-sfpp
-  - name: Port 11
-    type: 10gbase-x-sfpp
-  - name: Port 12
-    type: 10gbase-x-sfpp
-  - name: Port 13
-    type: 10gbase-x-sfpp
-  - name: Port 14
-    type: 10gbase-x-sfpp
-  - name: Port 15
-    type: 10gbase-x-sfpp
-  - name: Port 16
-    type: 10gbase-x-sfpp
-  - name: Port 17
-    type: 10gbase-x-sfpp
-  - name: Port 18
-    type: 10gbase-x-sfpp
-  - name: Port 19
-    type: 10gbase-x-sfpp
-  - name: Port 20
-    type: 10gbase-x-sfpp
-  - name: Port 21
-    type: 10gbase-x-sfpp
-  - name: Port 22
-    type: 10gbase-x-sfpp
-  - name: Port 23
-    type: 10gbase-x-sfpp
-  - name: Port 24
-    type: 10gbase-x-sfpp
-  - name: Port 25
-    type: 10gbase-x-sfpp
-  - name: Port 26
-    type: 10gbase-x-sfpp
-  - name: Port 27
-    type: 10gbase-x-sfpp
-  - name: Port 28
-    type: 10gbase-x-sfpp
-  - name: Port 29
-    type: 10gbase-x-sfpp
-  - name: Port 30
-    type: 10gbase-x-sfpp
-  - name: Port 31
-    type: 10gbase-x-sfpp
-  - name: Port 32
-    type: 10gbase-x-sfpp
 module-bays:
-  - name: Front Expansion Module
-    position: '1'
-  - name: PSU1
-    position: '1'
-  - name: PSU2
+  - name: Slot 2
+    position: '2'
+    description: Expansion Module
+  - name: Slot 3
+    position: '3'
+    description: L2 Daughter Card
+  - name: PS1
+    position: '1'
+    label: Power Supply 1
+  - name: PS2
+    position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
     position: '2'

device-types/Cisco/UCS-FI-6332-16UP.yaml

@@ -3,102 +3,159 @@ manufacturer: Cisco
 model: UCS-FI-6332-16UP
 slug: cisco-ucs-fi-6332-16up
 part_number: UCS-FI-6332-16UP
+description: 40-port fabric interconnect 16x 1/10G SFP+ (4/8/16G FC), 24x 40G QSFP
 u_height: 1
+weight: 10.25
+weight_unit: kg
 is_full_depth: true
 airflow: front-to-rear
 console-ports:
   - name: console
     type: rj-45
+  - name: usb0
+    type: usb-a
+  - name: usb1
+    type: usb-a
 interfaces:
+  - name: port-1
+    label: Port 1
+    type: 10gbase-x-sfpp
+  - name: port-2
+    label: Port 2
+    type: 10gbase-x-sfpp
+  - name: port-3
+    label: Port 3
+    type: 10gbase-x-sfpp
+  - name: port-4
+    label: Port 4
+    type: 10gbase-x-sfpp
+  - name: port-5
+    label: Port 5
+    type: 10gbase-x-sfpp
+  - name: port-6
+    label: Port 6
+    type: 10gbase-x-sfpp
+  - name: port-7
+    label: Port 7
+    type: 10gbase-x-sfpp
+  - name: port-8
+    label: Port 8
+    type: 10gbase-x-sfpp
+  - name: port-9
+    label: Port 9
+    type: 10gbase-x-sfpp
+  - name: port-10
+    label: Port 10
+    type: 10gbase-x-sfpp
+  - name: port-11
+    label: Port 11
+    type: 10gbase-x-sfpp
+  - name: port-12
+    label: Port 12
+    type: 10gbase-x-sfpp
+  - name: port-13
+    label: Port 13
+    type: 10gbase-x-sfpp
+  - name: port-14
+    label: Port 14
+    type: 10gbase-x-sfpp
+  - name: port-15
+    label: Port 15
+    type: 10gbase-x-sfpp
+  - name: port-16
+    label: Port 16
+    type: 10gbase-x-sfpp
+  - name: port-17
+    label: Port 17
+    type: 40gbase-x-qsfpp
+  - name: port-18
+    label: Port 18
+    type: 40gbase-x-qsfpp
+  - name: port-19
+    label: Port 19
+    type: 40gbase-x-qsfpp
+  - name: port-20
+    label: Port 20
+    type: 40gbase-x-qsfpp
+  - name: port-21
+    label: Port 21
+    type: 40gbase-x-qsfpp
+  - name: port-22
+    label: Port 22
+    type: 40gbase-x-qsfpp
+  - name: port-23
+    label: Port 23
+    type: 40gbase-x-qsfpp
+  - name: port-24
+    label: Port 24
+    type: 40gbase-x-qsfpp
+  - name: port-25
+    label: Port 25
+    type: 40gbase-x-qsfpp
+  - name: port-26
+    label: Port 26
+    type: 40gbase-x-qsfpp
+  - name: port-27
+    label: Port 27
+    type: 40gbase-x-qsfpp
+  - name: port-28
+    label: Port 28
+    type: 40gbase-x-qsfpp
+  - name: port-29
+    label: Port 29
+    type: 40gbase-x-qsfpp
+  - name: port-30
+    label: Port 30
+    type: 40gbase-x-qsfpp
+  - name: port-31
+    label: Port 31
+    type: 40gbase-x-qsfpp
+  - name: port-32
+    label: Port 32
+    type: 40gbase-x-qsfpp
+  - name: port-33
+    label: Port 33
+    type: 40gbase-x-qsfpp
+  - name: port-34
+    label: Port 34
+    type: 40gbase-x-qsfpp
+  - name: port-35
+    label: Port 35
+    type: 40gbase-x-qsfpp
+  - name: port-36
+    label: Port 36
+    type: 40gbase-x-qsfpp
+  - name: port-37
+    label: Port 37
+    type: 40gbase-x-qsfpp
+  - name: port-38
+    label: Port 38
+    type: 40gbase-x-qsfpp
+  - name: port-39
+    label: Port 39
+    type: 40gbase-x-qsfpp
+  - name: port-40
+    label: Port 40
+    type: 40gbase-x-qsfpp
   - name: L1
     type: 1000base-t
   - name: L2
     type: 1000base-t
-  - name: MGMT
+  - name: mgmt0
     type: 1000base-t
     mgmt_only: true
-  - name: Port 1
-    type: 10gbase-x-sfpp
-  - name: Port 2
-    type: 10gbase-x-sfpp
-  - name: Port 3
-    type: 10gbase-x-sfpp
-  - name: Port 4
-    type: 10gbase-x-sfpp
-  - name: Port 5
-    type: 10gbase-x-sfpp
-  - name: Port 6
-    type: 10gbase-x-sfpp
-  - name: Port 7
-    type: 10gbase-x-sfpp
-  - name: Port 8
-    type: 10gbase-x-sfpp
-  - name: Port 9
-    type: 10gbase-x-sfpp
-  - name: Port 10
-    type: 10gbase-x-sfpp
-  - name: Port 11
-    type: 10gbase-x-sfpp
-  - name: Port 12
-    type: 10gbase-x-sfpp
-  - name: Port 13
-    type: 10gbase-x-sfpp
-  - name: Port 14
-    type: 10gbase-x-sfpp
-  - name: Port 15
-    type: 10gbase-x-sfpp
-  - name: Port 16
-    type: 10gbase-x-sfpp
-  - name: Port 17
-    type: 40gbase-x-qsfpp
-  - name: Port 18
-    type: 40gbase-x-qsfpp
-  - name: Port 19
-    type: 40gbase-x-qsfpp
-  - name: Port 20
-    type: 40gbase-x-qsfpp
-  - name: Port 21
-    type: 40gbase-x-qsfpp
-  - name: Port 22
-    type: 40gbase-x-qsfpp
-  - name: Port 23
-    type: 40gbase-x-qsfpp
-  - name: Port 24
-    type: 40gbase-x-qsfpp
-  - name: Port 25
-    type: 40gbase-x-qsfpp
-  - name: Port 26
-    type: 40gbase-x-qsfpp
-  - name: Port 27
-    type: 40gbase-x-qsfpp
-  - name: Port 28
-    type: 40gbase-x-qsfpp
-  - name: Port 29
-    type: 40gbase-x-qsfpp
-  - name: Port 30
-    type: 40gbase-x-qsfpp
-  - name: Port 31
-    type: 40gbase-x-qsfpp
-  - name: Port 32
-    type: 40gbase-x-qsfpp
-  - name: Port 33
-    type: 40gbase-x-qsfpp
-  - name: Port 34
-    type: 40gbase-x-qsfpp
-  - name: Port 35
-    type: 40gbase-x-qsfpp
-  - name: Port 36
-    type: 40gbase-x-qsfpp
-  - name: Port 37
-    type: 40gbase-x-qsfpp
-  - name: Port 38
-    type: 40gbase-x-qsfpp
-  - name: Port 39
-    type: 40gbase-x-qsfpp
-  - name: Port 40
-    type: 40gbase-x-qsfpp
 module-bays:
-  - name: PSU1
+  - name: PS1
     position: '1'
-  - name: PSU2
+    label: Power Supply 1
+  - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

device-types/Cisco/UCS-FI-6454.yaml

@@ -3,130 +3,199 @@ manufacturer: Cisco
 model: UCS-FI-6454
 slug: cisco-ucs-fi-6454
 part_number: UCS-FI-6454
+description: 54-port fabric interconnect 48x 10/25G SFP28, 6x 40/100G QSFP
 u_height: 1
+weight: 10.10
+weight_unit: kg
 is_full_depth: true
 airflow: front-to-rear
 console-ports:
   - name: console
     type: rj-45
+  - name: usb0
+    type: usb-a
 interfaces:
+  - name: port-1
+    label: Port 1
+    type: 25gbase-x-sfp28
+  - name: port-2
+    label: Port 2
+    type: 25gbase-x-sfp28
+  - name: port-3
+    label: Port 3
+    type: 25gbase-x-sfp28
+  - name: port-4
+    label: Port 4
+    type: 25gbase-x-sfp28
+  - name: port-5
+    label: Port 5
+    type: 25gbase-x-sfp28
+  - name: port-6
+    label: Port 6
+    type: 25gbase-x-sfp28
+  - name: port-7
+    label: Port 7
+    type: 25gbase-x-sfp28
+  - name: port-8
+    label: Port 8
+    type: 25gbase-x-sfp28
+  - name: port-9
+    label: Port 9
+    type: 25gbase-x-sfp28
+  - name: port-10
+    label: Port 10
+    type: 25gbase-x-sfp28
+  - name: port-11
+    label: Port 11
+    type: 25gbase-x-sfp28
+  - name: port-12
+    label: Port 12
+    type: 25gbase-x-sfp28
+  - name: port-13
+    label: Port 13
+    type: 25gbase-x-sfp28
+  - name: port-14
+    label: Port 14
+    type: 25gbase-x-sfp28
+  - name: port-15
+    label: Port 15
+    type: 25gbase-x-sfp28
+  - name: port-16
+    label: Port 16
+    type: 25gbase-x-sfp28
+  - name: port-17
+    label: Port 17
+    type: 25gbase-x-sfp28
+  - name: port-18
+    label: Port 18
+    type: 25gbase-x-sfp28
+  - name: port-19
+    label: Port 19
+    type: 25gbase-x-sfp28
+  - name: port-20
+    label: Port 20
+    type: 25gbase-x-sfp28
+  - name: port-21
+    label: Port 21
+    type: 25gbase-x-sfp28
+  - name: port-22
+    label: Port 22
+    type: 25gbase-x-sfp28
+  - name: port-23
+    label: Port 23
+    type: 25gbase-x-sfp28
+  - name: port-24
+    label: Port 24
+    type: 25gbase-x-sfp28
+  - name: port-25
+    label: Port 25
+    type: 25gbase-x-sfp28
+  - name: port-26
+    label: Port 26
+    type: 25gbase-x-sfp28
+  - name: port-27
+    label: Port 27
+    type: 25gbase-x-sfp28
+  - name: port-28
+    label: Port 28
+    type: 25gbase-x-sfp28
+  - name: port-29
+    label: Port 29
+    type: 25gbase-x-sfp28
+  - name: port-30
+    label: Port 30
+    type: 25gbase-x-sfp28
+  - name: port-31
+    label: Port 31
+    type: 25gbase-x-sfp28
+  - name: port-32
+    label: Port 32
+    type: 25gbase-x-sfp28
+  - name: port-33
+    label: Port 33
+    type: 25gbase-x-sfp28
+  - name: port-34
+    label: Port 34
+    type: 25gbase-x-sfp28
+  - name: port-35
+    label: Port 35
+    type: 25gbase-x-sfp28
+  - name: port-36
+    label: Port 36
+    type: 25gbase-x-sfp28
+  - name: port-37
+    label: Port 37
+    type: 25gbase-x-sfp28
+  - name: port-38
+    label: Port 38
+    type: 25gbase-x-sfp28
+  - name: port-39
+    label: Port 39
+    type: 25gbase-x-sfp28
+  - name: port-40
+    label: Port 40
+    type: 25gbase-x-sfp28
+  - name: port-41
+    label: Port 41
+    type: 25gbase-x-sfp28
+  - name: port-42
+    label: Port 42
+    type: 25gbase-x-sfp28
+  - name: port-43
+    label: Port 43
+    type: 25gbase-x-sfp28
+  - name: port-44
+    label: Port 44
+    type: 25gbase-x-sfp28
+  - name: port-45
+    label: Port 45
+    type: 25gbase-x-sfp28
+  - name: port-46
+    label: Port 46
+    type: 25gbase-x-sfp28
+  - name: port-47
+    label: Port 47
+    type: 25gbase-x-sfp28
+  - name: port-48
+    label: Port 48
+    type: 25gbase-x-sfp28
+  - name: port-49
+    label: Port 49
+    type: 100gbase-x-qsfp28
+  - name: port-50
+    label: Port 50
+    type: 100gbase-x-qsfp28
+  - name: port-51
+    label: Port 51
+    type: 100gbase-x-qsfp28
+  - name: port-52
+    label: Port 52
+    type: 100gbase-x-qsfp28
+  - name: port-53
+    label: Port 53
+    type: 100gbase-x-qsfp28
+  - name: port-54
+    label: Port 54
+    type: 100gbase-x-qsfp28
   - name: L1
     type: 1000base-t
   - name: L2
     type: 1000base-t
-  - name: MGMT
+  - name: mgmt0
     type: 1000base-t
     mgmt_only: true
-  - name: Port 1
-    type: 25gbase-x-sfp28
-  - name: Port 2
-    type: 25gbase-x-sfp28
-  - name: Port 3
-    type: 25gbase-x-sfp28
-  - name: Port 4
-    type: 25gbase-x-sfp28
-  - name: Port 5
-    type: 25gbase-x-sfp28
-  - name: Port 6
-    type: 25gbase-x-sfp28
-  - name: Port 7
-    type: 25gbase-x-sfp28
-  - name: Port 8
-    type: 25gbase-x-sfp28
-  - name: Port 9
-    type: 25gbase-x-sfp28
-  - name: Port 10
-    type: 25gbase-x-sfp28
-  - name: Port 11
-    type: 25gbase-x-sfp28
-  - name: Port 12
-    type: 25gbase-x-sfp28
-  - name: Port 13
-    type: 25gbase-x-sfp28
-  - name: Port 14
-    type: 25gbase-x-sfp28
-  - name: Port 15
-    type: 25gbase-x-sfp28
-  - name: Port 16
-    type: 25gbase-x-sfp28
-  - name: Port 17
-    type: 25gbase-x-sfp28
-  - name: Port 18
-    type: 25gbase-x-sfp28
-  - name: Port 19
-    type: 25gbase-x-sfp28
-  - name: Port 20
-    type: 25gbase-x-sfp28
-  - name: Port 21
-    type: 25gbase-x-sfp28
-  - name: Port 22
-    type: 25gbase-x-sfp28
-  - name: Port 23
-    type: 25gbase-x-sfp28
-  - name: Port 24
-    type: 25gbase-x-sfp28
-  - name: Port 25
-    type: 25gbase-x-sfp28
-  - name: Port 26
-    type: 25gbase-x-sfp28
-  - name: Port 27
-    type: 25gbase-x-sfp28
-  - name: Port 28
-    type: 25gbase-x-sfp28
-  - name: Port 29
-    type: 25gbase-x-sfp28
-  - name: Port 30
-    type: 25gbase-x-sfp28
-  - name: Port 31
-    type: 25gbase-x-sfp28
-  - name: Port 32
-    type: 25gbase-x-sfp28
-  - name: Port 33
-    type: 25gbase-x-sfp28
-  - name: Port 34
-    type: 25gbase-x-sfp28
-  - name: Port 35
-    type: 25gbase-x-sfp28
-  - name: Port 36
-    type: 25gbase-x-sfp28
-  - name: Port 37
-    type: 25gbase-x-sfp28
-  - name: Port 38
-    type: 25gbase-x-sfp28
-  - name: Port 39
-    type: 25gbase-x-sfp28
-  - name: Port 40
-    type: 25gbase-x-sfp28
-  - name: Port 41
-    type: 25gbase-x-sfp28
-  - name: Port 42
-    type: 25gbase-x-sfp28
-  - name: Port 43
-    type: 25gbase-x-sfp28
-  - name: Port 44
-    type: 25gbase-x-sfp28
-  - name: Port 45
-    type: 25gbase-x-sfp28
-  - name: Port 46
-    type: 25gbase-x-sfp28
-  - name: Port 47
-    type: 25gbase-x-sfp28
-  - name: Port 48
-    type: 25gbase-x-sfp28
-  - name: Port 49
-    type: 100gbase-x-qsfp28
-  - name: Port 50
-    type: 100gbase-x-qsfp28
-  - name: Port 51
-    type: 100gbase-x-qsfp28
-  - name: Port 52
-    type: 100gbase-x-qsfp28
-  - name: Port 53
-    type: 100gbase-x-qsfp28
-  - name: Port 54
-    type: 100gbase-x-qsfp28
 module-bays:
-  - name: PSU1
+  - name: PS1
     position: '1'
-  - name: PSU2
+    label: Power Supply 1
+  - name: PS2
     position: '2'
+    label: Power Supply 2
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'

module-types/Cisco/N2200-PAC-400W-B.yaml

@@ -2,10 +2,11 @@
 manufacturer: Cisco
 model: N2200-PAC-400W-B
 part_number: N2200-PAC-400W-B
+description: Cisco Nexus 2200 AC Power supply, Back-to-front airflow (Reversed airflow, port side intake)
 comments: Nexus AC 400W PSU - Port Side Intake / [Cisco Nexus 2000 Series Fabric Extenders Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/nexus-2000-series-fabric-extenders/data_sheet_c78-507093.html)
 weight: 1
 weight_unit: kg
 power-ports:
-  - name: PS{module}
+  - name: PSU{module}
     type: iec-60320-c14
     maximum_draw: 400

module-types/Cisco/N2200-PAC-400W.yaml

@@ -2,10 +2,11 @@
 manufacturer: Cisco
 model: N2200-PAC-400W
 part_number: N2200-PAC-400W
+description: Cisco Nexus 2200 AC Power supply (Std airflow, port side exhaust)
 comments: Nexus AC 400W PSU - Port Side Exhaust / [Cisco Nexus 2000 Series Fabric Extenders Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/nexus-2000-series-fabric-extenders/data_sheet_c78-507093.html)
 weight: 1
 weight_unit: kg
 power-ports:
-  - name: PS{module}
+  - name: PSU{module}
     type: iec-60320-c14
     maximum_draw: 400

module-types/Cisco/N2200-PAC-400W.yml

@@ -1,8 +0,0 @@
----
-manufacturer: Cisco
-model: N2200-PAC-400W
-part_number: N2200-PAC-400W
-power-ports:
-  - name: PSU{module}
-    type: iec-60320-c14
-    maximum_draw: 400

module-types/Cisco/N2200-PDC-350W-B.yaml

@@ -0,0 +1,11 @@
+---
+manufacturer: Cisco
+model: N2200-PDC-350W-B
+part_number: N2200-PDC-350W-B
+description: Cisco Nexus 2200 DC Power supply, Back-to-front airflow (Reversed airflow, port side intake)
+weight: 1
+weight_unit: kg
+power-ports:
+  - name: PSU{module}
+    type: dc-terminal
+    maximum_draw: 350

module-types/Cisco/N2200-PDC-400W.yaml

@@ -0,0 +1,11 @@
+---
+manufacturer: Cisco
+model: N2200-PDC-400W
+part_number: N2200-PDC-400W
+description: Cisco Nexus 2200 DC Power supply (Std airflow, port side exhaust)
+weight: 1
+weight_unit: kg
+power-ports:
+  - name: PSU{module}
+    type: dc-terminal
+    maximum_draw: 400

module-types/Cisco/N2K-C2148T-FAN.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: N2K-C2148T-FAN
+part_number: N2K-C2148T-FAN
+description: Cisco Nexus 2148T FEX Fan Module (Std airflow, port side exhaust)
+comments: Port-side exhaust (front-to-back airflow), with power supplies of the chassis aligned with cold aisle, and port side aligned with hot aisle; color-coded
+  blue for cold aisle
+weight: 0.2
+weight_unit: kg

module-types/Cisco/N2K-C2232-FAN-B.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: N2K-C2232-FAN-B
+part_number: N2K-C2232-FAN-B
+description: Cisco Nexus 2232PP and 2232TM FEX Fan Module, Back-to-front airflow (Reversed airflow, port side intake)
+comments: Port-side intake (back-to-front airflow reversed), with port side of the chassis aligned with cold aisle, and power supplies aligned with hot
+  aisle; color-coded red for hot aisle
+weight: 0.8
+weight_unit: kg

module-types/Cisco/N2K-C2232-FAN.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: N2K-C2232-FAN
+part_number: N2K-C2232-FAN
+description: Cisco Nexus 2232PP and 2232TM FEX Fan Module (Std airflow, port side exhaust)
+comments: Port-side exhaust (front-to-back airflow), with power supplies of the chassis aligned with cold aisle, and port side aligned with hot aisle; color-coded
+  blue for cold aisle
+weight: 0.8
+weight_unit: kg

module-types/Cisco/N2K-C2248-FAN-B.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: N2K-C2248-FAN-B
+part_number: N2K-C2248-FAN-B
+description: Cisco Nexus 2224TP, 2248TP, and 2248TP-E FEX Fan Module, Back-to-front airflow (Reversed airflow, port side intake)
+comments: Port-side intake (back-to-front airflow reversed), with port side of the chassis aligned with cold aisle, and power supplies aligned with hot
+  aisle; color-coded red for hot aisle
+weight: 0.64
+weight_unit: kg

module-types/Cisco/N2K-C2248-FAN.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: N2K-C2248-FAN
+part_number: N2K-C2248-FAN
+description: Cisco Nexus 2224TP, 2248TP, and 2248TP-E FEX Fan Module (Std airflow, port side exhaust)
+comments: Port-side exhaust (front-to-back airflow), with power supplies of the chassis aligned with cold aisle, and port side aligned with hot aisle; color-coded
+  blue for cold aisle
+weight: 0.64
+weight_unit: kg

module-types/Cisco/N2K-PAC-200W.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: N2K-PAC-200W
+part_number: N2K-PAC-200W
+description: Cisco Nexus 2148T FEX 1GE 200W Power supply (Std airflow, port side exhaust)
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 200

module-types/Cisco/N55-PAC-1100W-B.yaml

@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: N55-PAC-1100W-B
+part_number: N55-PAC-1100W-B
+description: Cisco Nexus 5500/6000/5600 Platinum PSU Back-to-Front Airflow module, A/C, 100-240V, 1100W
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 1100