From 16388ac9294d8fef4ebb06af95691bda0147f1a9 Mon Sep 17 00:00:00 2001
From: Eric Krichbaum <eric@telic.us>
Date: Sun, 10 Apr 2022 14:57:46 -0400
Subject: [PATCH] Ucs (#756)

* Create UCSB-B200-M4.yaml

* Delete UCSB-B200-M4.yaml

* Create UCS-IOM-2204XP.yaml

* Create UCS-IOM-2208XP.yaml

* Update UCSB-5108-AC2.yaml

* Create UCS-FI-M-6324.yaml

* Update UCS-FI-M-6324.yaml

* Update UCS-IOM-2208XP.yaml

* Update UCS-IOM-2204XP.yaml

* Update UCSB-5108-AC2.yaml
---
 device-types/Cisco/UCSB-5108-AC2.yaml  | 52 ++------------------------
 module-types/Cisco/UCS-FI-M-6324.yaml  | 37 ++++++++++++++++++
 module-types/Cisco/UCS-IOM-2204XP.yaml | 17 +++++++++
 module-types/Cisco/UCS-IOM-2208XP.yaml | 29 ++++++++++++++
 4 files changed, 86 insertions(+), 49 deletions(-)
 create mode 100644 module-types/Cisco/UCS-FI-M-6324.yaml
 create mode 100644 module-types/Cisco/UCS-IOM-2204XP.yaml
 create mode 100644 module-types/Cisco/UCS-IOM-2208XP.yaml

diff --git a/device-types/Cisco/UCSB-5108-AC2.yaml b/device-types/Cisco/UCSB-5108-AC2.yaml
index 684d7680d..c865990c9 100644
--- a/device-types/Cisco/UCSB-5108-AC2.yaml
+++ b/device-types/Cisco/UCSB-5108-AC2.yaml
@@ -20,55 +20,6 @@ power-ports:
   - name: psu-4
     type: iec-60320-c20
     maximum_draw: 2500
-interfaces:
-  - name: IOM A 1/1
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM A 1/2
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM A 1/3
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM A 1/4
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM A 1/5
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM A 1/6
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM A 1/7
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM A 1/8
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/1
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/2
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/3
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/4
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/5
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/6
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/7
-    type: 10gbase-x-sfpp
-    mgmt_only: false
-  - name: IOM B 2/8
-    type: 10gbase-x-sfpp
-    mgmt_only: false
 device-bays:
   - name: slot-1
   - name: slot-2
@@ -78,3 +29,6 @@ device-bays:
   - name: slot-6
   - name: slot-7
   - name: slot-8
+module-bays:
+  - name: IO Module 1
+  - name: IO Module 2
diff --git a/module-types/Cisco/UCS-FI-M-6324.yaml b/module-types/Cisco/UCS-FI-M-6324.yaml
new file mode 100644
index 000000000..7fe80f848
--- /dev/null
+++ b/module-types/Cisco/UCS-FI-M-6324.yaml
@@ -0,0 +1,37 @@
+---
+manufacturer: Cisco
+model: UCS-FI-M-6324
+part_number: UCS-FI-M-6324
+console-ports:
+  - name: IOM {module} Con0
+    type: rj-45
+  - name: IOM {module} USB0
+    type: usb-a
+interfaces:
+  - name: Fabric {module}/5/1
+    type: 40gbase-x-qsfpp
+    mgmt_only: false
+  - name: Fabric {module}/5/2
+    type: 40gbase-x-qsfpp
+    mgmt_only: false
+  - name: Fabric {module}/5/3
+    type: 40gbase-x-qsfpp
+    mgmt_only: false
+  - name: Fabric {module}/5/4
+    type: 40gbase-x-qsfpp
+    mgmt_only: false
+  - name: Fabric {module}/1
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/2
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/3
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/4
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: IOM {module} Mgmt0
+    type: 1000base-t
+    mgmt_only: true
diff --git a/module-types/Cisco/UCS-IOM-2204XP.yaml b/module-types/Cisco/UCS-IOM-2204XP.yaml
new file mode 100644
index 000000000..b55f02056
--- /dev/null
+++ b/module-types/Cisco/UCS-IOM-2204XP.yaml
@@ -0,0 +1,17 @@
+---
+manufacturer: Cisco
+model: UCS-IOM-2204XP
+part_number: UCS-IOM-2204XP
+interfaces:
+  - name: Fabric {module}/1
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/2
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/3
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/4
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/module-types/Cisco/UCS-IOM-2208XP.yaml b/module-types/Cisco/UCS-IOM-2208XP.yaml
new file mode 100644
index 000000000..9b1b19b1c
--- /dev/null
+++ b/module-types/Cisco/UCS-IOM-2208XP.yaml
@@ -0,0 +1,29 @@
+---
+manufacturer: Cisco
+model: UCS-IOM-2208XP
+part_number: UCS-IOM-2208XP
+interfaces:
+  - name: Fabric {module}/1
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/2
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/3
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/4
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/5
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/6
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/7
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: Fabric {module}/8
+    type: 10gbase-x-sfpp
+    mgmt_only: false