From b7a8fa7a7b237b6fe15c2254efe29029621c0833 Mon Sep 17 00:00:00 2001
From: squintfox <55590532+squintfox@users.noreply.github.com>
Date: Wed, 15 Feb 2023 17:29:35 -0500
Subject: [PATCH] Update meraki ports (#1116)

* Update Meraki power/mgmt ports

* Update Meraki module to C16

* Update connector name

* Update for modular PSUs and connector name

---------

Co-authored-by: Robert Spadaro <squintfox@users.noreply.github.com>
Co-authored-by: Daniel W. Anner <daniel.anner@danstechsupport.com>
---
 device-types/Cisco/Meraki-MS225-48LP.yaml    |  5 +++++
 device-types/Cisco/Meraki-MS425-32.yaml      | 16 ++++++++--------
 module-types/Cisco/Meraki-MA-PWR-250WAC.yaml |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/device-types/Cisco/Meraki-MS225-48LP.yaml b/device-types/Cisco/Meraki-MS225-48LP.yaml
index 68fb658fa..cee77b895 100644
--- a/device-types/Cisco/Meraki-MS225-48LP.yaml
+++ b/device-types/Cisco/Meraki-MS225-48LP.yaml
@@ -5,11 +5,16 @@ slug: ms225-48lp
 part_number: MS225-48LP-HW
 u_height: 1
 is_full_depth: false
+comments: '[MS225 Overview and Specifications](https://meraki.cisco.com/lib/pdf/meraki_datasheet_ms225.pdf)'
 power-ports:
   - name: Slot 1
     type: iec-60320-c14
     maximum_draw: 490
     allocated_draw: 53
+  - name: RPS Connector
+    type: dc-terminal
+    maximum_draw: 490
+    allocated_draw: 53
 interfaces:
   - name: Management
     type: 1000base-t
diff --git a/device-types/Cisco/Meraki-MS425-32.yaml b/device-types/Cisco/Meraki-MS425-32.yaml
index e6e5ddfd2..f50a81e08 100644
--- a/device-types/Cisco/Meraki-MS425-32.yaml
+++ b/device-types/Cisco/Meraki-MS425-32.yaml
@@ -6,14 +6,11 @@ part_number: MS425-32-HW
 u_height: 1
 is_full_depth: true
 comments: '[MS425-32 Overview and Specifications](https://documentation.meraki.com/MS/MS_Overview_and_Specifications/MS425_Overview_and_Specifications)'
-console-ports:
-  - name: Management
-    type: rj-45
-power-ports:
-  - name: Slot 1
-    type: iec-60320-c14
-  - name: Slot 2
-    type: iec-60320-c14
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
 interfaces:
   - name: Port 1
     type: 10gbase-x-sfpp
@@ -83,3 +80,6 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: Port 34
     type: 40gbase-x-qsfpp
+  - name: Management
+    type: 1000base-t
+    mgmt_only: true
diff --git a/module-types/Cisco/Meraki-MA-PWR-250WAC.yaml b/module-types/Cisco/Meraki-MA-PWR-250WAC.yaml
index f9a3b5647..692eed35d 100644
--- a/module-types/Cisco/Meraki-MA-PWR-250WAC.yaml
+++ b/module-types/Cisco/Meraki-MA-PWR-250WAC.yaml
@@ -5,5 +5,5 @@ part_number: MA-PWR-250WAC
 comments: '[250W power supply unit product information](https://meraki.cisco.com/product/security-sd-wan/appliances-accessories/ma-pwr-250wac/)'
 power-ports:
   - name: PSU{module}
-    type: iec-60320-c14
+    type: iec-60320-c16
     maximum_draw: 250