From 5a494d04871518828f5228ffe091436f0806aeda Mon Sep 17 00:00:00 2001 From: Kristin Davidson Date: Mon, 24 Jan 2022 12:42:40 -0600 Subject: [PATCH] Update Ubiquiti USW-Aggregation and UDM-Pro (#622) * Update Ubiquiti USW-Aggregation switch to 8 ports instead of 10 * Update UDM-Pro model name to be the full name, add part number, airflow, and make it not full-depth * Include UniFi brand name in UDM-Pro model name * Add airflow field to device type schema --- .gitignore | 1 + device-types/Ubiquiti/UDM-Pro.yaml | 6 ++++-- device-types/Ubiquiti/USW-Aggregation.yaml | 6 +----- tests/schema.json | 11 +++++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c0f80e269c..c11db15e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc .idea .DS_Store +venv/ diff --git a/device-types/Ubiquiti/UDM-Pro.yaml b/device-types/Ubiquiti/UDM-Pro.yaml index 90d65422dc..c43ac6514c 100644 --- a/device-types/Ubiquiti/UDM-Pro.yaml +++ b/device-types/Ubiquiti/UDM-Pro.yaml @@ -1,7 +1,9 @@ --- manufacturer: Ubiquiti -model: UDM-PRO +model: UniFi Dream Machine Pro slug: udm-pro +airflow: front-to-rear +part_number: UDM-Pro comments: | [UniFi Dream Machine Pro](https://store.ui.com/products/udm-pro) @@ -9,7 +11,7 @@ comments: | Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24") u_height: 1 -is_full_depth: true +is_full_depth: false interfaces: - name: eth0 type: 1000base-t diff --git a/device-types/Ubiquiti/USW-Aggregation.yaml b/device-types/Ubiquiti/USW-Aggregation.yaml index ad732681dc..3409242d0b 100644 --- a/device-types/Ubiquiti/USW-Aggregation.yaml +++ b/device-types/Ubiquiti/USW-Aggregation.yaml @@ -4,7 +4,7 @@ model: UniFi Switch Aggregation slug: unifi-switch-aggregation part_number: USW-Aggregation comments: | - UniFi Switch 16 Aggregation, 10G 10-Port Managed Aggregation Switch, 30W, (10) SFP+ + UniFi Switch Aggregation, 10G 8-Port Managed Aggregation Switch, 30W, (8) SFP+ Dimensions: 442.4 x 120 x 43.7 mm (17.42 x 4.72 x 1.72") u_height: 1 @@ -26,10 +26,6 @@ interfaces: type: 10gbase-x-sfpp - name: SFP+ 8 type: 10gbase-x-sfpp - - name: SFP+ 9 - type: 10gbase-x-sfpp - - name: SFP+ 10 - type: 10gbase-x-sfpp power-ports: - name: Input type: iec-60320-c14 diff --git a/tests/schema.json b/tests/schema.json index 5a90275c54..d69728bebf 100644 --- a/tests/schema.json +++ b/tests/schema.json @@ -21,6 +21,17 @@ "is_full_depth": { "type": "boolean" }, + "airflow": { + "type": "string", + "enum": [ + "front-to-rear", + "rear-to-front", + "left-to-right", + "right-to-left", + "side-to-rear", + "passive" + ] + }, "subdevice_role": { "type": "string", "enum": [