diff --git a/device-types/HPE/Aruba-ec-m-b-gen2.yaml b/device-types/HPE/Aruba-ec-m-b-gen2.yaml
index 3eb5d1b01..353d0a44b 100644
--- a/device-types/HPE/Aruba-ec-m-b-gen2.yaml
+++ b/device-types/HPE/Aruba-ec-m-b-gen2.yaml
@@ -6,19 +6,19 @@ part_number: '201553'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 22
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
     maximum_draw: 162
-    label: power0
-  - name: power1
+  - name: PS2
     type: iec-60320-c14
     maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +32,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-ec-m-b.yaml b/device-types/HPE/Aruba-ec-m-b.yaml
index 3376c70f8..11cf358e5 100644
--- a/device-types/HPE/Aruba-ec-m-b.yaml
+++ b/device-types/HPE/Aruba-ec-m-b.yaml
@@ -6,19 +6,19 @@ part_number: '200969'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 24
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
+    maximum_draw: 132
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
+    maximum_draw: 132
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +32,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-ec-m-h-ac.yaml b/device-types/HPE/Aruba-ec-m-h-ac.yaml
index a59a23f50..603dc4baf 100644
--- a/device-types/HPE/Aruba-ec-m-h-ac.yaml
+++ b/device-types/HPE/Aruba-ec-m-h-ac.yaml
@@ -6,42 +6,61 @@ part_number: '201762'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 18.1
+weight_unit: lb
 console-ports:
   - name: console
-    type: de-9
+    type: rj-45
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
+    maximum_draw: 153
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
+    maximum_draw: 153
 interfaces:
-  - name: lan0
-    type: 1000base-t
-    label: lan0
-  - name: lan1
-    type: 1000base-t
-    label: lan1
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
+  - name: tlan1
+    type: 10gbase-x-sfpp
+    label: tlan1
+  - name: twan1
+    type: 10gbase-x-sfpp
+    label: twan1
+  - name: lan0
+    type: 1000base-t
+    label: lan0
+  - name: lan1
+    type: 1000base-t
+    label: lan1
+  - name: lan2
+    type: 1000base-t
+    label: lan2
+  - name: lan3
+    type: 1000base-t
+    label: lan3
   - name: wan0
     type: 1000base-t
     label: wan0
   - name: wan1
     type: 1000base-t
     label: wan1
+  - name: wan2
+    type: 1000base-t
+    label: wan2
+  - name: wan3
+    type: 1000base-t
+    label: wan3
diff --git a/device-types/HPE/Aruba-ec-m-p-fips.yaml b/device-types/HPE/Aruba-ec-m-p-fips.yaml
index 8cbc7641d..0f1a94421 100644
--- a/device-types/HPE/Aruba-ec-m-p-fips.yaml
+++ b/device-types/HPE/Aruba-ec-m-p-fips.yaml
@@ -6,19 +6,19 @@ part_number: '201634'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 22
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
     maximum_draw: 162
-    label: power0
-  - name: power1
+  - name: PS2
     type: iec-60320-c14
     maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +32,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-ec-m-p-gen2.yaml b/device-types/HPE/Aruba-ec-m-p-gen2.yaml
index 7adb04d9c..5dfcab4ed 100644
--- a/device-types/HPE/Aruba-ec-m-p-gen2.yaml
+++ b/device-types/HPE/Aruba-ec-m-p-gen2.yaml
@@ -6,19 +6,19 @@ part_number: '201552'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 24
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
     maximum_draw: 162
-    label: power0
-  - name: power1
+  - name: PS2
     type: iec-60320-c14
     maximum_draw: 162
-    label: power1
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +32,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-ec-m-p.yaml b/device-types/HPE/Aruba-ec-m-p.yaml
index a502ad230..c583581f2 100644
--- a/device-types/HPE/Aruba-ec-m-p.yaml
+++ b/device-types/HPE/Aruba-ec-m-p.yaml
@@ -6,19 +6,19 @@ part_number: '201274'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 24
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
+    maximum_draw: 132
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
+    maximum_draw: 132
 interfaces:
   - name: lan0
     type: 1000base-t
@@ -32,12 +32,13 @@ interfaces:
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
   - name: tlan0
     type: 10gbase-x-sfpp
     label: tlan0
   - name: twan0
-    type: 1000base-t
+    type: 10gbase-x-sfpp
     label: twan0
   - name: wan0
     type: 1000base-t
diff --git a/device-types/HPE/Aruba-ec-m.yaml b/device-types/HPE/Aruba-ec-m.yaml
index 9dabed7e4..d35896e58 100644
--- a/device-types/HPE/Aruba-ec-m.yaml
+++ b/device-types/HPE/Aruba-ec-m.yaml
@@ -6,42 +6,43 @@ part_number: '200890'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 26
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power0
-  - name: power1
+    maximum_draw: 126
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 162
-    label: power1
+    maximum_draw: 126
 interfaces:
   - name: lan0
     type: 1000base-t
     label: lan0
+  - name: wan0
+    type: 1000base-t
+    label: wan0
   - name: lan1
     type: 1000base-t
     label: lan1
+  - name: wan1
+    type: 1000base-t
+    label: wan1
+  - name: tlan0
+    type: 10gbase-x-sfpp
+    label: tlan0
+  - name: twan0
+    type: 10gbase-x-sfpp
+    label: twan0
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
     label: mgmt0
   - name: mgmt1
     type: 1000base-t
+    mgmt_only: true
     label: mgmt1
-  - name: tlan0
-    type: 10gbase-x-sfpp
-    label: tlan0
-  - name: twan0
-    type: 1000base-t
-    label: twan0
-  - name: wan0
-    type: 1000base-t
-    label: wan0
-  - name: wan1
-    type: 1000base-t
-    label: wan1