From 5c23b41812c1e45fd991b137221dc75ca5e29385 Mon Sep 17 00:00:00 2001
From: Eric Krichbaum <eric@telic.us>
Date: Fri, 27 May 2022 08:58:35 -0400
Subject: [PATCH] Cisco UCS module adjustments for PSU (#789)

* Create UCSB-B200-M4.yaml

* Delete UCSB-B200-M4.yaml

* Create UCSB-PSU-2500ACDV.yaml

* Create UCSB-PSU-2500ACPL.yaml

* Create UCS-PSU-6332-AC.yaml

* Update UCSB-5108-AC2.yaml

* Update UCS-FI-6332-16UP.yaml

* Update UCS-FI-6248UP.yaml

* Create UCS-PSU-6248UP-AC.yaml

* Update UCS-PSU-6332-AC.yaml

* Update UCSB-PSU-2500ACDV.yaml

* Update UCSB-PSU-2500ACPL.yaml

* Update UCS-PSU-6332-AC.yaml

* Update UCS-PSU-6248UP-AC.yaml
---
 device-types/Cisco/UCS-FI-6248UP.yaml     | 12 +++++++-----
 device-types/Cisco/UCS-FI-6332-16UP.yaml  | 10 +++++-----
 device-types/Cisco/UCSB-5108-AC2.yaml     | 21 ++++++++-------------
 module-types/Cisco/UCS-PSU-6248UP-AC.yaml |  8 ++++++++
 module-types/Cisco/UCS-PSU-6332-AC.yaml   |  8 ++++++++
 module-types/Cisco/UCSB-PSU-2500ACDV.yaml |  8 ++++++++
 module-types/Cisco/UCSB-PSU-2500ACPL.yaml |  8 ++++++++
 7 files changed, 52 insertions(+), 23 deletions(-)
 create mode 100644 module-types/Cisco/UCS-PSU-6248UP-AC.yaml
 create mode 100644 module-types/Cisco/UCS-PSU-6332-AC.yaml
 create mode 100644 module-types/Cisco/UCSB-PSU-2500ACDV.yaml
 create mode 100644 module-types/Cisco/UCSB-PSU-2500ACPL.yaml

diff --git a/device-types/Cisco/UCS-FI-6248UP.yaml b/device-types/Cisco/UCS-FI-6248UP.yaml
index dc4b95e8e..eb144ee1d 100644
--- a/device-types/Cisco/UCS-FI-6248UP.yaml
+++ b/device-types/Cisco/UCS-FI-6248UP.yaml
@@ -9,11 +9,6 @@ airflow: front-to-rear
 console-ports:
   - name: console
     type: rj-45
-power-ports:
-  - name: PSU 1
-    type: iec-60320-c14
-  - name: PSU 2
-    type: iec-60320-c14
 interfaces:
   - name: L1
     type: 1000base-t
@@ -120,3 +115,10 @@ interfaces:
   - name: Port 32
     type: 10gbase-x-sfpp
     mgmt_only: false
+module-bays:
+  - name: Front Expansion Module
+    position: '1'
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Cisco/UCS-FI-6332-16UP.yaml b/device-types/Cisco/UCS-FI-6332-16UP.yaml
index edf847f69..32bfaaddf 100644
--- a/device-types/Cisco/UCS-FI-6332-16UP.yaml
+++ b/device-types/Cisco/UCS-FI-6332-16UP.yaml
@@ -9,11 +9,6 @@ airflow: front-to-rear
 console-ports:
   - name: console
     type: rj-45
-power-ports:
-  - name: PSU 1
-    type: iec-60320-c14
-  - name: PSU 2
-    type: iec-60320-c14
 interfaces:
   - name: L1
     type: 1000base-t
@@ -144,3 +139,8 @@ interfaces:
   - name: Port 40
     type: 40gbase-x-qsfpp
     mgmt_only: false
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Cisco/UCSB-5108-AC2.yaml b/device-types/Cisco/UCSB-5108-AC2.yaml
index afdb283e0..c78cb50ce 100644
--- a/device-types/Cisco/UCSB-5108-AC2.yaml
+++ b/device-types/Cisco/UCSB-5108-AC2.yaml
@@ -7,19 +7,6 @@ u_height: 6
 is_full_depth: true
 subdevice_role: parent
 airflow: front-to-rear
-power-ports:
-  - name: psu-1
-    type: iec-60320-c20
-    maximum_draw: 2500
-  - name: psu-2
-    type: iec-60320-c20
-    maximum_draw: 2500
-  - name: psu-3
-    type: iec-60320-c20
-    maximum_draw: 2500
-  - name: psu-4
-    type: iec-60320-c20
-    maximum_draw: 2500
 device-bays:
   - name: slot-1
   - name: slot-2
@@ -34,3 +21,11 @@ module-bays:
     position: '1'
   - name: IO Module 2
     position: '2'
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
+  - name: PSU3
+    position: '3'
+  - name: PSU4
+    position: '4'
diff --git a/module-types/Cisco/UCS-PSU-6248UP-AC.yaml b/module-types/Cisco/UCS-PSU-6248UP-AC.yaml
new file mode 100644
index 000000000..9182a2d0f
--- /dev/null
+++ b/module-types/Cisco/UCS-PSU-6248UP-AC.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: Cisco
+model: UCS-PSU-6248UP-AC
+part_number: UCS-PSU-6248UP-AC
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 390
diff --git a/module-types/Cisco/UCS-PSU-6332-AC.yaml b/module-types/Cisco/UCS-PSU-6332-AC.yaml
new file mode 100644
index 000000000..057d6b8fe
--- /dev/null
+++ b/module-types/Cisco/UCS-PSU-6332-AC.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: Cisco
+model: UCS-PSU-6332-AC
+part_number: UCS-PSU-6332-AC
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 650
diff --git a/module-types/Cisco/UCSB-PSU-2500ACDV.yaml b/module-types/Cisco/UCSB-PSU-2500ACDV.yaml
new file mode 100644
index 000000000..8d95e01cb
--- /dev/null
+++ b/module-types/Cisco/UCSB-PSU-2500ACDV.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: Cisco
+model: UCSB-PSU-2500ACDV
+part_number: UCSB-PSU-2500ACDV
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c20
+    maximum_draw: 2500
diff --git a/module-types/Cisco/UCSB-PSU-2500ACPL.yaml b/module-types/Cisco/UCSB-PSU-2500ACPL.yaml
new file mode 100644
index 000000000..9ddc21cf0
--- /dev/null
+++ b/module-types/Cisco/UCSB-PSU-2500ACPL.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: Cisco
+model: UCSB-PSU-2500ACPL
+part_number: UCSB-PSU-2500ACPL
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c20
+    maximum_draw: 2500