Cisco power supplies fans (#1200)

* C9300 support for modular power supplies and fans

* Fix weight format

* Convert power supplies to module-bays

* Fixed typo

* Convert power supplies to module-bays

* Correct Power supply names

* Merge

* Update Nexus devices and Nexus PSUs

* Removed N7K-7702.yaml correct one is N77-7702.yaml

* Fixed Pytest Errors

---------

Co-authored-by: Daniel W. Anner <daniel.anner@danstechsupport.com>

device-types/Cisco/C9300-24P.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 715
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 715
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -121,3 +114,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-24T-E.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c14
-    maximum_draw: 350
-  - name: PS-B
-    type: iec-60320-c14
-    maximum_draw: 350
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -73,3 +66,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-24T.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c14
-    maximum_draw: 350
-  - name: PS-B
-    type: iec-60320-c14
-    maximum_draw: 350
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -73,3 +66,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-24U.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 1100
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 1100
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -121,3 +114,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-24UX.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 1100
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 1100
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
@@ -121,3 +114,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-48P-E.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 715
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 715
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -217,3 +210,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-48P.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 715
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 715
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -217,3 +210,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-48T.yaml

@@ -13,13 +13,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-module-bays:
-  - name: PS-A
-    position: A
-  - name: PS-B
-    position: B
-  - name: Network Module
-    position: '1'
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -120,3 +113,13 @@ interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
     mgmt_only: true
+module-bays:
+  - name: Network Module
+    position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-48U.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 1100
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 1100
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -217,3 +210,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-48UN.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 1100
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 1100
 interfaces:
   - name: FiveGigabitEthernet1/0/1
     type: 5gbase-t
@@ -121,3 +114,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300-48UXM.yaml

@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 1100
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 1100
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
@@ -217,3 +210,10 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300L-24P-4G.yaml

@@ -10,13 +10,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 715
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 715
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -129,3 +122,11 @@ interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
     mgmt_only: true
+module-bays:
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300L-48P-4G.yaml

@@ -10,13 +10,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 715
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 715
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -225,3 +218,11 @@ interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
     mgmt_only: true
+module-bays:
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300L-48P-4X.yaml

@@ -10,13 +10,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 715
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 715
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -225,3 +218,11 @@ interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
     mgmt_only: true
+module-bays:
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/C9300L-48UXG-4X.yaml

@@ -10,13 +10,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-A
-    type: iec-60320-c16
-    maximum_draw: 1100
-  - name: PS-B
-    type: iec-60320-c16
-    maximum_draw: 1100
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -225,3 +218,11 @@ interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
     mgmt_only: true
+module-bays:
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+  - name: FAN 2
+  - name: FAN 3

device-types/Cisco/N2K-C2232PP-10GE.yaml

@@ -5,13 +5,6 @@ slug: cisco-n2k-c2232pp-10ge
 part_number: N2K-C2232PP-10GE
 u_height: 1
 is_full_depth: false
-power-ports:
-  - name: Power Supply 1
-    type: iec-60320-c14
-    maximum_draw: 400
-  - name: Power Supply 2
-    type: iec-60320-c14
-    maximum_draw: 400
 interfaces:
   - name: Ethernet1/1/1
     type: 10gbase-x-sfpp
@@ -93,3 +86,8 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: Ethernet1/2/8
     type: 10gbase-x-sfpp
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

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

@@ -5,13 +5,6 @@ slug: cisco-n2k-c2232tm-e-10ge
 part_number: N2K-C2232TM-E-10GE
 u_height: 1
 is_full_depth: false
-power-ports:
-  - name: Power Supply 1
-    type: iec-60320-c14
-    maximum_draw: 400
-  - name: Power Supply 2
-    type: iec-60320-c14
-    maximum_draw: 400
 interfaces:
   - name: Ethernet1/1/1
     type: 10gbase-t
@@ -93,3 +86,8 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: Ethernet1/2/8
     type: 10gbase-x-sfpp
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

device-types/Cisco/N2K-C2248PQ.yaml

@@ -5,13 +5,6 @@ slug: cisco-n2k-c2248pq
 part_number: N2K-C2248PQ
 u_height: 1
 is_full_depth: false
-power-ports:
-  - name: Power Supply 1
-    type: iec-60320-c14
-    maximum_draw: 400
-  - name: Power Supply 2
-    type: iec-60320-c14
-    maximum_draw: 400
 interfaces:
   - name: Ethernet1/1/1
     type: 10gbase-x-sfpp
@@ -117,3 +110,8 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: Ethernet1/2/4
     type: 40gbase-x-qsfpp
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

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

@@ -5,13 +5,6 @@ slug: cisco-n2k-c2248tp-1ge
 part_number: N2K-C2248TP-1GE
 u_height: 1
 is_full_depth: true
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 400
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 400
 interfaces:
   - name: Ethernet1/1/1
     type: 1000base-t
@@ -117,3 +110,8 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: Ethernet1/2/4
     type: 10gbase-x-sfpp
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'

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

@@ -5,13 +5,6 @@ slug: cisco-n2k-c2248tp-e-1ge
 part_number: N2K-C2248TP-E-1GE
 u_height: 1
 is_full_depth: true
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 400
-  - name: PS2
-    type: iec-60320-c14
-    maximum_draw: 400
 interfaces:
   - name: Ethernet1/1/1
     type: 1000base-t
@@ -117,3 +110,8 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: Ethernet1/2/4
     type: 10gbase-x-sfpp
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'