From 3e1883f8a9987b2f11bceeb7bc540c41e4138a06 Mon Sep 17 00:00:00 2001
From: Aaron Axvig <aaron@axvigs.com>
Date: Thu, 23 Jan 2025 01:48:54 -0600
Subject: [PATCH] APC interface and module bay fixes (#2671)

* There is no ethernet on the device itself

* Set SmartSlot module bay positions

* Fix quotes

* Fix more interface and SmartSlot values
---
 device-types/APC/SMC3000RMI2U.yml     | 2 +-
 device-types/APC/SMT1000.yaml         | 1 +
 device-types/APC/SMT1500.yaml         | 2 +-
 device-types/APC/SMT1500RM2U.yaml     | 2 +-
 device-types/APC/SMT1500RM2UC.yaml    | 2 +-
 device-types/APC/SMT1500RMI2U.yaml    | 1 +
 device-types/APC/SMT1500RMI2UC.yaml   | 3 ++-
 device-types/APC/SMT1500RMI2UNC.yaml  | 5 +----
 device-types/APC/SMT2200RM2UNC.yaml   | 5 +----
 device-types/APC/SMT2200RMI2UNC.yaml  | 5 +----
 device-types/APC/SMT3000RMI2U.yaml    | 5 +----
 device-types/APC/SMT3000RMI2UC.yaml   | 3 ++-
 device-types/APC/SMT3000RMI2UNC.yaml  | 5 +----
 device-types/APC/SMT750IC.yaml        | 3 ++-
 device-types/APC/SMX1000I.yaml        | 7 +++----
 device-types/APC/SMX1500RMI2U.yaml    | 5 +----
 device-types/APC/SMX2200HV.yaml       | 1 +
 device-types/APC/SMX3000HVNC.yaml     | 1 +
 device-types/APC/SMX3000RMHV2UNC.yaml | 1 +
 device-types/APC/SMX3000RMLV2U.yaml   | 1 +
 device-types/APC/SRT1000UXI-NCLI.yaml | 6 +-----
 device-types/APC/SRT1500RMXLI-NC.yaml | 6 +-----
 device-types/APC/SRT1500UXI-NCLI.yaml | 6 +-----
 device-types/APC/SRT2200RMXLI-NC.yaml | 6 +-----
 device-types/APC/SRT3000RMXLT.yaml    | 2 +-
 device-types/APC/SRT3000UXI-NCLI.yaml | 6 +-----
 device-types/APC/SRT5KRMXLI.yaml      | 3 +++
 device-types/APC/SRT5KRMXLT-IEC.yaml  | 3 +++
 device-types/APC/SRT5KRMXLT.yaml      | 2 +-
 device-types/APC/SRT5KRMXLW-HW.yaml   | 3 +++
 device-types/APC/SRT5KXLJ.yaml        | 3 +++
 device-types/APC/SUA1500RMI2U.yaml    | 1 +
 device-types/APC/SURT2000RMXLI.yaml   | 7 +++----
 device-types/APC/SURT20KRMXLT.yaml    | 1 +
 device-types/APC/SURTD3000XLI.yml     | 2 +-
 device-types/APC/SURTD5000XLI.yml     | 2 +-
 36 files changed, 51 insertions(+), 68 deletions(-)

diff --git a/device-types/APC/SMC3000RMI2U.yml b/device-types/APC/SMC3000RMI2U.yml
index 7e33d1e00..56af7ccb5 100644
--- a/device-types/APC/SMC3000RMI2U.yml
+++ b/device-types/APC/SMC3000RMI2U.yml
@@ -48,4 +48,4 @@ power-outlets:
     power_port: Inlet
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot
diff --git a/device-types/APC/SMT1000.yaml b/device-types/APC/SMT1000.yaml
index 7c1e529ba..b7627b41e 100644
--- a/device-types/APC/SMT1000.yaml
+++ b/device-types/APC/SMT1000.yaml
@@ -30,3 +30,4 @@ power-outlets:
     type: nema-5-15r
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMT1500.yaml b/device-types/APC/SMT1500.yaml
index f0ac06c00..cb9ccea52 100644
--- a/device-types/APC/SMT1500.yaml
+++ b/device-types/APC/SMT1500.yaml
@@ -32,4 +32,4 @@ power-outlets:
     type: nema-5-15r
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot
diff --git a/device-types/APC/SMT1500RM2U.yaml b/device-types/APC/SMT1500RM2U.yaml
index e1dd8e830..c69812a90 100644
--- a/device-types/APC/SMT1500RM2U.yaml
+++ b/device-types/APC/SMT1500RM2U.yaml
@@ -28,4 +28,4 @@ power-outlets:
     type: nema-5-15r
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot
diff --git a/device-types/APC/SMT1500RM2UC.yaml b/device-types/APC/SMT1500RM2UC.yaml
index 37e69799a..bf8a6b453 100644
--- a/device-types/APC/SMT1500RM2UC.yaml
+++ b/device-types/APC/SMT1500RM2UC.yaml
@@ -27,6 +27,6 @@ power-outlets:
   - name: Group 2 Outlet 3
     type: nema-5-15r
 interfaces:
-  - name: Ethernet
+  - name: SmartConnect
     type: 1000base-t
     mgmt_only: true
diff --git a/device-types/APC/SMT1500RMI2U.yaml b/device-types/APC/SMT1500RMI2U.yaml
index 25dc8d359..c5b2db825 100644
--- a/device-types/APC/SMT1500RMI2U.yaml
+++ b/device-types/APC/SMT1500RMI2U.yaml
@@ -31,3 +31,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMT1500RMI2UC.yaml b/device-types/APC/SMT1500RMI2UC.yaml
index 77b50e166..b113ffd11 100644
--- a/device-types/APC/SMT1500RMI2UC.yaml
+++ b/device-types/APC/SMT1500RMI2UC.yaml
@@ -34,8 +34,9 @@ power-outlets:
     type: iec-60320-c13
     power_port: Source
 interfaces:
-  - name: Ethernet
+  - name: SmartConnect
     type: 1000base-t
     mgmt_only: true
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMT1500RMI2UNC.yaml b/device-types/APC/SMT1500RMI2UNC.yaml
index e55baf224..0a6f598b8 100644
--- a/device-types/APC/SMT1500RMI2UNC.yaml
+++ b/device-types/APC/SMT1500RMI2UNC.yaml
@@ -31,7 +31,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
+    position: SmartSlot
diff --git a/device-types/APC/SMT2200RM2UNC.yaml b/device-types/APC/SMT2200RM2UNC.yaml
index 4ae6ebd83..920af72c7 100644
--- a/device-types/APC/SMT2200RM2UNC.yaml
+++ b/device-types/APC/SMT2200RM2UNC.yaml
@@ -46,7 +46,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
+    position: SmartSlot
diff --git a/device-types/APC/SMT2200RMI2UNC.yaml b/device-types/APC/SMT2200RMI2UNC.yaml
index ab6652e62..a597102d2 100644
--- a/device-types/APC/SMT2200RMI2UNC.yaml
+++ b/device-types/APC/SMT2200RMI2UNC.yaml
@@ -45,7 +45,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
+    position: SmartSlot
diff --git a/device-types/APC/SMT3000RMI2U.yaml b/device-types/APC/SMT3000RMI2U.yaml
index aa77282a2..e53559ae8 100644
--- a/device-types/APC/SMT3000RMI2U.yaml
+++ b/device-types/APC/SMT3000RMI2U.yaml
@@ -44,9 +44,6 @@ power-outlets:
   - name: Group 3 Outlet 1
     type: iec-60320-c19
     power_port: Source
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMT3000RMI2UC.yaml b/device-types/APC/SMT3000RMI2UC.yaml
index 4be84de48..e7bd1e35d 100644
--- a/device-types/APC/SMT3000RMI2UC.yaml
+++ b/device-types/APC/SMT3000RMI2UC.yaml
@@ -47,8 +47,9 @@ power-outlets:
     type: iec-60320-c19
     power_port: Source
 interfaces:
-  - name: Ethernet
+  - name: SmartConnect
     type: 1000base-t
     mgmt_only: true
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMT3000RMI2UNC.yaml b/device-types/APC/SMT3000RMI2UNC.yaml
index d653d9942..e12564965 100644
--- a/device-types/APC/SMT3000RMI2UNC.yaml
+++ b/device-types/APC/SMT3000RMI2UNC.yaml
@@ -44,9 +44,6 @@ power-outlets:
   - name: Group 3 Outlet 1
     type: iec-60320-c19
     power_port: Source
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMT750IC.yaml b/device-types/APC/SMT750IC.yaml
index df83101e6..8120839f7 100644
--- a/device-types/APC/SMT750IC.yaml
+++ b/device-types/APC/SMT750IC.yaml
@@ -31,5 +31,6 @@ console-ports:
   - name: Serial
     type: rj-45
 interfaces:
-  - name: Network
+  - name: SmartConnect
     type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/APC/SMX1000I.yaml b/device-types/APC/SMX1000I.yaml
index d72f7c36d..a6bcd20c9 100644
--- a/device-types/APC/SMX1000I.yaml
+++ b/device-types/APC/SMX1000I.yaml
@@ -26,7 +26,6 @@ power-outlets:
     type: nema-5-15r
   - name: Group 2 Outlet 3
     type: nema-5-15r
-interfaces:
-  - name: Ethernet
-    type: 100base-tx
-    mgmt_only: true
+module-bays:
+  - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMX1500RMI2U.yaml b/device-types/APC/SMX1500RMI2U.yaml
index 2dfe67fa9..4a856732d 100644
--- a/device-types/APC/SMX1500RMI2U.yaml
+++ b/device-types/APC/SMX1500RMI2U.yaml
@@ -31,9 +31,6 @@ power-outlets:
     type: iec-60320-c19
   - name: Group 2 Outlet 4
     type: iec-60320-c13
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMX2200HV.yaml b/device-types/APC/SMX2200HV.yaml
index 7cd743faf..ca1c2644e 100644
--- a/device-types/APC/SMX2200HV.yaml
+++ b/device-types/APC/SMX2200HV.yaml
@@ -40,3 +40,4 @@ power-outlets:
     type: iec-60320-c19
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMX3000HVNC.yaml b/device-types/APC/SMX3000HVNC.yaml
index 14704e008..690cf77d1 100644
--- a/device-types/APC/SMX3000HVNC.yaml
+++ b/device-types/APC/SMX3000HVNC.yaml
@@ -39,3 +39,4 @@ power-outlets:
     type: iec-60320-c19
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMX3000RMHV2UNC.yaml b/device-types/APC/SMX3000RMHV2UNC.yaml
index 05a76403a..e709b85b6 100644
--- a/device-types/APC/SMX3000RMHV2UNC.yaml
+++ b/device-types/APC/SMX3000RMHV2UNC.yaml
@@ -35,3 +35,4 @@ power-outlets:
     type: iec-60320-c19
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SMX3000RMLV2U.yaml b/device-types/APC/SMX3000RMLV2U.yaml
index 4a10bcfdb..f684b12da 100644
--- a/device-types/APC/SMX3000RMLV2U.yaml
+++ b/device-types/APC/SMX3000RMLV2U.yaml
@@ -44,3 +44,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SRT1000UXI-NCLI.yaml b/device-types/APC/SRT1000UXI-NCLI.yaml
index 06034939c..043b0e91f 100644
--- a/device-types/APC/SRT1000UXI-NCLI.yaml
+++ b/device-types/APC/SRT1000UXI-NCLI.yaml
@@ -35,8 +35,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-    position: Rear
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
+    position: SmartSlot
diff --git a/device-types/APC/SRT1500RMXLI-NC.yaml b/device-types/APC/SRT1500RMXLI-NC.yaml
index 73a3c9d83..7fddfc7d6 100644
--- a/device-types/APC/SRT1500RMXLI-NC.yaml
+++ b/device-types/APC/SRT1500RMXLI-NC.yaml
@@ -35,8 +35,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-    position: Rear
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
+    position: SmartSlot
diff --git a/device-types/APC/SRT1500UXI-NCLI.yaml b/device-types/APC/SRT1500UXI-NCLI.yaml
index 158e66e76..fe15ea0d0 100644
--- a/device-types/APC/SRT1500UXI-NCLI.yaml
+++ b/device-types/APC/SRT1500UXI-NCLI.yaml
@@ -41,8 +41,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-    position: Rear
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
+    position: SmartSlot
diff --git a/device-types/APC/SRT2200RMXLI-NC.yaml b/device-types/APC/SRT2200RMXLI-NC.yaml
index ee2245974..000bddcca 100644
--- a/device-types/APC/SRT2200RMXLI-NC.yaml
+++ b/device-types/APC/SRT2200RMXLI-NC.yaml
@@ -45,10 +45,6 @@ power-outlets:
   - name: 16A Outlet 2
     type: iec-60320-c19
     power_port: Inlet
-interfaces:
-  - name: Ethernet
-    type: 100base-tx
-    mgmt_only: true
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot
diff --git a/device-types/APC/SRT3000RMXLT.yaml b/device-types/APC/SRT3000RMXLT.yaml
index 1443c4d07..2922d5804 100644
--- a/device-types/APC/SRT3000RMXLT.yaml
+++ b/device-types/APC/SRT3000RMXLT.yaml
@@ -24,4 +24,4 @@ power-outlets:
     type: nema-l6-20r
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot
diff --git a/device-types/APC/SRT3000UXI-NCLI.yaml b/device-types/APC/SRT3000UXI-NCLI.yaml
index 2450846e6..216071a82 100644
--- a/device-types/APC/SRT3000UXI-NCLI.yaml
+++ b/device-types/APC/SRT3000UXI-NCLI.yaml
@@ -41,8 +41,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-    position: Rear
-interfaces:
-  - name: Ethernet
-    type: 1000base-t
-    mgmt_only: true
+    position: SmartSlot
diff --git a/device-types/APC/SRT5KRMXLI.yaml b/device-types/APC/SRT5KRMXLI.yaml
index 25b20543b..17a8997ae 100644
--- a/device-types/APC/SRT5KRMXLI.yaml
+++ b/device-types/APC/SRT5KRMXLI.yaml
@@ -37,3 +37,6 @@ interfaces:
   - name: Ethernet
     type: 100base-tx
     mgmt_only: true
+module-bays:
+  - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SRT5KRMXLT-IEC.yaml b/device-types/APC/SRT5KRMXLT-IEC.yaml
index c09599bf1..1c2c76e5f 100644
--- a/device-types/APC/SRT5KRMXLT-IEC.yaml
+++ b/device-types/APC/SRT5KRMXLT-IEC.yaml
@@ -40,3 +40,6 @@ interfaces:
   - name: Ethernet
     type: 100base-tx
     mgmt_only: true
+module-bays:
+  - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SRT5KRMXLT.yaml b/device-types/APC/SRT5KRMXLT.yaml
index ebe2c1ebb..3b634b86f 100644
--- a/device-types/APC/SRT5KRMXLT.yaml
+++ b/device-types/APC/SRT5KRMXLT.yaml
@@ -29,7 +29,7 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot
 interfaces:
   - name: Ethernet
     type: 100base-tx
diff --git a/device-types/APC/SRT5KRMXLW-HW.yaml b/device-types/APC/SRT5KRMXLW-HW.yaml
index 078d77937..2a27817c3 100644
--- a/device-types/APC/SRT5KRMXLW-HW.yaml
+++ b/device-types/APC/SRT5KRMXLW-HW.yaml
@@ -16,3 +16,6 @@ interfaces:
   - name: Ethernet
     type: 100base-tx
     mgmt_only: true
+module-bays:
+  - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SRT5KXLJ.yaml b/device-types/APC/SRT5KXLJ.yaml
index 783a6968c..e47279ac4 100644
--- a/device-types/APC/SRT5KXLJ.yaml
+++ b/device-types/APC/SRT5KXLJ.yaml
@@ -29,3 +29,6 @@ interfaces:
   - name: Ethernet
     type: 100base-tx
     mgmt_only: true
+module-bays:
+  - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SUA1500RMI2U.yaml b/device-types/APC/SUA1500RMI2U.yaml
index 5099a7f01..d89cfff13 100644
--- a/device-types/APC/SUA1500RMI2U.yaml
+++ b/device-types/APC/SUA1500RMI2U.yaml
@@ -31,3 +31,4 @@ power-outlets:
     power_port: Source
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SURT2000RMXLI.yaml b/device-types/APC/SURT2000RMXLI.yaml
index aae82a028..4bfb41608 100644
--- a/device-types/APC/SURT2000RMXLI.yaml
+++ b/device-types/APC/SURT2000RMXLI.yaml
@@ -30,7 +30,6 @@ power-outlets:
   - name: Outlet 6
     type: iec-60320-c13
     power_port: Inlet
-interfaces:
-  - name: Ethernet
-    type: 100base-tx
-    mgmt_only: true
+module-bays:
+  - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SURT20KRMXLT.yaml b/device-types/APC/SURT20KRMXLT.yaml
index f8a484628..b78172717 100644
--- a/device-types/APC/SURT20KRMXLT.yaml
+++ b/device-types/APC/SURT20KRMXLT.yaml
@@ -32,3 +32,4 @@ power-outlets:
     type: nema-l6-20r
 module-bays:
   - name: SmartSlot
+    position: SmartSlot
diff --git a/device-types/APC/SURTD3000XLI.yml b/device-types/APC/SURTD3000XLI.yml
index d37984fda..6906db08f 100644
--- a/device-types/APC/SURTD3000XLI.yml
+++ b/device-types/APC/SURTD3000XLI.yml
@@ -49,4 +49,4 @@ power-outlets:
     power_port: Inlet
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot
diff --git a/device-types/APC/SURTD5000XLI.yml b/device-types/APC/SURTD5000XLI.yml
index a9fcd6ddc..de2974bb5 100644
--- a/device-types/APC/SURTD5000XLI.yml
+++ b/device-types/APC/SURTD5000XLI.yml
@@ -49,4 +49,4 @@ power-outlets:
     power_port: Inlet
 module-bays:
   - name: SmartSlot
-    position: Rear
+    position: SmartSlot