From bcdc53d8d8475835dba3260846a81d75361ae3bf Mon Sep 17 00:00:00 2001
From: ryanmerolle <ryan.merolle@gmail.com>
Date: Tue, 31 Mar 2020 12:46:23 -0400
Subject: [PATCH] Opengear corrections and updates

---
 device-types/Opengear/CM7116-2-DAC-US.yaml    |  51 ++--
 device-types/Opengear/CM7116-2-SAC-US.yaml    |  86 +++----
 ...CM7132-2-DAC.yaml => CM7132-2-DAC-US.yaml} |  82 +++----
 device-types/Opengear/CM7148-2-DAC-US.yaml    | 114 ++++-----
 device-types/Opengear/CM7148-2-SAC-US.yaml    | 214 ++++++++---------
 device-types/Opengear/CM7196-2-DAC-US.yaml    | 210 ++++++++---------
 ...IM7248-2-DAC.yaml => IM7248-2-DAC-US.yaml} | 217 +++++++++---------
 7 files changed, 500 insertions(+), 474 deletions(-)
 rename device-types/Opengear/{CM7132-2-DAC.yaml => CM7132-2-DAC-US.yaml} (59%)
 rename device-types/Opengear/{IM7248-2-DAC.yaml => IM7248-2-DAC-US.yaml} (54%)

diff --git a/device-types/Opengear/CM7116-2-DAC-US.yaml b/device-types/Opengear/CM7116-2-DAC-US.yaml
index a3a2e1d6..605f8f1c 100644
--- a/device-types/Opengear/CM7116-2-DAC-US.yaml
+++ b/device-types/Opengear/CM7116-2-DAC-US.yaml
@@ -1,49 +1,45 @@
 manufacturer: Opengear
 model: CM7116-2-DAC-US
 slug: cm7116-2-dac-us
+part_number: CM7116-2-DAC-US
 u_height: 1
-interfaces:
-# physical interface labels seem different than config labels
-  - name: lan
-    type: 1000base-t
-    mgmt_only: true
-  - name: wan
-    type: 1000base-t
+is_full_depth: false
+comments: 'CM7116 with built-in Dual Power Supplies'
 console-ports:
   - name: Console
     type: rj-45
 console-server-ports:
-  - name: port1
+  - name: Port 1
     type: rj-45
-  - name: port2
+  - name: Port 2
     type: rj-45
-  - name: port3
+  - name: Port 3
     type: rj-45
-  - name: port4
+  - name: Port 4
     type: rj-45
-  - name: port5
+  - name: Port 5
     type: rj-45
-  - name: port6
+  - name: Port 6
     type: rj-45
-  - name: port7
+  - name: Port 7
     type: rj-45
-  - name: port8
+  - name: Port 8
     type: rj-45
-  - name: port9
+  - name: Port 9
     type: rj-45
-  - name: port10
+  - name: Port 10
     type: rj-45
-  - name: port11
+  - name: Port 11
     type: rj-45
-  - name: port12
+  - name: Port 12
     type: rj-45
-  - name: port13
+  - name: Port 13
     type: rj-45
-  - name: port14
+  - name: Port 14
     type: rj-45
-  - name: port15
+  - name: Port 15
     type: rj-45
-  - name: port16
+  - name: Port 16
     type: rj-45
 power-ports:
   - name: PS1
@@ -53,4 +49,11 @@ power-ports:
   - name: PS2
     type: iec-60320-c14
     maximum_draw: 25
-    allocated_draw: 20
+interfaces:
+# physical interface labels seem different than config labels
+  - name: lan
+    type: 1000base-t
+    mgmt_only: true
+  - name: wan
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Opengear/CM7116-2-SAC-US.yaml b/device-types/Opengear/CM7116-2-SAC-US.yaml
index f57f00d0..c9993c2f 100644
--- a/device-types/Opengear/CM7116-2-SAC-US.yaml
+++ b/device-types/Opengear/CM7116-2-SAC-US.yaml
@@ -1,7 +1,51 @@
 manufacturer: Opengear
 model: CM7116-2-SAC-US
 slug: cm7116-2-sac-us
+part_number: CM7116-2-SAC-US
 u_height: 1
+is_full_depth: false
+comments: 'CM7116 with built-in Single Power Supply'
+console-ports:
+  - name: Console
+    type: rj-45
+console-server-ports:
+  - name: Port 1
+    type: rj-45
+  - name: Port 2
+    type: rj-45
+  - name: Port 3
+    type: rj-45
+  - name: Port 4
+    type: rj-45
+  - name: Port 5
+    type: rj-45
+  - name: Port 6
+    type: rj-45
+  - name: Port 7
+    type: rj-45
+  - name: Port 8
+    type: rj-45
+  - name: Port 9
+    type: rj-45
+  - name: Port 10
+    type: rj-45
+  - name: Port 11
+    type: rj-45
+  - name: Port 12
+    type: rj-45
+  - name: Port 13
+    type: rj-45
+  - name: Port 14
+    type: rj-45
+  - name: Port 15
+    type: rj-45
+  - name: Port 16
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 25
+    allocated_draw: 20
 interfaces:
 # physical interface labels seem different than config labels
   - name: lan
@@ -9,44 +53,4 @@ interfaces:
     mgmt_only: true
   - name: wan
     type: 1000base-t
-console-ports:
-  - name: Console
-    type: rj-45
-console-server-ports:
-  - name: port1
-    type: rj-45
-  - name: port2
-    type: rj-45
-  - name: port3
-    type: rj-45
-  - name: port4
-    type: rj-45
-  - name: port5
-    type: rj-45
-  - name: port6
-    type: rj-45
-  - name: port7
-    type: rj-45
-  - name: port8
-    type: rj-45
-  - name: port9
-    type: rj-45
-  - name: port10
-    type: rj-45
-  - name: port11
-    type: rj-45
-  - name: port12
-    type: rj-45
-  - name: port13
-    type: rj-45
-  - name: port14
-    type: rj-45
-  - name: port15
-    type: rj-45
-  - name: port16
-    type: rj-45
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 25
-    allocated_draw: 20
+    mgmt_only: true
diff --git a/device-types/Opengear/CM7132-2-DAC.yaml b/device-types/Opengear/CM7132-2-DAC-US.yaml
similarity index 59%
rename from device-types/Opengear/CM7132-2-DAC.yaml
rename to device-types/Opengear/CM7132-2-DAC-US.yaml
index 2d066317..ffe7c234 100644
--- a/device-types/Opengear/CM7132-2-DAC.yaml
+++ b/device-types/Opengear/CM7132-2-DAC-US.yaml
@@ -1,81 +1,77 @@
 manufacturer: Opengear
 model: CM7132-2-DAC-US
 slug: cm7132-2-dac-us
+part_number: CM7132-2-DAC-US
 u_height: 1
-interfaces:
-# physical interface labels seem different than config labels
-  - name: lan
-    type: 1000base-t
-    mgmt_only: true
-  - name: wan
-    type: 1000base-t
+is_full_depth: false
+comments: 'CM7132 with built-in Dual Power Supplies'
 console-ports:
   - name: Console
     type: rj-45
 console-server-ports:
-  - name: port1
+  - name: Port 1
     type: rj-45
-  - name: port2
+  - name: Port 2
     type: rj-45
-  - name: port3
+  - name: Port 3
     type: rj-45
-  - name: port4
+  - name: Port 4
     type: rj-45
-  - name: port5
+  - name: Port 5
     type: rj-45
-  - name: port6
+  - name: Port 6
     type: rj-45
-  - name: port7
+  - name: Port 7
     type: rj-45
-  - name: port8
+  - name: Port 8
     type: rj-45
-  - name: port9
+  - name: Port 9
     type: rj-45
-  - name: port10
+  - name: Port 10
     type: rj-45
-  - name: port11
+  - name: Port 11
     type: rj-45
-  - name: port12
+  - name: Port 12
     type: rj-45
-  - name: port13
+  - name: Port 13
     type: rj-45
-  - name: port14
+  - name: Port 14
     type: rj-45
-  - name: port15
+  - name: Port 15
     type: rj-45
-  - name: port16
+  - name: Port 16
     type: rj-45
-  - name: port17
+  - name: Port 17
     type: rj-45
-  - name: port18
+  - name: Port 18
     type: rj-45
-  - name: port19
+  - name: Port 19
     type: rj-45
-  - name: port20
+  - name: Port 20
     type: rj-45
-  - name: port21
+  - name: Port 21
     type: rj-45
-  - name: port22
+  - name: Port 22
     type: rj-45
-  - name: port23
+  - name: Port 23
     type: rj-45
-  - name: port24
+  - name: Port 24
     type: rj-45
-  - name: port25
+  - name: Port 25
     type: rj-45
-  - name: port26
+  - name: Port 26
     type: rj-45
-  - name: port27
+  - name: Port 27
     type: rj-45
-  - name: port28
+  - name: Port 28
     type: rj-45
-  - name: port29
+  - name: Port 29
     type: rj-45
-  - name: port30
+  - name: Port 30
     type: rj-45
-  - name: port31
+  - name: Port 31
     type: rj-45
-  - name: port32
+  - name: Port 32
     type: rj-45
 power-ports:
   - name: PS1
@@ -86,3 +82,11 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 25
     allocated_draw: 20
+interfaces:
+# physical interface labels seem different than config labels
+  - name: lan
+    type: 1000base-t
+    mgmt_only: true
+  - name: wan
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Opengear/CM7148-2-DAC-US.yaml b/device-types/Opengear/CM7148-2-DAC-US.yaml
index db14c352..63d1e5f0 100644
--- a/device-types/Opengear/CM7148-2-DAC-US.yaml
+++ b/device-types/Opengear/CM7148-2-DAC-US.yaml
@@ -1,113 +1,109 @@
 manufacturer: Opengear
 model: CM7148-2-DAC-US
 slug: cm7148-2-dac-us
+part_number: CM7148-2-DAC-US
 u_height: 1
-interfaces:
-# physical interface labels seem different than config labels
-  - name: lan
-    type: 1000base-t
-    mgmt_only: true
-  - name: wan
-    type: 1000base-t
+is_full_depth: false
+comments: 'CM7148 with built-in Dual Power Supplies'
 console-ports:
   - name: Console
     type: rj-45
 console-server-ports:
-  - name: port1
+  - name: Port 1
     type: rj-45
-  - name: port2
+  - name: Port 2
     type: rj-45
-  - name: port3
+  - name: Port 3
     type: rj-45
-  - name: port4
+  - name: Port 4
     type: rj-45
-  - name: port5
+  - name: Port 5
     type: rj-45
-  - name: port6
+  - name: Port 6
     type: rj-45
-  - name: port7
+  - name: Port 7
     type: rj-45
-  - name: port8
+  - name: Port 8
     type: rj-45
-  - name: port9
+  - name: Port 9
     type: rj-45
-  - name: port10
+  - name: Port 10
     type: rj-45
-  - name: port11
+  - name: Port 11
     type: rj-45
-  - name: port12
+  - name: Port 12
     type: rj-45
-  - name: port13
+  - name: Port 13
     type: rj-45
-  - name: port14
+  - name: Port 14
     type: rj-45
-  - name: port15
+  - name: Port 15
     type: rj-45
-  - name: port16
+  - name: Port 16
     type: rj-45
-  - name: port17
+  - name: Port 17
     type: rj-45
-  - name: port18
+  - name: Port 18
     type: rj-45
-  - name: port19
+  - name: Port 19
     type: rj-45
-  - name: port20
+  - name: Port 20
     type: rj-45
-  - name: port21
+  - name: Port 21
     type: rj-45
-  - name: port22
+  - name: Port 22
     type: rj-45
-  - name: port23
+  - name: Port 23
     type: rj-45
-  - name: port24
+  - name: Port 24
     type: rj-45
-  - name: port25
+  - name: Port 25
     type: rj-45
-  - name: port26
+  - name: Port 26
     type: rj-45
-  - name: port27
+  - name: Port 27
     type: rj-45
-  - name: port28
+  - name: Port 28
     type: rj-45
-  - name: port29
+  - name: Port 29
     type: rj-45
-  - name: port30
+  - name: Port 30
     type: rj-45
-  - name: port31
+  - name: Port 31
     type: rj-45
-  - name: port32
+  - name: Port 32
     type: rj-45
-  - name: port33
+  - name: Port 33
     type: rj-45
-  - name: port34
+  - name: Port 34
     type: rj-45
-  - name: port35
+  - name: Port 35
     type: rj-45
-  - name: port36
+  - name: Port 36
     type: rj-45
-  - name: port37
+  - name: Port 37
     type: rj-45
-  - name: port38
+  - name: Port 38
     type: rj-45
-  - name: port39
+  - name: Port 39
     type: rj-45
-  - name: port40
+  - name: Port 40
     type: rj-45
-  - name: port41
+  - name: Port 41
     type: rj-45
-  - name: port42
+  - name: Port 42
     type: rj-45
-  - name: port43
+  - name: Port 43
     type: rj-45
-  - name: port47
+  - name: Port 47
     type: rj-45
-  - name: port45
+  - name: Port 45
     type: rj-45
-  - name: port46
+  - name: Port 46
     type: rj-45
-  - name: port47
+  - name: Port 47
     type: rj-45
-  - name: port48
+  - name: Port 48
     type: rj-45
 power-ports:
   - name: PS1
@@ -118,3 +114,11 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 25
     allocated_draw: 20
+interfaces:
+# physical interface labels seem different than config labels
+  - name: lan
+    type: 1000base-t
+    mgmt_only: true
+  - name: wan
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Opengear/CM7148-2-SAC-US.yaml b/device-types/Opengear/CM7148-2-SAC-US.yaml
index bebc9401..5b292268 100644
--- a/device-types/Opengear/CM7148-2-SAC-US.yaml
+++ b/device-types/Opengear/CM7148-2-SAC-US.yaml
@@ -1,7 +1,115 @@
 manufacturer: Opengear
 model: CM7148-2-SAC-US
 slug: cm7148-2-sac-us
+part_number: CM7148-2-SAC-US
 u_height: 1
+is_full_depth: false
+comments: 'CM7148 with built-in Single Power Supply'
+console-ports:
+  - name: Console
+    type: rj-45
+console-server-ports:
+  - name: Port 1
+    type: rj-45
+  - name: Port 2
+    type: rj-45
+  - name: Port 3
+    type: rj-45
+  - name: Port 4
+    type: rj-45
+  - name: Port 5
+    type: rj-45
+  - name: Port 6
+    type: rj-45
+  - name: Port 7
+    type: rj-45
+  - name: Port 8
+    type: rj-45
+  - name: Port 9
+    type: rj-45
+  - name: Port 10
+    type: rj-45
+  - name: Port 11
+    type: rj-45
+  - name: Port 12
+    type: rj-45
+  - name: Port 13
+    type: rj-45
+  - name: Port 14
+    type: rj-45
+  - name: Port 15
+    type: rj-45
+  - name: Port 16
+    type: rj-45
+  - name: Port 17
+    type: rj-45
+  - name: Port 18
+    type: rj-45
+  - name: Port 19
+    type: rj-45
+  - name: Port 20
+    type: rj-45
+  - name: Port 21
+    type: rj-45
+  - name: Port 22
+    type: rj-45
+  - name: Port 23
+    type: rj-45
+  - name: Port 24
+    type: rj-45
+  - name: Port 25
+    type: rj-45
+  - name: Port 26
+    type: rj-45
+  - name: Port 27
+    type: rj-45
+  - name: Port 28
+    type: rj-45
+  - name: Port 29
+    type: rj-45
+  - name: Port 30
+    type: rj-45
+  - name: Port 31
+    type: rj-45
+  - name: Port 32
+    type: rj-45
+  - name: Port 33
+    type: rj-45
+  - name: Port 34
+    type: rj-45
+  - name: Port 35
+    type: rj-45
+  - name: Port 36
+    type: rj-45
+  - name: Port 37
+    type: rj-45
+  - name: Port 38
+    type: rj-45
+  - name: Port 39
+    type: rj-45
+  - name: Port 40
+    type: rj-45
+  - name: Port 41
+    type: rj-45
+  - name: Port 42
+    type: rj-45
+  - name: Port 43
+    type: rj-45
+  - name: Port 47
+    type: rj-45
+  - name: Port 45
+    type: rj-45
+  - name: Port 46
+    type: rj-45
+  - name: Port 47
+    type: rj-45
+  - name: Port 48
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 25
+    allocated_draw: 20
 interfaces:
 # physical interface labels seem different than config labels
   - name: lan
@@ -9,108 +117,4 @@ interfaces:
     mgmt_only: true
   - name: wan
     type: 1000base-t
-console-ports:
-  - name: Console
-    type: rj-45
-console-server-ports:
-  - name: port1
-    type: rj-45
-  - name: port2
-    type: rj-45
-  - name: port3
-    type: rj-45
-  - name: port4
-    type: rj-45
-  - name: port5
-    type: rj-45
-  - name: port6
-    type: rj-45
-  - name: port7
-    type: rj-45
-  - name: port8
-    type: rj-45
-  - name: port9
-    type: rj-45
-  - name: port10
-    type: rj-45
-  - name: port11
-    type: rj-45
-  - name: port12
-    type: rj-45
-  - name: port13
-    type: rj-45
-  - name: port14
-    type: rj-45
-  - name: port15
-    type: rj-45
-  - name: port16
-    type: rj-45
-  - name: port17
-    type: rj-45
-  - name: port18
-    type: rj-45
-  - name: port19
-    type: rj-45
-  - name: port20
-    type: rj-45
-  - name: port21
-    type: rj-45
-  - name: port22
-    type: rj-45
-  - name: port23
-    type: rj-45
-  - name: port24
-    type: rj-45
-  - name: port25
-    type: rj-45
-  - name: port26
-    type: rj-45
-  - name: port27
-    type: rj-45
-  - name: port28
-    type: rj-45
-  - name: port29
-    type: rj-45
-  - name: port30
-    type: rj-45
-  - name: port31
-    type: rj-45
-  - name: port32
-    type: rj-45
-  - name: port33
-    type: rj-45
-  - name: port34
-    type: rj-45
-  - name: port35
-    type: rj-45
-  - name: port36
-    type: rj-45
-  - name: port37
-    type: rj-45
-  - name: port38
-    type: rj-45
-  - name: port39
-    type: rj-45
-  - name: port40
-    type: rj-45
-  - name: port41
-    type: rj-45
-  - name: port42
-    type: rj-45
-  - name: port43
-    type: rj-45
-  - name: port47
-    type: rj-45
-  - name: port45
-    type: rj-45
-  - name: port46
-    type: rj-45
-  - name: port47
-    type: rj-45
-  - name: port48
-    type: rj-45
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-    maximum_draw: 25
-    allocated_draw: 20
+    mgmt_only: true
diff --git a/device-types/Opengear/CM7196-2-DAC-US.yaml b/device-types/Opengear/CM7196-2-DAC-US.yaml
index 3a93aebf..7e69462e 100644
--- a/device-types/Opengear/CM7196-2-DAC-US.yaml
+++ b/device-types/Opengear/CM7196-2-DAC-US.yaml
@@ -1,209 +1,205 @@
 manufacturer: Opengear
 model: CM7196-2-DAC-US
 slug: cm7196-2-dac-us
+part_number: CM7196-2-DAC-US
 u_height: 1
-interfaces:
-# physical interface labels seem different than config labels
-  - name: lan
-    type: 1000base-t
-    mgmt_only: true
-  - name: wan
-    type: 1000base-t
+is_full_depth: false
+comments: 'CM7196 with built-in Dual Power Supplies.  48 console ports on the front and 48 console ports on the back of the appliance.'
 console-ports:
   - name: Console
     type: rj-45
 console-server-ports:
-  - name: port1
+  - name: Port 1
     type: rj-45
-  - name: port2
+  - name: Port 2
     type: rj-45
-  - name: port3
+  - name: Port 3
     type: rj-45
-  - name: port4
+  - name: Port 4
     type: rj-45
-  - name: port5
+  - name: Port 5
     type: rj-45
-  - name: port6
+  - name: Port 6
     type: rj-45
-  - name: port7
+  - name: Port 7
     type: rj-45
-  - name: port8
+  - name: Port 8
     type: rj-45
-  - name: port9
+  - name: Port 9
     type: rj-45
-  - name: port10
+  - name: Port 10
     type: rj-45
-  - name: port11
+  - name: Port 11
     type: rj-45
-  - name: port12
+  - name: Port 12
     type: rj-45
-  - name: port13
+  - name: Port 13
     type: rj-45
-  - name: port14
+  - name: Port 14
     type: rj-45
-  - name: port15
+  - name: Port 15
     type: rj-45
-  - name: port16
+  - name: Port 16
     type: rj-45
-  - name: port17
+  - name: Port 17
     type: rj-45
-  - name: port18
+  - name: Port 18
     type: rj-45
-  - name: port19
+  - name: Port 19
     type: rj-45
-  - name: port20
+  - name: Port 20
     type: rj-45
-  - name: port21
+  - name: Port 21
     type: rj-45
-  - name: port22
+  - name: Port 22
     type: rj-45
-  - name: port23
+  - name: Port 23
     type: rj-45
-  - name: port24
+  - name: Port 24
     type: rj-45
-  - name: port25
+  - name: Port 25
     type: rj-45
-  - name: port26
+  - name: Port 26
     type: rj-45
-  - name: port27
+  - name: Port 27
     type: rj-45
-  - name: port28
+  - name: Port 28
     type: rj-45
-  - name: port29
+  - name: Port 29
     type: rj-45
-  - name: port30
+  - name: Port 30
     type: rj-45
-  - name: port31
+  - name: Port 31
     type: rj-45
-  - name: port32
+  - name: Port 32
     type: rj-45
-  - name: port33
+  - name: Port 33
     type: rj-45
-  - name: port34
+  - name: Port 34
     type: rj-45
-  - name: port35
+  - name: Port 35
     type: rj-45
-  - name: port36
+  - name: Port 36
     type: rj-45
-  - name: port37
+  - name: Port 37
     type: rj-45
-  - name: port38
+  - name: Port 38
     type: rj-45
-  - name: port39
+  - name: Port 39
     type: rj-45
-  - name: port40
+  - name: Port 40
     type: rj-45
-  - name: port41
+  - name: Port 41
     type: rj-45
-  - name: port42
+  - name: Port 42
     type: rj-45
-  - name: port43
+  - name: Port 43
     type: rj-45
-  - name: port44
+  - name: Port 44
     type: rj-45
-  - name: port45
+  - name: Port 45
     type: rj-45
-  - name: port46
+  - name: Port 46
     type: rj-45
-  - name: port47
+  - name: Port 47
     type: rj-45
-  - name: port48
+  - name: Port 48
     type: rj-45
-  - name: port49
+  - name: Port 49
     type: rj-45
-  - name: port50
+  - name: Port 50
     type: rj-45
-  - name: port51
+  - name: Port 51
     type: rj-45
-  - name: port52
+  - name: Port 52
     type: rj-45
-  - name: port53
+  - name: Port 53
     type: rj-45
-  - name: port54
+  - name: Port 54
     type: rj-45
-  - name: port55
+  - name: Port 55
     type: rj-45
-  - name: port56
+  - name: Port 56
     type: rj-45
-  - name: port57
+  - name: Port 57
     type: rj-45
-  - name: port58
+  - name: Port 58
     type: rj-45
-  - name: port59
+  - name: Port 59
     type: rj-45
-  - name: port60
+  - name: Port 60
     type: rj-45
-  - name: port61
+  - name: Port 61
     type: rj-45
-  - name: port62
+  - name: Port 62
     type: rj-45
-  - name: port63
+  - name: Port 63
     type: rj-45
-  - name: port64
+  - name: Port 64
     type: rj-45
-  - name: port65
+  - name: Port 65
     type: rj-45
-  - name: port66
+  - name: Port 66
     type: rj-45
-  - name: port67
+  - name: Port 67
     type: rj-45
-  - name: port68
+  - name: Port 68
     type: rj-45
-  - name: port69
+  - name: Port 69
     type: rj-45
-  - name: port70
+  - name: Port 70
     type: rj-45
-  - name: port71
+  - name: Port 71
     type: rj-45
-  - name: port72
+  - name: Port 72
     type: rj-45
-  - name: port73
+  - name: Port 73
     type: rj-45
-  - name: port74
+  - name: Port 74
     type: rj-45
-  - name: port75
+  - name: Port 75
     type: rj-45
-  - name: port76
+  - name: Port 76
     type: rj-45
-  - name: port77
+  - name: Port 77
     type: rj-45
-  - name: port78
+  - name: Port 78
     type: rj-45
-  - name: port79
+  - name: Port 79
     type: rj-45
-  - name: port80
+  - name: Port 80
     type: rj-45
-  - name: port81
+  - name: Port 81
     type: rj-45
-  - name: port82
+  - name: Port 82
     type: rj-45
-  - name: port83
+  - name: Port 83
     type: rj-45
-  - name: port84
+  - name: Port 84
     type: rj-45
-  - name: port85
+  - name: Port 85
     type: rj-45
-  - name: port86
+  - name: Port 86
     type: rj-45
-  - name: port87
+  - name: Port 87
     type: rj-45
-  - name: port88
+  - name: Port 88
     type: rj-45
-  - name: port89
+  - name: Port 89
     type: rj-45
-  - name: port90
+  - name: Port 90
     type: rj-45
-  - name: port91
+  - name: Port 91
     type: rj-45
-  - name: port92
+  - name: Port 92
     type: rj-45
-  - name: port93
+  - name: Port 93
     type: rj-45
-  - name: port94
+  - name: Port 94
     type: rj-45
-  - name: port95
+  - name: Port 95
     type: rj-45
-  - name: port96
+  - name: Port 96
     type: rj-45
 power-ports:
   - name: PS1
@@ -214,3 +210,11 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 25
     allocated_draw: 20
+interfaces:
+# physical interface labels seem different than config labels
+  - name: lan
+    type: 1000base-t
+    mgmt_only: true
+  - name: wan
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Opengear/IM7248-2-DAC.yaml b/device-types/Opengear/IM7248-2-DAC-US.yaml
similarity index 54%
rename from device-types/Opengear/IM7248-2-DAC.yaml
rename to device-types/Opengear/IM7248-2-DAC-US.yaml
index e11a38e0..b0c602c4 100644
--- a/device-types/Opengear/IM7248-2-DAC.yaml
+++ b/device-types/Opengear/IM7248-2-DAC-US.yaml
@@ -1,7 +1,115 @@
 manufacturer: Opengear
-model: IM7248-2-DAC
-slug: im7248-2-dac
+model: IM7248-2-DAC-US
+slug: im7248-2-dac-us
+part_number: IM7248-2-DAC-US
+u_height: 1
 is_full_depth: false
+comments: ''
+console-ports:
+  - name: Console
+    type: rj-45
+console-server-ports:
+  - name: Port 1
+    type: rj-45
+  - name: Port 2
+    type: rj-45
+  - name: Port 3
+    type: rj-45
+  - name: Port 4
+    type: rj-45
+  - name: Port 5
+    type: rj-45
+  - name: Port 6
+    type: rj-45
+  - name: Port 7
+    type: rj-45
+  - name: Port 8
+    type: rj-45
+  - name: Port 9
+    type: rj-45
+  - name: Port 10
+    type: rj-45
+  - name: Port 11
+    type: rj-45
+  - name: Port 12
+    type: rj-45
+  - name: Port 13
+    type: rj-45
+  - name: Port 14
+    type: rj-45
+  - name: Port 15
+    type: rj-45
+  - name: Port 16
+    type: rj-45
+  - name: Port 17
+    type: rj-45
+  - name: Port 18
+    type: rj-45
+  - name: Port 19
+    type: rj-45
+  - name: Port 20
+    type: rj-45
+  - name: Port 21
+    type: rj-45
+  - name: Port 22
+    type: rj-45
+  - name: Port 23
+    type: rj-45
+  - name: Port 24
+    type: rj-45
+  - name: Port 25
+    type: rj-45
+  - name: Port 26
+    type: rj-45
+  - name: Port 27
+    type: rj-45
+  - name: Port 28
+    type: rj-45
+  - name: Port 29
+    type: rj-45
+  - name: Port 30
+    type: rj-45
+  - name: Port 31
+    type: rj-45
+  - name: Port 32
+    type: rj-45
+  - name: Port 33
+    type: rj-45
+  - name: Port 34
+    type: rj-45
+  - name: Port 35
+    type: rj-45
+  - name: Port 36
+    type: rj-45
+  - name: Port 37
+    type: rj-45
+  - name: Port 38
+    type: rj-45
+  - name: Port 39
+    type: rj-45
+  - name: Port 40
+    type: rj-45
+  - name: Port 41
+    type: rj-45
+  - name: Port 42
+    type: rj-45
+  - name: Port 43
+    type: rj-45
+  - name: Port 47
+    type: rj-45
+  - name: Port 45
+    type: rj-45
+  - name: Port 46
+    type: rj-45
+  - name: Port 47
+    type: rj-45
+  - name: Port 48
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+  - name: PS2
+    type: iec-60320-c14
 interfaces:
   - name: eth0
     type: 1000base-t
@@ -12,108 +120,3 @@ interfaces:
   - name: wlan0
     type: ieee802.11n
     mgmt_only: true
-console-ports:
-  - name: Console
-    type: rj-45
-console-server-ports:
-  - name: port1
-    type: rj-45
-  - name: port2
-    type: rj-45
-  - name: port3
-    type: rj-45
-  - name: port4
-    type: rj-45
-  - name: port5
-    type: rj-45
-  - name: port6
-    type: rj-45
-  - name: port7
-    type: rj-45
-  - name: port8
-    type: rj-45
-  - name: port9
-    type: rj-45
-  - name: port10
-    type: rj-45
-  - name: port11
-    type: rj-45
-  - name: port12
-    type: rj-45
-  - name: port13
-    type: rj-45
-  - name: port14
-    type: rj-45
-  - name: port15
-    type: rj-45
-  - name: port16
-    type: rj-45
-  - name: port17
-    type: rj-45
-  - name: port18
-    type: rj-45
-  - name: port19
-    type: rj-45
-  - name: port20
-    type: rj-45
-  - name: port21
-    type: rj-45
-  - name: port22
-    type: rj-45
-  - name: port23
-    type: rj-45
-  - name: port24
-    type: rj-45
-  - name: port25
-    type: rj-45
-  - name: port26
-    type: rj-45
-  - name: port27
-    type: rj-45
-  - name: port28
-    type: rj-45
-  - name: port29
-    type: rj-45
-  - name: port30
-    type: rj-45
-  - name: port31
-    type: rj-45
-  - name: port32
-    type: rj-45
-  - name: port33
-    type: rj-45
-  - name: port34
-    type: rj-45
-  - name: port35
-    type: rj-45
-  - name: port36
-    type: rj-45
-  - name: port37
-    type: rj-45
-  - name: port38
-    type: rj-45
-  - name: port39
-    type: rj-45
-  - name: port40
-    type: rj-45
-  - name: port41
-    type: rj-45
-  - name: port42
-    type: rj-45
-  - name: port43
-    type: rj-45
-  - name: port47
-    type: rj-45
-  - name: port45
-    type: rj-45
-  - name: port46
-    type: rj-45
-  - name: port47
-    type: rj-45
-  - name: port48
-    type: rj-45
-power-ports:
-  - name: PS1
-    type: iec-60320-c14
-  - name: PS2
-    type: iec-60320-c14