diff --git a/device-types/HPE/Aruba-ec-l-b-nm.yaml b/device-types/HPE/Aruba-ec-l-b-nm.yaml
index 7f2d26cec..1d281b7fb 100644
--- a/device-types/HPE/Aruba-ec-l-b-nm.yaml
+++ b/device-types/HPE/Aruba-ec-l-b-nm.yaml
@@ -6,19 +6,19 @@ part_number: '201272'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
+    maximum_draw: 370
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
+    maximum_draw: 370
 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-l-b.yaml b/device-types/HPE/Aruba-ec-l-b.yaml
index 6f69907e3..8c65fe55b 100644
--- a/device-types/HPE/Aruba-ec-l-b.yaml
+++ b/device-types/HPE/Aruba-ec-l-b.yaml
@@ -6,19 +6,19 @@ part_number: '201270'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
     maximum_draw: 440
-    label: power0
-  - name: power1
+  - name: PS2
     type: iec-60320-c14
     maximum_draw: 440
-    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-l-h.yaml b/device-types/HPE/Aruba-ec-l-h.yaml
index 43891801c..9b005176b 100644
--- a/device-types/HPE/Aruba-ec-l-h.yaml
+++ b/device-types/HPE/Aruba-ec-l-h.yaml
@@ -6,42 +6,45 @@ part_number: '201754'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 32.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
+    maximum_draw: 404
+    label: PS1
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
+    maximum_draw: 404
+    label: PS2
 interfaces:
-  - name: lan0
-    type: 1000base-t
-    label: lan0
-  - name: lan1
-    type: 1000base-t
-    label: lan1
+  - name: tlan0
+    type: 10gbase-x-sfpp
+    label: tlan0
+  - name: twan0
+    type: 10gbase-x-sfpp
+    label: twan0
+  - name: tlan1
+    type: 10gbase-x-sfpp
+    label: tlan1
+  - name: twan1
+    type: 10gbase-x-sfpp
+    label: twan1
+  - name: tlan2
+    type: 10gbase-x-sfpp
+    label: tlan2
+  - name: twan2
+    type: 10gbase-x-sfpp
+    label: twan2
   - 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
diff --git a/device-types/HPE/Aruba-ec-l-nm.yaml b/device-types/HPE/Aruba-ec-l-nm.yaml
index 31c600cfe..f83a0faa2 100644
--- a/device-types/HPE/Aruba-ec-l-nm.yaml
+++ b/device-types/HPE/Aruba-ec-l-nm.yaml
@@ -6,19 +6,19 @@ part_number: '200887'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
     maximum_draw: 440
-    label: power0
-  - name: power1
+  - name: PS2
     type: iec-60320-c14
     maximum_draw: 440
-    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-l-p-nm.yaml b/device-types/HPE/Aruba-ec-l-p-nm.yaml
index c55c1e508..c7c138eb6 100644
--- a/device-types/HPE/Aruba-ec-l-p-nm.yaml
+++ b/device-types/HPE/Aruba-ec-l-p-nm.yaml
@@ -6,19 +6,19 @@ part_number: '201307'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 37.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
+    maximum_draw: 370
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
+    maximum_draw: 370
 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-l-p.yaml b/device-types/HPE/Aruba-ec-l-p.yaml
index fb3e42f5c..042189c3f 100644
--- a/device-types/HPE/Aruba-ec-l-p.yaml
+++ b/device-types/HPE/Aruba-ec-l-p.yaml
@@ -6,19 +6,19 @@ part_number: '201305'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
     maximum_draw: 440
-    label: power0
-  - name: power1
+  - name: PS2
     type: iec-60320-c14
     maximum_draw: 440
-    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-l.yaml b/device-types/HPE/Aruba-ec-l.yaml
index 0089e7910..81b59b7db 100644
--- a/device-types/HPE/Aruba-ec-l.yaml
+++ b/device-types/HPE/Aruba-ec-l.yaml
@@ -6,19 +6,19 @@ part_number: '200883'
 u_height: 1
 is_full_depth: true
 airflow: front-to-rear
+weight: 36.0
+weight_unit: lb
 console-ports:
   - name: console
     type: de-9
     label: console
 power-ports:
-  - name: power0
+  - name: PS1
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power0
-  - name: power1
+    maximum_draw: 401
+  - name: PS2
     type: iec-60320-c14
-    maximum_draw: 440
-    label: power1
+    maximum_draw: 401
 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