diff --git a/README.md b/README.md
index 05a9dfe7066b649847ae6af716e03e6f8e087e2f..37854aefb98a4b02d60642c97a4ee7cee8329fb0 100644
--- a/README.md
+++ b/README.md
@@ -64,20 +64,20 @@ The following fields may **optionally** be declared:
- `comments`: A string field which allows for comments to be added to the device. (**Default: None**)
- Type: String
> :test_tube: **Example**: `comments: This is a comment that will appear on all NetBox devices of this type`
-- `weight`: An array with a **single** item that allow for a value and unit of measurement to be defined. (**Default: None**)
- - Type: Array
- - Value: Number - must be multiple of 0.01
- - Unit: String
- - Options:
- - kg
- - g
- - lb
- - oz
+- `weight`: A number representing the numeric weight value. Must be a multiple of 0.01 (2 decimal places). (**Default: None**)
+ - Type: Number
+ - Value: must be a multiple of 0.01
+- `weight_unit`: A string defining the unit of measurement. It must be one of the supported values. (**Default: None**)
+ - Type: String
+ - Value: Enumerated Options
+ - kg
+ - g
+ - lb
+ - oz
>:test_tube: **Example**:
>```
->weight:
-> - value: 12.21
-> unit: lb
+>weight: 12.21
+>weight_unit: lb
>```
For further detail on these attributes and those listed below, please reference the
diff --git a/device-types/Adtran/NV4660.yaml b/device-types/Adtran/NV4660.yaml
index 9c97edf14565d917c307293ecd381d62ba632595..3b1f38579c8012f48163500369803a694e61245e 100644
--- a/device-types/Adtran/NV4660.yaml
+++ b/device-types/Adtran/NV4660.yaml
@@ -3,9 +3,8 @@ manufacturer: Adtran
model: NetVanta 4660
slug: nv4660
part_number: 17004660F1
-weight:
- - value: 3.2
- unit: kg
+weight: 3.2
+weight_unit: kg
u_height: 1
is_full_depth: false
console-ports:
diff --git a/device-types/Cisco/DPC3939B.yaml b/device-types/Cisco/DPC3939B.yaml
index d8c5354ad05d6b0ce6a5d64799cd6313da8882e3..485f256eca8efeb9162fc7b377556ebad2b4c931 100644
--- a/device-types/Cisco/DPC3939B.yaml
+++ b/device-types/Cisco/DPC3939B.yaml
@@ -6,9 +6,8 @@ part_number: DPC3939B-AMC11-K9
u_height: 0
is_full_depth: false
comments: Comcast Business Gateway Model DPC3939B
-weight:
- - value: 2.65
- unit: lb
+weight: 2.65
+weight_unit: lb
power-ports:
- name: PS1
type: iec-60320-c8
diff --git a/device-types/Cisco/SPA112.yaml b/device-types/Cisco/SPA112.yaml
index ca2494bd249e4d8a12838ef7822345dffbf9d512..5e8048e7e49f7f6326fc4160eb12c74f3ff88e0c 100644
--- a/device-types/Cisco/SPA112.yaml
+++ b/device-types/Cisco/SPA112.yaml
@@ -7,9 +7,8 @@ u_height: 0
is_full_depth: false
airflow: passive
comments: 'There are models with 1 WAN, 1 LAN under a different hardware revision #. [Cisco SPA122 ATA with Router Data Sheet](https://www.cisco.com/c/en/us/products/collateral/unified-communications/small-business-voice-gateways-ata/datasheet_C78-691107.html)'
-weight:
- - value: 5.4
- unit: oz
+weight: 5.4
+weight_unit: oz
power-ports:
- name: POWER
type: dc-terminal
diff --git a/device-types/Cisco/WS-C2960XR-24TD-I.yaml b/device-types/Cisco/WS-C2960XR-24TD-I.yaml
index 370ea77ac8ba8bbca7063c15e13b06d8589705b6..d7be8b34eaa347905a9f034f260c54d223ea9fc8 100644
--- a/device-types/Cisco/WS-C2960XR-24TD-I.yaml
+++ b/device-types/Cisco/WS-C2960XR-24TD-I.yaml
@@ -5,9 +5,8 @@ slug: cisco-ws-c2960xr-24td-i
part_number: WS-C2960XR-24TD-I
is_full_depth: false
u_height: 1
-weight:
- - value: 13.0
- unit: lb
+weight: 13.0
+weight_unit: lb
comments: IP Lite feature set (https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-2960-x-series-switches/datasheet_c78-728232.pdf)
airflow: side-to-rear
interfaces:
diff --git a/device-types/Datto/AP440.yaml b/device-types/Datto/AP440.yaml
index 3077982b9a5927657fe6528d106ce0382693b261..50e132ef9f17c52141cc4a8b366c66c67f964e50 100644
--- a/device-types/Datto/AP440.yaml
+++ b/device-types/Datto/AP440.yaml
@@ -6,9 +6,8 @@ part_number: AP440
u_height: 0
is_full_depth: false
comments: '[Datto Access Points](https://www.datto.com/product-assets/wifi/AP840_840E_Datasheet_US.pdf)'
-weight:
- - value: 1.19
- unit: lb
+weight: 1.19
+weight_unit: lb
power-ports:
- name: DC
type: dc-terminal
diff --git a/device-types/Datto/AP840.yaml b/device-types/Datto/AP840.yaml
index 62d3be3faa82cd45b64bde7b487347a9a9ae4eb5..5cf141eb5d24a00a3f8e35190e3dcb5380c19b69 100644
--- a/device-types/Datto/AP840.yaml
+++ b/device-types/Datto/AP840.yaml
@@ -6,9 +6,8 @@ part_number: AP840
u_height: 0
is_full_depth: false
comments: '[Datto Access Points](https://www.datto.com/product-assets/wifi/AP840_840E_Datasheet_US.pdf)'
-weight:
- - value: 2.03
- unit: lb
+weight: 2.03
+weight_unit: lb
power-ports:
- name: DC
type: dc-terminal
diff --git a/device-types/Datto/AP840E.yaml b/device-types/Datto/AP840E.yaml
index e00215fe5c926c402ccd1fbf0d9a465578ed6cd2..130b6162f0e49d4d1274f9a71a698c7a87964da0 100644
--- a/device-types/Datto/AP840E.yaml
+++ b/device-types/Datto/AP840E.yaml
@@ -6,9 +6,8 @@ part_number: AP840E
u_height: 0
is_full_depth: false
comments: '[Datto Access Points](https://www.datto.com/product-assets/wifi/AP840_840E_Datasheet_US.pdf)'
-weight:
- - value: 3.55
- unit: lb
+weight: 3.55
+weight_unit: lb
power-ports:
- name: DC
type: dc-terminal
diff --git a/device-types/EnGenius/EWS1200-28TFP.yaml b/device-types/EnGenius/EWS1200-28TFP.yaml
index c9ad8c35d91685878f48d0ddc5b36a73774c1b3a..c7dfa513b61b996eb85d49928d335d5be669e762 100644
--- a/device-types/EnGenius/EWS1200-28TFP.yaml
+++ b/device-types/EnGenius/EWS1200-28TFP.yaml
@@ -6,9 +6,8 @@ part_number: EWS1200-28TFP
u_height: 1
is_full_depth: false
comments: "24-Port Managed Gigabit 410W PoE+ Network Switch\r\n\r\nSpecifications: [EWS1200-28TFP](https://www.engeniusnetworks.eu/products/network-switches/ews1200-28tfp/#specification)"
-weight:
- - value: 3.85
- unit: kg
+weight: 3.85
+weight_unit: kg
power-ports:
- name: Power
type: iec-60320-c14
diff --git a/device-types/EnGenius/EWS360AP.yaml b/device-types/EnGenius/EWS360AP.yaml
index b81cf3e02d038ef9508f1dc9e03b08e9f1bcddc7..7bff3be5c3b314994abd205e9466190ac1b7db3b 100644
--- a/device-types/EnGenius/EWS360AP.yaml
+++ b/device-types/EnGenius/EWS360AP.yaml
@@ -7,9 +7,8 @@ u_height: 0
is_full_depth: false
airflow: passive
comments: "EWS 11ac Managed Indoor Access Point\r\n\r\nSpecifications: [EWS360AP](https://www.engeniusnetworks.eu/products/wireless/indoor-access-points/ews360ap/#specification)"
-weight:
- - value: 363
- unit: g
+weight: 363
+weight_unit: g
power-ports:
- name: Power
type: dc-terminal
diff --git a/device-types/EnGenius/EWS5912FP.yaml b/device-types/EnGenius/EWS5912FP.yaml
index 90e30950401b9ec034177680947ae8fbb00e0b1f..034ea79aeb9cb366cb286f897eec3e83e22a5b98 100644
--- a/device-types/EnGenius/EWS5912FP.yaml
+++ b/device-types/EnGenius/EWS5912FP.yaml
@@ -6,9 +6,8 @@ part_number: EWS5912FP
u_height: 1
is_full_depth: false
comments: "8-Port Managed Gigabit 130W PoE+ Network Switch\r\n\r\nSpecifications: [EWS5912FP](https://www.engeniusnetworks.eu/products/network-switches/ews5912fp/#specification)"
-weight:
- - value: 1.9
- unit: kg
+weight: 1.9
+weight_unit: kg
power-ports:
- name: Power
type: iec-60320-c14
diff --git a/device-types/FS/S3150-8T2FP.yaml b/device-types/FS/S3150-8T2FP.yaml
index f403d757db664db0a0a6c979558d8f657b81dfab..0747970a5e66e870ca9bc1be19581a19d13ab989 100644
--- a/device-types/FS/S3150-8T2FP.yaml
+++ b/device-types/FS/S3150-8T2FP.yaml
@@ -7,9 +7,8 @@ is_full_depth: false
u_height: 1
airflow: passive
comments: '[FS S3150 Series Switches Data Sheet](https://www.fs.com/products_support/preview.html?categories_id=3256&files_id=4543&model_name=S3150-8T2FP&is_datasheet=1)'
-weight:
- - value: 3.7
- unit: lb
+weight: 3.7
+weight_unit: lb
console-ports:
- name: Console
type: rj-45
diff --git a/device-types/Fortinet/FEX-40D.yaml b/device-types/Fortinet/FEX-40D.yaml
index fdf15fa1010a88ca5d7032da32c4802405d9be9a..4e45863918c810c86137c3e4a2eba5135a8312aa 100644
--- a/device-types/Fortinet/FEX-40D.yaml
+++ b/device-types/Fortinet/FEX-40D.yaml
@@ -4,9 +4,8 @@ model: FortiExtender 40D
slug: fortinet-fex-40d
part_number: FEX-40D
u_height: 0
-weight:
- - value: 0.83
- unit: lb
+weight: 0.83
+weight_unit: lb
is_full_depth: false
comments: Built in LTE modem (2 antenna), PoE-capable, Wall-mount.
console-ports:
diff --git a/device-types/Fortinet/FS-1048E.yaml b/device-types/Fortinet/FS-1048E.yaml
index 020c2c7acae2dea243876c1d222892cd5adbc0e0..71e471816a0ff8e621621bc943fa0c7d587fe9cf 100644
--- a/device-types/Fortinet/FS-1048E.yaml
+++ b/device-types/Fortinet/FS-1048E.yaml
@@ -4,9 +4,8 @@ model: FortiSwitch 1048E
slug: fortinet-fs-1048e
part_number: FS-1048E
u_height: 1
-weight:
- - value: 18.96
- unit: lb
+weight: 18.96
+weight_unit: lb
is_full_depth: false
comments: '[Datasheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/FortiSwitch_Data_Center_Series.pdf)'
airflow: front-to-rear
diff --git a/device-types/Fortinet/FS-424E-FPOE.yaml b/device-types/Fortinet/FS-424E-FPOE.yaml
index d92352d89421a036d1d42e37f696270fffd4be39..42929e287a0d2bac2d09e29ef9205d553d1c9318 100644
--- a/device-types/Fortinet/FS-424E-FPOE.yaml
+++ b/device-types/Fortinet/FS-424E-FPOE.yaml
@@ -4,9 +4,8 @@ model: FortiSwitch 424E-FPOE
slug: fortinet-fs-424e-fpoe
part_number: FS-424E-FPOE
u_height: 1
-weight:
- - value: 12.72
- unit: lb
+weight: 12.72
+weight_unit: lb
is_full_depth: false
comments: '[Datasheet](https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/FortiSwitch_Secure_Access_Series.pdf)'
airflow: side-to-rear
diff --git a/device-types/Fortinet/FS-448D-FPOE.yaml b/device-types/Fortinet/FS-448D-FPOE.yaml
index 71efe5e364b21d00b5790c98b4e68be02f4179ab..68f2989c9a31e8838d7531627bc9742161ee1009 100644
--- a/device-types/Fortinet/FS-448D-FPOE.yaml
+++ b/device-types/Fortinet/FS-448D-FPOE.yaml
@@ -4,9 +4,8 @@ model: FortiSwitch 448D-FPOE
slug: fortinet-fs-448d-fpoe
part_number: FS-448D-FPOE
u_height: 1
-weight:
- - value: 15.45
- unit: lb
+weight: 15.45
+weight_unit: lb
is_full_depth: false
airflow: side-to-rear
console-ports:
diff --git a/device-types/Fortinet/FS-448D-POE.yaml b/device-types/Fortinet/FS-448D-POE.yaml
index 309abc94a16833e8779c065c1ef00d2212a099a5..b5957b3c056e26c21b2fff099152b592c0c533a8 100644
--- a/device-types/Fortinet/FS-448D-POE.yaml
+++ b/device-types/Fortinet/FS-448D-POE.yaml
@@ -4,9 +4,8 @@ model: FortiSwitch 448D-POE
slug: fortinet-fs-448d-poe
part_number: FS-448D-POE
u_height: 1
-weight:
- - value: 13.44
- unit: lb
+weight: 13.44
+weight_unit: lb
is_full_depth: false
airflow: side-to-rear
console-ports:
diff --git a/device-types/HPE/Aruba-2530-24-PoEP.yml b/device-types/HPE/Aruba-2530-24-PoEP.yml
index 3fb3b726e89146a83f3a1638fdfdcc9cf3328d18..a112fa66382be6950bedba5775150c81b4cba45c 100644
--- a/device-types/HPE/Aruba-2530-24-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-24-PoEP.yml
@@ -6,9 +6,8 @@ part_number: J9779A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N11BE7)'
-weight:
- - value: 3.8
- unit: kg
+weight: 3.8
+weight_unit: kg
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/Aruba-2530-24.yaml b/device-types/HPE/Aruba-2530-24.yaml
index d96c445ccd279e1620b53dc6e08f37836794f0ab..ce84e69abe0944b09389daa64b28182100c90225 100644
--- a/device-types/HPE/Aruba-2530-24.yaml
+++ b/device-types/HPE/Aruba-2530-24.yaml
@@ -6,9 +6,8 @@ part_number: J9782A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N1040D)'
-weight:
- - value: 2.6
- unit: kg
+weight: 2.6
+weight_unit: kg
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-24G-PoEP.yaml b/device-types/HPE/Aruba-2530-24G-PoEP.yaml
index 7f331a3079da05a0bef38658a16402c4ae953429..9119aa9a2a3407331ce469222e63d2310e804eaa 100644
--- a/device-types/HPE/Aruba-2530-24G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2530-24G-PoEP.yaml
@@ -6,9 +6,8 @@ part_number: J9773A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N127FD)'
-weight:
- - value: 4
- unit: kg
+weight: 4
+weight_unit: kg
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-24G.yaml b/device-types/HPE/Aruba-2530-24G.yaml
index ea7d508b93820466326391adf2b1ae4f2f30aa9f..82ee85c29c4d831bbe645adf29ec5888ea9de985 100644
--- a/device-types/HPE/Aruba-2530-24G.yaml
+++ b/device-types/HPE/Aruba-2530-24G.yaml
@@ -6,9 +6,8 @@ part_number: J9776A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N11007)'
-weight:
- - value: 6.1
- unit: lb
+weight: 6.1
+weight_unit: lb
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-48-PoEP.yml b/device-types/HPE/Aruba-2530-48-PoEP.yml
index 30ae45042488011028476d8f42319a6a8b0654d9..cdb3ea64ba00df839a93931a0423a1733620e4cb 100644
--- a/device-types/HPE/Aruba-2530-48-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-48-PoEP.yml
@@ -6,9 +6,8 @@ part_number: J9778A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N11FF3)'
-weight:
- - value: 10
- unit: lb
+weight: 10
+weight_unit: lb
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/Aruba-2530-48.yaml b/device-types/HPE/Aruba-2530-48.yaml
index d8762f13afa780396fa4bb0c17c6cb8a6fa573f1..10fffa9939d91312414aec1f6cdc69065a6b70bd 100644
--- a/device-types/HPE/Aruba-2530-48.yaml
+++ b/device-types/HPE/Aruba-2530-48.yaml
@@ -6,9 +6,8 @@ part_number: J9781A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N10805)'
-weight:
- - value: 2.6
- unit: kg
+weight: 2.6
+weight_unit: kg
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-48G-PoEP.yaml b/device-types/HPE/Aruba-2530-48G-PoEP.yaml
index 73a5a76a8424521028d1f31967d50e5bc73d3e21..a2a6c2641effb35db75f20655430c18c771be6d5 100644
--- a/device-types/HPE/Aruba-2530-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2530-48G-PoEP.yaml
@@ -6,9 +6,8 @@ part_number: J9772A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N12C00)'
-weight:
- - value: 2.6
- unit: kg
+weight: 2.6
+weight_unit: kg
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-48G.yaml b/device-types/HPE/Aruba-2530-48G.yaml
index 95e71c300c374af4d091b8286899dd596ee77b33..7232a4d7c1d3bc33fb53b678c374c70296d71ace 100644
--- a/device-types/HPE/Aruba-2530-48G.yaml
+++ b/device-types/HPE/Aruba-2530-48G.yaml
@@ -6,9 +6,8 @@ part_number: J9775A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N113F7)'
-weight:
- - value: 3
- unit: kg
+weight: 3
+weight_unit: kg
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2530-8-PoEP.yml b/device-types/HPE/Aruba-2530-8-PoEP.yml
index cf08f705c85a35093658ab2c67259742708a6e10..cc5570f4dfa19afaff896100b8e07fcb684e4831 100644
--- a/device-types/HPE/Aruba-2530-8-PoEP.yml
+++ b/device-types/HPE/Aruba-2530-8-PoEP.yml
@@ -6,9 +6,8 @@ part_number: J9780A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N117E5)'
-weight:
- - value: 2
- unit: lb
+weight: 2
+weight_unit: lb
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/Aruba-2530-8.yaml b/device-types/HPE/Aruba-2530-8.yaml
index fe0ea88e2915560c3cd8a9c71ee2b98324299173..7a3c7721453f1e97e6ec3379ee92614487f2fd92 100644
--- a/device-types/HPE/Aruba-2530-8.yaml
+++ b/device-types/HPE/Aruba-2530-8.yaml
@@ -6,9 +6,8 @@ part_number: J9783A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915)'
-weight:
- - value: 0.82
- unit: kg
+weight: 0.82
+weight_unit: kg
power-ports:
- name: PS1
type: dc-terminal
diff --git a/device-types/HPE/Aruba-2530-8G-PoEP.yaml b/device-types/HPE/Aruba-2530-8G-PoEP.yaml
index 6728c2be8a5b2090691bf6f8643d49495389c57b..a33d61141e06a3493b46c696dfacd5d7441705a0 100644
--- a/device-types/HPE/Aruba-2530-8G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2530-8G-PoEP.yaml
@@ -6,9 +6,8 @@ part_number: J9774A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915#N123F6)'
-weight:
- - value: 1
- unit: kg
+weight: 1
+weight_unit: kg
power-ports:
- name: PS1
type: dc-terminal
diff --git a/device-types/HPE/Aruba-2530-8G.yaml b/device-types/HPE/Aruba-2530-8G.yaml
index 1741caaf09495fbb6fd824114f11334a4459f624..4743294a7dfc6fd95c5e9186064f4bfbebcf733e 100644
--- a/device-types/HPE/Aruba-2530-8G.yaml
+++ b/device-types/HPE/Aruba-2530-8G.yaml
@@ -6,9 +6,8 @@ part_number: J9777A
u_height: 1
is_full_depth: false
comments: '[Aruba 2530 Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03624915)'
-weight:
- - value: 0.91
- unit: kg
+weight: 0.91
+weight_unit: kg
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2930F-24G-4SFP.yaml b/device-types/HPE/Aruba-2930F-24G-4SFP.yaml
index 24279135c672e8e3df5e6c9104f54e1e969de4cd..aa590be739cc1dc0ee272b2f0f2347b97cf74520 100644
--- a/device-types/HPE/Aruba-2930F-24G-4SFP.yaml
+++ b/device-types/HPE/Aruba-2930F-24G-4SFP.yaml
@@ -6,9 +6,8 @@ part_number: JL259A
u_height: 1
is_full_depth: false
comments: '[Aruba 2930F 24G 4SFP Switch Data sheet](https://www.hpe.com/psnow/doc/PSN1008995548USEN.pdf)'
-weight:
- - value: 5.31
- unit: lb
+weight: 5.31
+weight_unit: lb
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2930F-24G-PoEP-4SFP.yaml b/device-types/HPE/Aruba-2930F-24G-PoEP-4SFP.yaml
index 12605223c718317511eb230c8e4abb3ff09b9696..f3108d69ac3c6653e5e05eb2a2fbd8855d67a928 100644
--- a/device-types/HPE/Aruba-2930F-24G-PoEP-4SFP.yaml
+++ b/device-types/HPE/Aruba-2930F-24G-PoEP-4SFP.yaml
@@ -6,9 +6,8 @@ part_number: JL261A
u_height: 1
is_full_depth: false
comments: '[Aruba 2930F 24G PoE+ 4SFP Switch Data sheet](https://www.hpe.com/psnow/doc/PSN1008995334USEN.pdf)'
-weight:
- - value: 8.6
- unit: lb
+weight: 8.6
+weight_unit: lb
power-ports:
- name: PS1
type: iec-60320-c14
diff --git a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
index 6b2c9043bab0af3f7632b34ad78420e908729322..bc58bc7312cb571ab20c04525d9974b2f70e36f9 100644
--- a/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
+++ b/device-types/HPE/Aruba-2930M-48G-PoEP.yaml
@@ -6,9 +6,8 @@ part_number: JL322A
u_height: 1
is_full_depth: false
comments: '[Aruba 2930M Switch Series Datasheet](https://www.arubanetworks.com/assets/ds/DS_2930MSwitchSeries.pdf)'
-weight:
- - value: 10.25
- unit: lb
+weight: 10.25
+weight_unit: lb
module-bays:
- name: PS1
position: '1'
diff --git a/device-types/HPE/Aruba-2930M-48G.yaml b/device-types/HPE/Aruba-2930M-48G.yaml
index 855622d88935895d961602487cd32c04b6acfce7..5b7ebd7a351b1ec09ead8ca12ae41d3110b5b09a 100644
--- a/device-types/HPE/Aruba-2930M-48G.yaml
+++ b/device-types/HPE/Aruba-2930M-48G.yaml
@@ -6,9 +6,8 @@ part_number: JL321A
u_height: 1
is_full_depth: false
comments: '[Aruba 2930M 48G 1-slot Switch Data sheet](https://www.hpe.com/psnow/doc/PSN1009875168USEN.pdf)'
-weight:
- - value: 10.14
- unit: lb
+weight: 10.14
+weight_unit: lb
module-bays:
- name: PS1
position: '1'
diff --git a/device-types/HPE/FlexFabric-5700-40XG-2QSFPP.yaml b/device-types/HPE/FlexFabric-5700-40XG-2QSFPP.yaml
index 2cc64314f3c83eb6f62b8304041880c2e4f63feb..0326d5723883bfd193da5d6bc1c35006290fe912 100644
--- a/device-types/HPE/FlexFabric-5700-40XG-2QSFPP.yaml
+++ b/device-types/HPE/FlexFabric-5700-40XG-2QSFPP.yaml
@@ -6,9 +6,8 @@ part_number: JG896A
u_height: 1
is_full_depth: false
comments: '[HPE FlexFabric 5700 Switch Series - Specification](https://support.hpe.com/hpesc/public/docDisplay?docId=c04400247)'
-weight:
- - value: 10
- unit: kg
+weight: 10
+weight_unit: kg
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/FlexFabric-5945-2-slot.yaml b/device-types/HPE/FlexFabric-5945-2-slot.yaml
index 06f7f720e0ac6061b7950bd50da183c3c711dd79..bccf3d67bac536df3e4f58f6c0f0ee36a17b2092 100644
--- a/device-types/HPE/FlexFabric-5945-2-slot.yaml
+++ b/device-types/HPE/FlexFabric-5945-2-slot.yaml
@@ -6,9 +6,8 @@ part_number: JQ075A
u_height: 1
is_full_depth: false
comments: '[HPE FlexFabric 5945 2-slot Switch Data sheet](https://www.hpe.com/psnow/doc/PSN1011424706USEN.pdf)'
-weight:
- - value: 10.4
- unit: kg
+weight: 10.4
+weight_unit: kg
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/FlexNetwork-5130-24G-4SFP+-EI.yml b/device-types/HPE/FlexNetwork-5130-24G-4SFP+-EI.yml
index 48fd1ff05d1bf26b965ac2a156ed78f225f4261b..c410fd96505adbb99887eec306653603897c258c 100644
--- a/device-types/HPE/FlexNetwork-5130-24G-4SFP+-EI.yml
+++ b/device-types/HPE/FlexNetwork-5130-24G-4SFP+-EI.yml
@@ -6,9 +6,8 @@ part_number: JG932A
u_height: 1
is_full_depth: false
comments: '[HPE FlexNetwork 5130 EI Switch Series QuickSpecs](https://www.hpe.com/psnow/doc/c04394228.pdf)'
-weight:
- - value: 5
- unit: kg
+weight: 5
+weight_unit: kg
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/FlexNetwork-5130-48G-4SFP+-EI.yml b/device-types/HPE/FlexNetwork-5130-48G-4SFP+-EI.yml
index 2ad9a82b35d701b3a5a45b6957b59346804550d0..5bc5163ad9ea17a78e6dd15bfd1a8cb7fc3b67b3 100644
--- a/device-types/HPE/FlexNetwork-5130-48G-4SFP+-EI.yml
+++ b/device-types/HPE/FlexNetwork-5130-48G-4SFP+-EI.yml
@@ -6,9 +6,8 @@ part_number: JG934A
u_height: 1
is_full_depth: false
comments: '[HPE FlexNetwork 5130 EI Switch Series QuickSpecs](https://www.hpe.com/psnow/doc/c04394228.pdf)'
-weight:
- - value: 5
- unit: kg
+weight: 5
+weight_unit: kg
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml b/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml
index 324f4f5cde24afde75fd6b9bd64a57efd20bb685..5a8e9b9d4b2e8841b332b1041c460331eff2ddc2 100644
--- a/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml
+++ b/device-types/HPE/FlexNetwork-5130-48G-4SFPP-HI.yml
@@ -7,9 +7,8 @@ u_height: 1
is_full_depth: false
comments: '[HPE FlexNetwork 5130 HI Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c04924428)'
airflow: front-to-rear
-weight:
- - value: 7.5
- unit: kg
+weight: 7.5
+weight_unit: kg
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml b/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml
index 694809901f5a48a752649d683f0391f6197db04d..ca1fc2d4df3b3a4d6b51b0253ab52272953e64de 100644
--- a/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml
+++ b/device-types/HPE/FlexNetwork-5130-48G-PoEP-4SFPP-HI.yml
@@ -7,9 +7,8 @@ u_height: 1
is_full_depth: false
comments: '[HPE FlexNetwork 5130 HI Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c04924428)'
airflow: front-to-rear
-weight:
- - value: 12.5
- unit: kg
+weight: 12.5
+weight_unit: kg
console-ports:
- name: console
type: rj-45
diff --git a/device-types/HPE/HP-5500-24G-4SFP-HI.yaml b/device-types/HPE/HP-5500-24G-4SFP-HI.yaml
index 891c2c8c7604fd418d81346471877a5957fc2edb..0605304ae4e2f278c3549ffaf61287140e2632a0 100644
--- a/device-types/HPE/HP-5500-24G-4SFP-HI.yaml
+++ b/device-types/HPE/HP-5500-24G-4SFP-HI.yaml
@@ -6,9 +6,8 @@ part_number: JG311A
u_height: 1
is_full_depth: false
comments: '[HPE 5500 HI Switch Series - Specifications](https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-c03237481)'
-weight:
- - value: 7.5
- unit: kg
+weight: 7.5
+weight_unit: kg
module-bays:
- name: PSU1
position: PSU1
diff --git a/device-types/HPE/ProLiant-DL180-Gen6.yaml b/device-types/HPE/ProLiant-DL180-Gen6.yaml
index 32a164f4dbd91bf57daf12cb7e0bd35119f5f43b..d95d7c13eabbab55d3b9c9cbd0528aabce2b9915 100644
--- a/device-types/HPE/ProLiant-DL180-Gen6.yaml
+++ b/device-types/HPE/ProLiant-DL180-Gen6.yaml
@@ -6,9 +6,8 @@ u_height: 2.0
is_full_depth: true
part_number: 590638-371
comments: '[HP ProLiant DL180 G6 QuickSpecs](https://www.hpe.com/psnow/doc/c04284378)'
-weight:
- - value: 16.80
- unit: kg
+weight: 16.80
+weight_unit: kg
console-ports:
- name: Serial
type: de-9
diff --git a/device-types/HPE/ProLiant-DL360e-Gen8.yaml b/device-types/HPE/ProLiant-DL360e-Gen8.yaml
index 936e7c967a310dc768727d42e051923d7e76c3f3..f3eb235f010b088ad937d83b1b6c783c5184b812 100644
--- a/device-types/HPE/ProLiant-DL360e-Gen8.yaml
+++ b/device-types/HPE/ProLiant-DL360e-Gen8.yaml
@@ -6,9 +6,8 @@ u_height: 1.0
is_full_depth: true
part_number: 661189-B21
comments: '[HP ProLiant DL360e Gen8 QuickSpecs](https://www.hpe.com/psnow/doc/c04284501)'
-weight:
- - value: 17.92
- unit: kg
+weight: 17.92
+weight_unit: kg
console-ports:
- name: Serial
type: de-9
diff --git a/device-types/HPE/ProLiant-DL365-Gen11.yaml b/device-types/HPE/ProLiant-DL365-Gen11.yaml
index ed7f5fe8e9a2b47fdb59593107702fb57b44668b..22f99be65bf942fed6a6e9011d949f6a87f08fc2 100644
--- a/device-types/HPE/ProLiant-DL365-Gen11.yaml
+++ b/device-types/HPE/ProLiant-DL365-Gen11.yaml
@@ -6,9 +6,8 @@ u_height: 1
is_full_depth: true
part_number: P53933-B21
comments: '[HPE ProLiant DL365 Gen11 QuickSpecs](https://www.hpe.com/psnow/doc/a50004299enw)'
-weight:
- - value: 18.39
- unit: kg
+weight: 18.39
+weight_unit: kg
console-ports:
- name: Serial
type: de-9
diff --git a/device-types/Huawei/CE8850-64CQ-EI.yaml b/device-types/Huawei/CE8850-64CQ-EI.yaml
index 8a6af78c21eea5d58b315bf80376da2fd14fa281..8f31dc40ef6d15fd0a671545128da2a3a20b07fc 100644
--- a/device-types/Huawei/CE8850-64CQ-EI.yaml
+++ b/device-types/Huawei/CE8850-64CQ-EI.yaml
@@ -6,9 +6,8 @@ part_number: CE8850-64CQ-EI
u_height: 2
is_full_depth: true
comments: '[Huawei CE8850-64CQ-EI](https://support.huawei.com/enterprise/en/doc/EDOC1000019246/56d573f4/ce8850-64cq-ei)'
-weight:
- - value: 22.2
- unit: kg
+weight: 22.2
+weight_unit: kg
module-bays:
- name: FAN1
- name: FAN2
diff --git a/device-types/Huawei/CE8861-4C-EI.yaml b/device-types/Huawei/CE8861-4C-EI.yaml
index d65eadac5ec0658049ad94c326b13265c3d80ebd..74f6310c3a7837e1034e899a3bd41040da5e0ade 100644
--- a/device-types/Huawei/CE8861-4C-EI.yaml
+++ b/device-types/Huawei/CE8861-4C-EI.yaml
@@ -6,9 +6,8 @@ part_number: CE8861-4C-EI
u_height: 2
is_full_depth: true
comments: '[Huawei CE8861-4C-EI](https://support.huawei.com/enterprise/en/doc/EDOC1000019246/56e787dc/ce8861-4c-ei)'
-weight:
- - value: 21.3
- unit: kg
+weight: 21.3
+weight_unit: kg
module-bays:
- name: FAN1
- name: FAN2
diff --git a/device-types/Huawei/S5700-28P-LI-AC.yaml b/device-types/Huawei/S5700-28P-LI-AC.yaml
index 8c532bc760c8e5fdf9d7559a14f68b4c8a5aff4a..138d398105a9b9763df04e18993225953056995d 100644
--- a/device-types/Huawei/S5700-28P-LI-AC.yaml
+++ b/device-types/Huawei/S5700-28P-LI-AC.yaml
@@ -3,9 +3,8 @@ manufacturer: Huawei
model: S5700-28P-LI-AC
slug: huawei-S5700-28P-LI-AC
u_height: 1.0
-weight:
- - value: 2.8
- unit: kg
+weight: 2.8
+weight_unit: kg
is_full_depth: false
airflow: passive
comments: "S5700-28P-LI-AC (24*10/100/1000BASE-T ports, 4*1000BASE-X SFP ports, with integrated power module)\r\n\r\n [Datasheet:](https://support.huawei.com/enterprise/it/doc/EDOC1000013597/22fa8fb3/s5700-28p-li-ac)"
diff --git a/device-types/Huawei/S5700-28X-LI-AC.yaml b/device-types/Huawei/S5700-28X-LI-AC.yaml
index c9951acf2f10a0b357dfd6b7d92110c7e897b15c..0b9cd698e2204e4546ab04bdf9b7be6a1f59efcd 100644
--- a/device-types/Huawei/S5700-28X-LI-AC.yaml
+++ b/device-types/Huawei/S5700-28X-LI-AC.yaml
@@ -3,9 +3,8 @@ manufacturer: Huawei
model: S5700-28X-LI-AC
slug: huawei-s5700-28x-li-ac
u_height: 1.0
-weight:
- - value: 3.4
- unit: kg
+weight: 3.4
+weight_unit: kg
is_full_depth: true
airflow: left-to-right
comments: "S5700-28X-LI-AC (24*10/100/1000BASE-T ports,4*10GE SFP+ ports, with integrated power module)\r\n\r\nDatasheet: [Link](https://support.huawei.com/enterprise/it/doc/EDOC1000013597/1115c1d4/s5700-28x-li-ac)"
diff --git a/device-types/Inspur/NF5180M6.yaml b/device-types/Inspur/NF5180M6.yaml
index 6f7195228e573684a46b84d92478626a1fd60948..c5ad9790e81ed575c4de135cb3bd0927660a59f0 100644
--- a/device-types/Inspur/NF5180M6.yaml
+++ b/device-types/Inspur/NF5180M6.yaml
@@ -7,9 +7,8 @@ u_height: 1
is_full_depth: true
airflow: front-to-rear
comments: '[Inspur NF5180M6 Technical Specifications](https://en.inspur.com/en/servers/rack_servers/2552517/index.html)'
-weight:
- - value: 31
- unit: kg
+weight: 31
+weight_unit: kg
console-ports:
- name: BMC/System Serial
type: other
diff --git a/device-types/QNAP/TS-453D.yml b/device-types/QNAP/TS-453D.yml
index c59e75a754083e071019f67f4fd063e850887ff3..bec8ceb2ef32dbdb09aa1605dc66135e4d93cf4a 100644
--- a/device-types/QNAP/TS-453D.yml
+++ b/device-types/QNAP/TS-453D.yml
@@ -6,9 +6,8 @@ u_height: 0
part_number: TS-453d
airflow: side-to-rear
is_full_depth: false
-weight:
- - value: 3.6
- unit: kg
+weight: 3.6
+weight_unit: kg
comments: '[TS-453B | Hardware Specs | QNAP](https://www.qnap.com/en/product/ts-453d/specs/hardware)'
power-ports:
- name: Power
diff --git a/device-types/QTECH/QSW-6900-56F.yaml b/device-types/QTECH/QSW-6900-56F.yaml
index 772fd00b3b3cff45922c4b4a0226aa32bc393945..19f10a8a2aec2179200ef489ba040967edbadc75 100644
--- a/device-types/QTECH/QSW-6900-56F.yaml
+++ b/device-types/QTECH/QSW-6900-56F.yaml
@@ -6,9 +6,8 @@ slug: qtech-qsw-6900-56f
u_height: 1
is_full_depth: false
airflow: front-to-rear
-weight:
- - value: 8
- unit: kg
+weight: 8
+weight_unit: kg
comments: '[QTECH QSW-6900-56F](https://ftp.qtech.ru/Switch/Data%20Center/QSW-6900/Manual/Installation%20Guide%20%5bEng%5d/QSW-6900-56F%20Installation%20Manual_Eng.pdf)'
console-ports:
- name: console
diff --git a/device-types/QTECH/QSW-6900-56LF.yaml b/device-types/QTECH/QSW-6900-56LF.yaml
index c2dd734c4ed70a7cc44aac9fbd42aa9eaa1c2240..238d9098cff66f9f29bab1809af71cd1066df267 100644
--- a/device-types/QTECH/QSW-6900-56LF.yaml
+++ b/device-types/QTECH/QSW-6900-56LF.yaml
@@ -5,9 +5,8 @@ part_number: QSW-6900-56LF
slug: qtech-qsw-6900-56lf
u_height: 1
is_full_depth: false
-weight:
- - value: 8
- unit: kg
+weight: 8
+weight_unit: kg
airflow: front-to-rear
comments: '[QTECH QSW-6900-56LF](https://ftp.qtech.ru/Switch/Data%20Center/QSW-6900/Manual/Installation%20Guide%20%5bEng%5d/QSW-6900-56LF%20Installation%20Manual_Eng.pdf)'
console-ports:
diff --git a/device-types/Ubiquiti/USIP-R.yml b/device-types/Ubiquiti/USIP-R.yml
index 4b1f9e68c7508e9ccbab445570aee614fb1f4bca..c8ceb19f8f2e8c0c14b8bb3a907f1d6002ce4eea 100644
--- a/device-types/Ubiquiti/USIP-R.yml
+++ b/device-types/Ubiquiti/USIP-R.yml
@@ -6,9 +6,8 @@ part_number: UISP-R
u_height: 0
is_full_depth: false
airflow: passive
-weight:
- - value: 1.32
- unit: lb
+weight: 1.32
+weight_unit: lb
comments: '[UISP Router](https://store.ui.com/collections/operator-isp-infrastructure/products/uisp-router)'
power-ports:
- name: Input 27V
diff --git a/device-types/Ubiquiti/WAVE-LR.yaml b/device-types/Ubiquiti/WAVE-LR.yaml
index 2b4531b90446bf42547281829a2e84d17140bc36..3ccaed2a51f49feb7e3f25840b04c7ef586dd01b 100644
--- a/device-types/Ubiquiti/WAVE-LR.yaml
+++ b/device-types/Ubiquiti/WAVE-LR.yaml
@@ -6,9 +6,8 @@ part_number: Wave-LR
u_height: 0
is_full_depth: false
comments: The eth0 and prs0 are permanently bridged as this is a L2 bridge device. [](https://dl.ui.com/ds/wave-lr_ds.pdf)
-weight:
- - value: 5.7
- unit: lb
+weight: 5.7
+weight_unit: lb
interfaces:
- name: br0
type: bridge
diff --git a/device-types/Zyxel/VMG1312-B10A.yaml b/device-types/Zyxel/VMG1312-B10A.yaml
index f16faba13e485e0d7422145d6be3c373122f1300..e34af5c82fd7ed5cf8c0f141a7888cb27366731a 100644
--- a/device-types/Zyxel/VMG1312-B10A.yaml
+++ b/device-types/Zyxel/VMG1312-B10A.yaml
@@ -4,9 +4,8 @@ model: VMG1312-B10A
slug: zyxel-vmg1312-B10A
part_number: '402444'
u_height: 0
-weight:
- - value: 245
- unit: g
+weight: 245
+weight_unit: g
is_full_depth: false
airflow: passive
comments: '[VMG1312-B series specs](https://service-provider.zyxel.com/global/en/products/dsl-cpe/vdsl/modemresidential-gateways/vmg1312-b-series)'
diff --git a/schema/components.json b/schema/components.json
index 84be9d7eec093f48a8be1d753bc8c9be4d465f94..a16b5c28857f745488bb3fd90d22ff786c4ed8f2 100644
--- a/schema/components.json
+++ b/schema/components.json
@@ -600,27 +600,6 @@
}
},
"required": ["name"]
- },
-
- "weight": {
- "type": "object",
- "properties": {
- "value": {
- "type": "number",
- "minimum": 0,
- "multipleOf": 0.01
- },
- "unit": {
- "type": "string",
- "enum": [
- "kg",
- "g",
- "lb",
- "oz"
- ]
- }
- },
- "required": ["value", "unit"]
}
}
diff --git a/schema/devicetype.json b/schema/devicetype.json
index 6b9795232998e94aea8c829619337c77798967bb..5a7c1ac4526a37e268df2334ba40ef764e8b0aa6 100644
--- a/schema/devicetype.json
+++ b/schema/devicetype.json
@@ -34,11 +34,18 @@
]
},
"weight": {
- "type": "array",
- "items": {
- "$ref": "components.json#/definitions/weight"
- },
- "maxItems": 1
+ "type": "number",
+ "minimum": 0,
+ "multipleOf": 0.01
+ },
+ "weight_unit": {
+ "type": "string",
+ "enum": [
+ "kg",
+ "g",
+ "lb",
+ "oz"
+ ]
},
"subdevice_role": {
"type": "string",
diff --git a/schema/moduletype.json b/schema/moduletype.json
index edd4df88746d8e8552fe0e38d5c27c9c320e56ac..e0b972ca23de394e5b1a7d27c465508164416478 100644
--- a/schema/moduletype.json
+++ b/schema/moduletype.json
@@ -10,6 +10,20 @@
"part_number": {
"type": "string"
},
+ "weight": {
+ "type": "number",
+ "minimum": 0,
+ "multipleOf": 0.01
+ },
+ "weight_unit": {
+ "type": "string",
+ "enum": [
+ "kg",
+ "g",
+ "lb",
+ "oz"
+ ]
+ },
"console-ports": {
"type": "array",
"items": {
@@ -54,13 +68,6 @@
},
"comments": {
"type": "string"
- },
- "weight": {
- "type": "array",
- "items": {
- "$ref": "components.json#/definitions/weight"
- },
- "maxItems": 1
}
},
"required": ["manufacturer", "model"],