From 860a5bfa672684a9b66fd25ae935ff4a3057104a Mon Sep 17 00:00:00 2001
From: "Daniel W. Anner" <daniel.anner@danstechsupport.com>
Date: Mon, 8 May 2023 16:23:53 -0400
Subject: [PATCH] Cisco Fixes & PWR-C1-350WAC-P (#1335)

* fixed file name and type for c2960xr-24ts-i and fixed power slots for c9300-48t

* Added PWR-C1-350WAC-P
---
 device-types/Cisco/C9300-48T.yaml                 | 15 +++++++--------
 ...XR-48TS-I copy.yaml => WS-C2960XR-24TS-I.yaml} | 10 +++++-----
 module-types/Cisco/PWR-C1-350WAC-P.yaml           |  8 ++++++++
 3 files changed, 20 insertions(+), 13 deletions(-)
 rename device-types/Cisco/{WS-C2960XR-48TS-I copy.yaml => WS-C2960XR-24TS-I.yaml} (94%)
 create mode 100644 module-types/Cisco/PWR-C1-350WAC-P.yaml

diff --git a/device-types/Cisco/C9300-48T.yaml b/device-types/Cisco/C9300-48T.yaml
index f4b695154..4c30a3204 100644
--- a/device-types/Cisco/C9300-48T.yaml
+++ b/device-types/Cisco/C9300-48T.yaml
@@ -5,19 +5,21 @@ part_number: C9300-48T
 slug: cisco-c9300-48t
 u_height: 1
 is_full_depth: true
+weight: 16.43
+weight_unit: lb
 comments: '[Cisco Catalyst 9300 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9300-series-switches/nb-06-cat9300-ser-data-sheet-cte-en.html)'
 console-ports:
   - name: con 0
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
   - name: PS-A
-    type: iec-60320-c14
-    maximum_draw: 350
+    position: A
   - name: PS-B
-    type: iec-60320-c14
-    maximum_draw: 350
+    position: B
+  - name: Network Module
+    position: '1'
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -118,6 +120,3 @@ interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
     mgmt_only: true
-module-bays:
-  - name: Network Module
-    position: '1'
diff --git a/device-types/Cisco/WS-C2960XR-48TS-I copy.yaml b/device-types/Cisco/WS-C2960XR-24TS-I.yaml
similarity index 94%
rename from device-types/Cisco/WS-C2960XR-48TS-I copy.yaml
rename to device-types/Cisco/WS-C2960XR-24TS-I.yaml
index b8d385f7f..3800581a5 100644
--- a/device-types/Cisco/WS-C2960XR-48TS-I copy.yaml	
+++ b/device-types/Cisco/WS-C2960XR-24TS-I.yaml
@@ -1,6 +1,6 @@
 ---
 manufacturer: Cisco
-model: Catalyst 2960XR-48TS-I
+model: Catalyst 2960XR-24TS-I
 slug: cisco-ws-c2960xr-24ts-i
 part_number: WS-C2960XR-24TS-I
 is_full_depth: false
@@ -11,10 +11,10 @@ console-ports:
   - name: con 0
     type: rj-45
 module-bays:
-  - name: PSU1
-    position: 1A
-  - name: PSU2
-    position: 1B
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
 interfaces:
   - name: FastEthernet0
     type: 100base-tx
diff --git a/module-types/Cisco/PWR-C1-350WAC-P.yaml b/module-types/Cisco/PWR-C1-350WAC-P.yaml
new file mode 100644
index 000000000..e96a128a9
--- /dev/null
+++ b/module-types/Cisco/PWR-C1-350WAC-P.yaml
@@ -0,0 +1,8 @@
+---
+manufacturer: Cisco
+model: PWR-C1-350WAC-P
+part_number: PWR-C1-350WAC-P
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 350