From 531275a7720ceab20b7fe99ae96fcb565cd77091 Mon Sep 17 00:00:00 2001 From: Harry Date: Fri, 23 May 2025 15:32:33 +0100 Subject: [PATCH] Requirements update (#3184) * Update components.json added 64 character limit to name for interface and console ports names * Update components.json added max length * Update README.md * Update README.md * Update README.md * Update device_types.py added checks for POE interfaces * Added poe_type to interfaces * Added poe_types * Added poe type * added required fields --- README.md | 53 +++++++++------- device-types/Cisco/AIR-AP1562D-B-K9.yaml | 1 + device-types/Cisco/AIR-AP1562I-B-K9.yaml | 1 + device-types/Cisco/AIR-AP1572EAC-B-K9.yaml | 1 + device-types/Cisco/AIR-AP1832I-E-K9.yaml | 1 + device-types/Cisco/AIR-AP1852I-E-K9.yaml | 1 + device-types/Cisco/AIR-AP2802E-B-K9.yaml | 1 + device-types/Cisco/AIR-AP2802E-E-K9.yaml | 1 + device-types/Cisco/AIR-AP2802I-B-K9.yaml | 1 + device-types/Cisco/AIR-AP2802I-E-K9.yaml | 1 + device-types/Cisco/AIR-AP3802E-B-K9.yaml | 9 ++- device-types/Cisco/AIR-AP3802I-B-K9.yaml | 9 ++- device-types/Cisco/AIR-BR1310G-A-K9-R.yaml | 4 +- device-types/Cisco/AIR-BR1310G-E-K9-R.yaml | 4 +- device-types/Cisco/AIR-CAP1532E-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP1552H-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP1552H-B-K9.yaml | 1 + device-types/Cisco/AIR-CAP2602E-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP2602I-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP2602I-B-K9.yaml | 1 + device-types/Cisco/AIR-CAP2702I-E-K9.yaml | 1 + device-types/Cisco/AIR-CAP3502E-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP3602E-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP3602I-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP3602I-B-K9.yaml | 1 + device-types/Cisco/AIR-CAP3702E-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP3702E-B-K9.yaml | 1 + device-types/Cisco/AIR-CAP3702I-A-K9.yaml | 1 + device-types/Cisco/AIR-CAP3702I-B-K9.yaml | 1 + device-types/Cisco/AIR-CT2504-K9.yaml | 4 +- device-types/Cisco/AIR-LAP1242AG-A-K9.yaml | 1 + device-types/Cisco/AIR-LAP1522HZ-A-K9.yaml | 1 + device-types/Cisco/C9105AXI-E.yaml | 1 + device-types/Cisco/C9115AXI-E.yaml | 1 + device-types/Cisco/C9120AXI-E.yaml | 1 + device-types/Cisco/C9120AXI-K.yaml | 1 + device-types/Cisco/C9124AXI-E.yaml | 1 + device-types/Cisco/C9130AXI-B.yaml | 1 + device-types/Cisco/C9130AXI-E.yaml | 1 + device-types/Cisco/C9136I-E.yaml | 2 + device-types/Cisco/Meraki-MR36.yaml | 3 +- device-types/Cisco/Meraki-MR44.yaml | 1 + device-types/Cisco/Meraki-MR46.yaml | 1 + device-types/Cisco/Meraki-MR52.yaml | 1 + device-types/Cisco/Meraki-MR53.yaml | 1 + device-types/Cisco/Meraki-MR53E.yaml | 1 + device-types/Cisco/Meraki-MR56.yaml | 3 +- device-types/Cisco/Meraki-MR57.yaml | 5 +- device-types/Cisco/Meraki-MR74.yaml | 5 +- device-types/Cisco/Meraki-MR86.yaml | 5 +- device-types/Cisco/Meraki-MS120-24.yaml | 24 ------- device-types/Ericsson/GRU0401.yml | 2 + device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml | 1 + device-types/MikroTik/RBLHGR&R11e-LTE6.yaml | 1 + device-types/MikroTik/RBSXTR&R11e-LTE6.yaml | 3 + device-types/Mimosa Networks/a5.yaml | 4 ++ device-types/Mimosa Networks/a5c.yaml | 4 ++ device-types/Mimosa Networks/a5x.yaml | 4 ++ device-types/Mimosa Networks/b5c.yaml | 1 + device-types/Mimosa Networks/b5x.yaml | 4 ++ device-types/Mimosa Networks/c5c.yaml | 4 ++ device-types/Mimosa Networks/c5x.yaml | 4 ++ device-types/Mimosa Networks/c6x.yaml | 4 ++ device-types/Ubiquiti/Bullet-M2.yaml | 4 ++ device-types/Ubiquiti/LBE-5AC-23.yaml | 4 ++ device-types/Ubiquiti/LBE-5AC-Gen2.yaml | 4 ++ device-types/Ubiquiti/LiteAP-120.yaml | 5 ++ device-types/Ubiquiti/NanoBeam-2AC-13.yaml | 4 ++ device-types/Ubiquiti/NanoBeam-5AC-19.yaml | 2 + device-types/Ubiquiti/NanoBeam-5AC-Gen2.yaml | 6 +- device-types/Ubiquiti/NanoBeam-M5-19.yaml | 4 ++ device-types/Ubiquiti/NanoStation-5AC.yaml | 4 ++ .../Ubiquiti/NanoStation-LOCO-5AC.yaml | 4 ++ .../Ubiquiti/NanoStation-LOCO-M2.yaml | 4 ++ .../Ubiquiti/NanoStation-LOCO-M5.yaml | 4 ++ .../Ubiquiti/NanoStation-LOCO-M900.yaml | 4 ++ device-types/Ubiquiti/NanoStation-M2.yaml | 4 ++ device-types/Ubiquiti/NanoStation-M5.yaml | 4 ++ device-types/Ubiquiti/PicoStation-M2.yaml | 4 ++ device-types/Ubiquiti/PowerBeam-2AC-400.yaml | 4 ++ device-types/Ubiquiti/PowerBeam-5AC-300.yaml | 2 + device-types/Ubiquiti/PowerBeam-5AC-500.yaml | 4 ++ device-types/Ubiquiti/PowerBeam-5AC-Gen2.yaml | 4 ++ device-types/Ubiquiti/PowerBeam-M2-400.yaml | 4 ++ device-types/Ubiquiti/R2AC-PRISM.yaml | 4 ++ device-types/Ubiquiti/RP-5AC-Gen2.yaml | 4 ++ device-types/Ubiquiti/Rocket-M2-Titanium.yaml | 6 +- device-types/Ubiquiti/Rocket-M2.yaml | 4 ++ device-types/Ubiquiti/Rocket-M5.yaml | 4 ++ device-types/Ubiquiti/Rocket-M900.yaml | 4 ++ device-types/Ubiquiti/UAP-AC-Lite.yaml | 2 + device-types/Ubiquiti/UAP-AC-M.yaml | 4 ++ device-types/Ubiquiti/USW-Flex-Mini.yaml | 4 ++ device-types/Ubiquiti/USW-Flex.yaml | 8 +++ device-types/Ubiquiti/WAVE-LR.yaml | 1 + device-types/Ubiquiti/airFiber-5XHD.yml | 1 + device-types/Ubiquiti/airFiber-60-HD.yml | 1 + device-types/Ubiquiti/airFiber-60-LR.yml | 1 + device-types/Ubiquiti/airFiber-60.yml | 1 + device-types/YAMAHA/SWX2322P-16MT.yaml | 24 +++---- module-types/ZPE/NSR-16ETH-EXPN.yaml | 32 +++++----- schema/components.json | 63 ++++++++++++------- tests/device_types.py | 11 ++++ 103 files changed, 348 insertions(+), 118 deletions(-) diff --git a/README.md b/README.md index 1353ccb91..ad069460b 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,8 @@ new device type definitions manually. If you would like to contribute to this library, please read through our [contributing guide](CONTRIBUTING.md) before submitting content. -**Note: As of March 2023 Netbox-Device-Type-Library-Import has been brought into the NetBox Community Organization. We will work to get this fully supported soon.** -If you would like to automate the import of these devicetype template files, there is a NetBox Community ~~**community based**~~ python script -that will check for duplicates, allow you to selectively import vendors, etc. available here [netbox-community/Device-Type-Library-Import](https://github.com/netbox-community/Device-Type-Library-Import). ~~**Note**: This is not related to NetBox in any official way and you will not get support for it here.~~ +If you would like to automate the import of these devicetype template files, there is a NetBox Community python script +that will check for duplicates, allow you to selectively import vendors, etc. available here [netbox-community/Device-Type-Library-Import](https://github.com/netbox-community/Device-Type-Library-Import). ## Device Type Definitions @@ -25,27 +24,31 @@ Each definition **must** include at minimum the following fields: - `slug`: A URL-friendly representation of the model number. Like the model number, this must be unique per manufacturer. All slugs should have the manufacturers name prepended to it with a dash, please see the example below. - Type: String - - Pattern: `"^[-a-zA-Z0-9_]+$"`. Must match the following characters: `-`, `_`, Uppercase or Lowercase `a` to `z`, Numbers `0` to `9`. + - Pattern: `"^[-a-z0-9_]+$"`. Must match the following characters: `-`, Lowercase `a` to `z`, Numbers `0` to `9`. +- `u_height`: The height of the device type in rack units. Increments of 0.5U are supported. (**Note: For Child devices u_height must be 0**) + - Type: number (minimum of `0`, multiple of `0.5` + - :test_tube: Example: `u_height: 12.5` +- `is_full_depth`: A boolean which indicates whether the device type consumes both the front and rear rack faces. (**Default: true**) + - Type: Boolean + - :test_tube: Example: `is_full_depth: false` :test_tube: Example: ```yaml manufacturer: Dell - model: PowerEdge R6515 - slug: dell-poweredge-r6515 + model: PowerEdge R670 + slug: dell-poweredge-r670 + u_height: 1 + is_full_depth: true ``` +**Note: We are asking that all new deivces also include the following optional fields: `airflow`, `weight` and `weight_unit`.** + The following fields may **optionally** be declared: - `part_number`: An alternative representation of the model number (e.g. a SKU). (**Default: None**) - Type: String - :test_tube: Example: `part_number: D109-C3` -- `u_height`: The height of the device type in rack units. Increments of 0.5U are supported. (**Default: 1**) - - Type: number (minimum of `0`, multiple of `0.5`) - - :test_tube: Example: `u_height: 12.5` -- `is_full_depth`: A boolean which indicates whether the device type consumes both the front and rear rack faces. (**Default: true**) - - Type: Boolean - - :test_tube: Example: `is_full_depth: false` - `airflow`: A declaration of the airflow pattern for the device. (**Default: None**) - Type: String - Options: @@ -54,16 +57,20 @@ The following fields may **optionally** be declared: - `left-to-right` - `right-to-left` - `side-to-rear` + - `rear-to-side` + - `bottom-to-top` + - `top-to-bottom` - `passive` + - `mixed` - :test_tube: Example: `airflow: side-to-rear` - `front_image`: Indicates that this device has a front elevation image within the [elevation-images](elevation-images/) folder. (**Default: None**) - NOTE: The elevation images folder requires the same folder name as this device. The file name must also adhere to .front. - Type: Boolean - - :test_tube: Example: `front_image: True` + - :test_tube: Example: `front_image: true` - `rear_image`: Indicates that this device has a rear elevation image within the [elevation-images](elevation-images/) folder. (**Default: None**) - NOTE: The elevation images folder requires the same folder name as this device. The file name must also adhere to .rear. - Type: Boolean - - :test_tube: Example: `rear_image: True` + - :test_tube: Example: `rear_image: true` - `subdevice_role`: Indicates that this is a `parent` or `child` device. (**Default: None**) - Type: String - Options: @@ -73,7 +80,7 @@ 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` -- `is_powered`: A boolean which indicates whether the device type does not take power. This is mainly used as a workaround for validation testing on non-devices (i.e. rackmount kits for mounting desktop devices) (**Default: True**) +- `is_powered`: A boolean which indicates whether the device type does not take power. This is mainly used as a workaround for validation testing on non powered devices (i.e. rackmount kits or patch pannels.) (**Default: True**) - Type: Boolean - :test_tube: Example: `is_powered: false` - `weight`: A number representing the numeric weight value. Must be a multiple of 0.01 (2 decimal places). (**Default: None**) @@ -81,11 +88,11 @@ The following fields may **optionally** be declared: - 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 + - Options: + - `kg` + - `g` + - `lb` + - `oz` - :test_tube: Example: ```yaml @@ -140,6 +147,7 @@ A console server is a device which provides remote access to the local consoles **[Documentation](https://docs.netbox.dev/en/stable/models/dcim/powerport/)** A power port is a device component which draws power from some external source (e.g. an upstream power outlet), and generally represents a power supply internal to a device. +**Note: Devices that have removeable Power Supplies, Like FRUs, should be modeled in the device as `module-bays` and then the PSU module should have the required `power-port`** - `name`: Name - `label`: Label @@ -169,6 +177,8 @@ Interfaces in NetBox represent network interfaces used to exchange data with con - `label`: Label - `type`: Interface type slug (Array) - `mgmt_only`: A boolean which indicates whether this interface is used for management purposes only (default: false) +- `poe_mode` : For if a device is POE powered (pd) or provides POE (pse) +- `poe_type` : The classification of PoE transmission supported, for PoE-enabled interfaces. #### Front Ports @@ -199,6 +209,7 @@ Like front ports, rear ports are pass-through ports which represent the continua **[Documentation](https://docs.netbox.dev/en/stable/models/dcim/modulebay/)** Module bays represent a space or slot within a device in which a field-replaceable module may be installed. A common example is that of a chassis-based switch such as the Cisco Nexus 9000 or Juniper EX9200. Modules in turn hold additional components that become available to the parent device. +**Note: Field Replacable Power Supply’s should also be modeled as module bays** - `name`: Name - `label`: Label @@ -244,7 +255,7 @@ There are two ways this repo focuses on keeping quality device-type definitions: - To install the pre-commit script: `pre-commit install` - Usage & Useful `pre-commit` Commands - After staging your files with `git`, to run the pre-commit script on changed files: `pre-commit run` - - To run the pre-commit script on all files: `pre-commit run --all` + - To run the pre-commit script on all files: `pre-commit run -a` - To uninstall the pre-commit script: `pre-commit uninstall` - Learn more about [pre-commit](https://pre-commit.com/) - **GitHub Actions** - Automatically run before a PR can be merged. Repeats yamllint & validates against NetBox Device-Type Schema. diff --git a/device-types/Cisco/AIR-AP1562D-B-K9.yaml b/device-types/Cisco/AIR-AP1562D-B-K9.yaml index cbf75b3e4..ccc73b93d 100644 --- a/device-types/Cisco/AIR-AP1562D-B-K9.yaml +++ b/device-types/Cisco/AIR-AP1562D-B-K9.yaml @@ -9,5 +9,6 @@ interfaces: - name: WAN type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: WiFi type: ieee802.11ac diff --git a/device-types/Cisco/AIR-AP1562I-B-K9.yaml b/device-types/Cisco/AIR-AP1562I-B-K9.yaml index 9143a62d8..a570cc432 100644 --- a/device-types/Cisco/AIR-AP1562I-B-K9.yaml +++ b/device-types/Cisco/AIR-AP1562I-B-K9.yaml @@ -9,5 +9,6 @@ interfaces: - name: WAN type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: WiFi type: ieee802.11ac diff --git a/device-types/Cisco/AIR-AP1572EAC-B-K9.yaml b/device-types/Cisco/AIR-AP1572EAC-B-K9.yaml index 61a878a87..7be0017f3 100644 --- a/device-types/Cisco/AIR-AP1572EAC-B-K9.yaml +++ b/device-types/Cisco/AIR-AP1572EAC-B-K9.yaml @@ -9,5 +9,6 @@ interfaces: - name: WAN type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: WiFi type: ieee802.11ac diff --git a/device-types/Cisco/AIR-AP1832I-E-K9.yaml b/device-types/Cisco/AIR-AP1832I-E-K9.yaml index 11b68bb1a..8944e46f7 100644 --- a/device-types/Cisco/AIR-AP1832I-E-K9.yaml +++ b/device-types/Cisco/AIR-AP1832I-E-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/AIR-AP1852I-E-K9.yaml b/device-types/Cisco/AIR-AP1852I-E-K9.yaml index 623b8fc2a..43084c758 100644 --- a/device-types/Cisco/AIR-AP1852I-E-K9.yaml +++ b/device-types/Cisco/AIR-AP1852I-E-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: LAN1 type: 1000base-t console-ports: diff --git a/device-types/Cisco/AIR-AP2802E-B-K9.yaml b/device-types/Cisco/AIR-AP2802E-B-K9.yaml index a459d0e3d..3816741de 100644 --- a/device-types/Cisco/AIR-AP2802E-B-K9.yaml +++ b/device-types/Cisco/AIR-AP2802E-B-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/AIR-AP2802E-E-K9.yaml b/device-types/Cisco/AIR-AP2802E-E-K9.yaml index 8e87ccd26..2d08ea5d0 100644 --- a/device-types/Cisco/AIR-AP2802E-E-K9.yaml +++ b/device-types/Cisco/AIR-AP2802E-E-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: LAN1 type: 1000base-t console-ports: diff --git a/device-types/Cisco/AIR-AP2802I-B-K9.yaml b/device-types/Cisco/AIR-AP2802I-B-K9.yaml index 7b2c3731e..2f7667a74 100644 --- a/device-types/Cisco/AIR-AP2802I-B-K9.yaml +++ b/device-types/Cisco/AIR-AP2802I-B-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/AIR-AP2802I-E-K9.yaml b/device-types/Cisco/AIR-AP2802I-E-K9.yaml index 850a4e580..814b1c34d 100644 --- a/device-types/Cisco/AIR-AP2802I-E-K9.yaml +++ b/device-types/Cisco/AIR-AP2802I-E-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: LAN1 type: 1000base-t console-ports: diff --git a/device-types/Cisco/AIR-AP3802E-B-K9.yaml b/device-types/Cisco/AIR-AP3802E-B-K9.yaml index bc0768095..a28bdedc1 100644 --- a/device-types/Cisco/AIR-AP3802E-B-K9.yaml +++ b/device-types/Cisco/AIR-AP3802E-B-K9.yaml @@ -10,14 +10,13 @@ weight: 2.09 weight_unit: kg interfaces: - name: GigabitEthernet0 - type: 1000base-t + type: 5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: GigabitEthernet1 - type: 1000base-t - poe_mode: pd - - name: TenGigabitEthernet0 - type: 10gbase-t + type: 5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: GigabitEthernet3 type: 1000base-t - name: Dot11Radio0 diff --git a/device-types/Cisco/AIR-AP3802I-B-K9.yaml b/device-types/Cisco/AIR-AP3802I-B-K9.yaml index 0a9b00ad1..b682dea90 100644 --- a/device-types/Cisco/AIR-AP3802I-B-K9.yaml +++ b/device-types/Cisco/AIR-AP3802I-B-K9.yaml @@ -10,14 +10,13 @@ weight: 2.09 weight_unit: kg interfaces: - name: GigabitEthernet0 - type: 1000base-t + type: 5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: GigabitEthernet1 - type: 1000base-t - poe_mode: pd - - name: TenGigabitEthernet0 - type: 10gbase-t + type: 5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: GigabitEthernet3 type: 1000base-t - name: Dot11Radio0 diff --git a/device-types/Cisco/AIR-BR1310G-A-K9-R.yaml b/device-types/Cisco/AIR-BR1310G-A-K9-R.yaml index 704ab938d..24c1e39ae 100644 --- a/device-types/Cisco/AIR-BR1310G-A-K9-R.yaml +++ b/device-types/Cisco/AIR-BR1310G-A-K9-R.yaml @@ -8,6 +8,8 @@ is_full_depth: false interfaces: - name: FastEthernet0 type: 100base-tx - poe_mode: pd - name: Dot11Radio0 type: ieee802.11g +power-ports: + - name: Power + type: dc-terminal diff --git a/device-types/Cisco/AIR-BR1310G-E-K9-R.yaml b/device-types/Cisco/AIR-BR1310G-E-K9-R.yaml index a009b1d83..135a1c1a6 100644 --- a/device-types/Cisco/AIR-BR1310G-E-K9-R.yaml +++ b/device-types/Cisco/AIR-BR1310G-E-K9-R.yaml @@ -8,6 +8,8 @@ is_full_depth: false interfaces: - name: FastEthernet0 type: 100base-tx - poe_mode: pd - name: Dot11Radio0 type: ieee802.11g +power-ports: + - name: Power + type: dc-terminal diff --git a/device-types/Cisco/AIR-CAP1532E-A-K9.yaml b/device-types/Cisco/AIR-CAP1532E-A-K9.yaml index 1faaa6564..e9c14c2db 100644 --- a/device-types/Cisco/AIR-CAP1532E-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP1532E-A-K9.yaml @@ -12,6 +12,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: GigabitEthernet1 type: 1000base-t - name: WiFi diff --git a/device-types/Cisco/AIR-CAP1552H-A-K9.yaml b/device-types/Cisco/AIR-CAP1552H-A-K9.yaml index 91cbcbf2a..91fe72ec4 100644 --- a/device-types/Cisco/AIR-CAP1552H-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP1552H-A-K9.yaml @@ -9,6 +9,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: WiFi type: ieee802.11n console-ports: diff --git a/device-types/Cisco/AIR-CAP1552H-B-K9.yaml b/device-types/Cisco/AIR-CAP1552H-B-K9.yaml index fec07516a..d6f4acaa2 100644 --- a/device-types/Cisco/AIR-CAP1552H-B-K9.yaml +++ b/device-types/Cisco/AIR-CAP1552H-B-K9.yaml @@ -9,6 +9,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: WiFi type: ieee802.11n console-ports: diff --git a/device-types/Cisco/AIR-CAP2602E-A-K9.yaml b/device-types/Cisco/AIR-CAP2602E-A-K9.yaml index 0a4b282e4..734055d55 100644 --- a/device-types/Cisco/AIR-CAP2602E-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP2602E-A-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP2602I-A-K9.yaml b/device-types/Cisco/AIR-CAP2602I-A-K9.yaml index c23b0a590..6980fa2e8 100644 --- a/device-types/Cisco/AIR-CAP2602I-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP2602I-A-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP2602I-B-K9.yaml b/device-types/Cisco/AIR-CAP2602I-B-K9.yaml index 20cd9299b..f1e400219 100644 --- a/device-types/Cisco/AIR-CAP2602I-B-K9.yaml +++ b/device-types/Cisco/AIR-CAP2602I-B-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP2702I-E-K9.yaml b/device-types/Cisco/AIR-CAP2702I-E-K9.yaml index 7224896f1..efdc29c40 100644 --- a/device-types/Cisco/AIR-CAP2702I-E-K9.yaml +++ b/device-types/Cisco/AIR-CAP2702I-E-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: GigabitEthernet1 type: 1000base-t console-ports: diff --git a/device-types/Cisco/AIR-CAP3502E-A-K9.yaml b/device-types/Cisco/AIR-CAP3502E-A-K9.yaml index 8af7010b3..b452063dd 100644 --- a/device-types/Cisco/AIR-CAP3502E-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP3502E-A-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP3602E-A-K9.yaml b/device-types/Cisco/AIR-CAP3602E-A-K9.yaml index 8f277aa6d..0c4325ff2 100644 --- a/device-types/Cisco/AIR-CAP3602E-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP3602E-A-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP3602I-A-K9.yaml b/device-types/Cisco/AIR-CAP3602I-A-K9.yaml index 6ac1b39c4..94a1f141c 100644 --- a/device-types/Cisco/AIR-CAP3602I-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP3602I-A-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP3602I-B-K9.yaml b/device-types/Cisco/AIR-CAP3602I-B-K9.yaml index a0d6ab96c..20bcc7586 100644 --- a/device-types/Cisco/AIR-CAP3602I-B-K9.yaml +++ b/device-types/Cisco/AIR-CAP3602I-B-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP3702E-A-K9.yaml b/device-types/Cisco/AIR-CAP3702E-A-K9.yaml index c0a19e544..7e9a2da96 100644 --- a/device-types/Cisco/AIR-CAP3702E-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP3702E-A-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP3702E-B-K9.yaml b/device-types/Cisco/AIR-CAP3702E-B-K9.yaml index 157eac35e..e3600d404 100644 --- a/device-types/Cisco/AIR-CAP3702E-B-K9.yaml +++ b/device-types/Cisco/AIR-CAP3702E-B-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP3702I-A-K9.yaml b/device-types/Cisco/AIR-CAP3702I-A-K9.yaml index 770e59fd3..23bb2573b 100644 --- a/device-types/Cisco/AIR-CAP3702I-A-K9.yaml +++ b/device-types/Cisco/AIR-CAP3702I-A-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CAP3702I-B-K9.yaml b/device-types/Cisco/AIR-CAP3702I-B-K9.yaml index ccff07e1f..633213e8f 100644 --- a/device-types/Cisco/AIR-CAP3702I-B-K9.yaml +++ b/device-types/Cisco/AIR-CAP3702I-B-K9.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: Con type: rj-45 diff --git a/device-types/Cisco/AIR-CT2504-K9.yaml b/device-types/Cisco/AIR-CT2504-K9.yaml index addd36c4a..d2c8d240a 100644 --- a/device-types/Cisco/AIR-CT2504-K9.yaml +++ b/device-types/Cisco/AIR-CT2504-K9.yaml @@ -19,16 +19,16 @@ interfaces: type: ieee802.11ac - name: GigabitEthernet0 type: 1000base-t - poe_mode: pd - name: GigabitEthernet1 type: 1000base-t - poe_mode: pd - name: GigabitEthernet2 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: GigabitEthernet3 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af power-ports: - name: PS1 type: iec-60320-c14 diff --git a/device-types/Cisco/AIR-LAP1242AG-A-K9.yaml b/device-types/Cisco/AIR-LAP1242AG-A-K9.yaml index 15e006461..f7aedc3c8 100644 --- a/device-types/Cisco/AIR-LAP1242AG-A-K9.yaml +++ b/device-types/Cisco/AIR-LAP1242AG-A-K9.yaml @@ -9,5 +9,6 @@ interfaces: - name: WAN type: 100base-tx poe_mode: pd + poe_type: type2-ieee802.3at - name: WiFi type: ieee802.11g diff --git a/device-types/Cisco/AIR-LAP1522HZ-A-K9.yaml b/device-types/Cisco/AIR-LAP1522HZ-A-K9.yaml index a0dac39aa..8710c1b16 100644 --- a/device-types/Cisco/AIR-LAP1522HZ-A-K9.yaml +++ b/device-types/Cisco/AIR-LAP1522HZ-A-K9.yaml @@ -9,5 +9,6 @@ interfaces: - name: WAN type: 100base-tx poe_mode: pd + poe_type: type2-ieee802.3at - name: WiFi type: ieee802.11g diff --git a/device-types/Cisco/C9105AXI-E.yaml b/device-types/Cisco/C9105AXI-E.yaml index 14dc20de4..773d954f2 100644 --- a/device-types/Cisco/C9105AXI-E.yaml +++ b/device-types/Cisco/C9105AXI-E.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/C9115AXI-E.yaml b/device-types/Cisco/C9115AXI-E.yaml index 675f698d7..65e0f850f 100644 --- a/device-types/Cisco/C9115AXI-E.yaml +++ b/device-types/Cisco/C9115AXI-E.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/C9120AXI-E.yaml b/device-types/Cisco/C9120AXI-E.yaml index cd7d351ea..3bddea77b 100644 --- a/device-types/Cisco/C9120AXI-E.yaml +++ b/device-types/Cisco/C9120AXI-E.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/C9120AXI-K.yaml b/device-types/Cisco/C9120AXI-K.yaml index 41ef9b3b7..b9a97f94b 100644 --- a/device-types/Cisco/C9120AXI-K.yaml +++ b/device-types/Cisco/C9120AXI-K.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/C9124AXI-E.yaml b/device-types/Cisco/C9124AXI-E.yaml index 843fa2291..c1aee3e02 100644 --- a/device-types/Cisco/C9124AXI-E.yaml +++ b/device-types/Cisco/C9124AXI-E.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 2.5gbase-t poe_mode: pd + poe_type: type3-ieee802.3bt console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/C9130AXI-B.yaml b/device-types/Cisco/C9130AXI-B.yaml index f9f018b28..c3e7ad3cd 100644 --- a/device-types/Cisco/C9130AXI-B.yaml +++ b/device-types/Cisco/C9130AXI-B.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 5gbase-t poe_mode: pd + poe_type: type3-ieee802.3bt console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/C9130AXI-E.yaml b/device-types/Cisco/C9130AXI-E.yaml index ba45827f4..3337677f2 100644 --- a/device-types/Cisco/C9130AXI-E.yaml +++ b/device-types/Cisco/C9130AXI-E.yaml @@ -16,6 +16,7 @@ interfaces: - name: GigabitEthernet0 type: 5gbase-t poe_mode: pd + poe_type: type3-ieee802.3bt console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/C9136I-E.yaml b/device-types/Cisco/C9136I-E.yaml index 530ab492b..c2b16c73c 100644 --- a/device-types/Cisco/C9136I-E.yaml +++ b/device-types/Cisco/C9136I-E.yaml @@ -20,9 +20,11 @@ interfaces: - name: GigabitEthernet0 type: 5gbase-t poe_mode: pd + poe_type: type3-ieee802.3bt - name: GigabitEthernet1 type: 5gbase-t poe_mode: pd + poe_type: type3-ieee802.3bt console-ports: - name: console type: rj-45 diff --git a/device-types/Cisco/Meraki-MR36.yaml b/device-types/Cisco/Meraki-MR36.yaml index 5b565225f..eb98c5b1d 100644 --- a/device-types/Cisco/Meraki-MR36.yaml +++ b/device-types/Cisco/Meraki-MR36.yaml @@ -9,8 +9,9 @@ comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Spe \n- IEEE Standards: 802.11a, 802.11ac, 802.11ax, 802.11b, 802.11e, 802.11g, 802.11h, 802.11i, 802.11k, 802.11n, 802.11r, and 802.11u" interfaces: - name: main - type: 2.5gbase-t + type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: wlan0 type: ieee802.11n - name: wlan1 diff --git a/device-types/Cisco/Meraki-MR44.yaml b/device-types/Cisco/Meraki-MR44.yaml index ee57b0404..76dbeaae7 100644 --- a/device-types/Cisco/Meraki-MR44.yaml +++ b/device-types/Cisco/Meraki-MR44.yaml @@ -14,6 +14,7 @@ interfaces: - name: main type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: wlan0 type: ieee802.11ax - name: wlan1 diff --git a/device-types/Cisco/Meraki-MR46.yaml b/device-types/Cisco/Meraki-MR46.yaml index a231d5629..cc17a99dd 100644 --- a/device-types/Cisco/Meraki-MR46.yaml +++ b/device-types/Cisco/Meraki-MR46.yaml @@ -14,6 +14,7 @@ interfaces: - name: main type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: wlan0 type: ieee802.11ax - name: wlan1 diff --git a/device-types/Cisco/Meraki-MR52.yaml b/device-types/Cisco/Meraki-MR52.yaml index f1d49a4bf..81634070b 100644 --- a/device-types/Cisco/Meraki-MR52.yaml +++ b/device-types/Cisco/Meraki-MR52.yaml @@ -13,6 +13,7 @@ interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: eth1 type: 1000base-t - name: wlan0 diff --git a/device-types/Cisco/Meraki-MR53.yaml b/device-types/Cisco/Meraki-MR53.yaml index a33f0ee55..7a14b60fb 100644 --- a/device-types/Cisco/Meraki-MR53.yaml +++ b/device-types/Cisco/Meraki-MR53.yaml @@ -11,6 +11,7 @@ interfaces: - name: eth0 type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: eth1 type: 1000base-t - name: wlan0 diff --git a/device-types/Cisco/Meraki-MR53E.yaml b/device-types/Cisco/Meraki-MR53E.yaml index bf64a1065..e94424816 100644 --- a/device-types/Cisco/Meraki-MR53E.yaml +++ b/device-types/Cisco/Meraki-MR53E.yaml @@ -11,6 +11,7 @@ interfaces: - name: main type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: secondary type: 1000base-t - name: wlan0 diff --git a/device-types/Cisco/Meraki-MR56.yaml b/device-types/Cisco/Meraki-MR56.yaml index 63750b668..7d4bbe081 100644 --- a/device-types/Cisco/Meraki-MR56.yaml +++ b/device-types/Cisco/Meraki-MR56.yaml @@ -9,8 +9,9 @@ comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Spe \n- IEEE Standards: 802.11a, 802.11ac, 802.11ax, 802.11b, 802.11e, 802.11g, 802.11h, 802.11i, 802.11k, 802.11n, 802.11r, and 802.11u" interfaces: - name: main - type: 2.5gbase-t + type: 5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: wlan0 type: ieee802.11n - name: wlan1 diff --git a/device-types/Cisco/Meraki-MR57.yaml b/device-types/Cisco/Meraki-MR57.yaml index 1fcb6687b..dcf95af05 100644 --- a/device-types/Cisco/Meraki-MR57.yaml +++ b/device-types/Cisco/Meraki-MR57.yaml @@ -5,12 +5,13 @@ slug: cisco-meraki-mr57 part_number: MR57 is_full_depth: false u_height: 0 -comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Specifications/MR57_Datasheet](https://documentation.meraki.com/MR/MR_Overview_and_Specifications/MR57_Datasheet)\r\ - \n- IEEE Standards: 802.11a, 802.11ac, 802.11ax, 802.11b, 802.11e, 802.11g, 802.11h, 802.11i, 802.11k, 802.11n, 802.11r, 802.11w and 802.11u" +comments: "- [Datasheet](https://documentation.meraki.com/MR/MR_Overview_and_Specifications/MR57_Datasheet)\r\n- IEEE Standards: 802.11a, 802.11ac, 802.11ax,\ + \ 802.11b, 802.11e, 802.11g, 802.11h, 802.11i, 802.11k, 802.11n, 802.11r, 802.11w and 802.11u" interfaces: - name: main type: 2.5gbase-t poe_mode: pd + poe_type: type3-ieee802.3bt - name: secondary type: 2.5gbase-t - name: wlan0 diff --git a/device-types/Cisco/Meraki-MR74.yaml b/device-types/Cisco/Meraki-MR74.yaml index 65e378e89..469cdc510 100644 --- a/device-types/Cisco/Meraki-MR74.yaml +++ b/device-types/Cisco/Meraki-MR74.yaml @@ -7,12 +7,13 @@ u_height: 0.0 is_full_depth: false weight: 2.4 weight_unit: lb -comments: "- Datasheet: [https://meraki.cisco.com/lib/pdf/meraki_datasheet_MR74.pdf](https://meraki.cisco.com/lib/pdf/meraki_datasheet_MR74.pdf)\r\n- 2.4\ - \ GHz 802.11b/g/n client access radio, 5 GHz 802.11a/n/ac client access radio" +comments: "- [Datasheet](https://meraki.cisco.com/lib/pdf/meraki_datasheet_MR74.pdf)\r\n- 2.4 GHz 802.11b/g/n client access radio, 5 GHz 802.11a/n/ac client\ + \ access radio" interfaces: - name: main type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: wlan0 type: ieee802.11n - name: wlan1 diff --git a/device-types/Cisco/Meraki-MR86.yaml b/device-types/Cisco/Meraki-MR86.yaml index 621e2afc0..c936c207c 100644 --- a/device-types/Cisco/Meraki-MR86.yaml +++ b/device-types/Cisco/Meraki-MR86.yaml @@ -8,12 +8,13 @@ is_full_depth: false airflow: passive weight: 1.5 weight_unit: kg -comments: "- Datasheet: [https://documentation.meraki.com/MR/MR_Overview_and_Specifications/MR86_Datasheet](https://documentation.meraki.com/MR/MR_Overview_and_Specifications/MR86_Datasheet)\r\ - \n- IEEE Standards: 802.11a, 802.11ac, 802.11ax, 802.11b, 802.11e, 802.11g, 802.11h, 802.11i, 802.11k, 802.11n, 802.11r, and 802.11u" +comments: "- [Datasheet](https://documentation.meraki.com/MR/MR_Overview_and_Specifications/MR86_Datasheet)\r\n- IEEE Standards: 802.11a, 802.11ac, 802.11ax,\ + \ 802.11b, 802.11e, 802.11g, 802.11h, 802.11i, 802.11k, 802.11n, 802.11r, and 802.11u" interfaces: - name: main type: 2.5gbase-t poe_mode: pd + poe_type: type2-ieee802.3at - name: wlan0 type: ieee802.11ax - name: wlan1 diff --git a/device-types/Cisco/Meraki-MS120-24.yaml b/device-types/Cisco/Meraki-MS120-24.yaml index da29f9658..65f6484df 100644 --- a/device-types/Cisco/Meraki-MS120-24.yaml +++ b/device-types/Cisco/Meraki-MS120-24.yaml @@ -19,76 +19,52 @@ interfaces: mgmt_only: true - name: Port 1 type: 1000base-t - poe_mode: pse - name: Port 2 type: 1000base-t - poe_mode: pse - name: Port 3 type: 1000base-t - poe_mode: pse - name: Port 4 type: 1000base-t - poe_mode: pse - name: Port 5 type: 1000base-t - poe_mode: pse - name: Port 6 type: 1000base-t - poe_mode: pse - name: Port 7 type: 1000base-t - poe_mode: pse - name: Port 8 type: 1000base-t - poe_mode: pse - name: Port 9 type: 1000base-t - poe_mode: pse - name: Port 10 type: 1000base-t - poe_mode: pse - name: Port 11 type: 1000base-t - poe_mode: pse - name: Port 12 type: 1000base-t - poe_mode: pse - name: Port 13 type: 1000base-t - poe_mode: pse - name: Port 14 type: 1000base-t - poe_mode: pse - name: Port 15 type: 1000base-t - poe_mode: pse - name: Port 16 type: 1000base-t - poe_mode: pse - name: Port 17 type: 1000base-t - poe_mode: pse - name: Port 18 type: 1000base-t - poe_mode: pse - name: Port 19 type: 1000base-t - poe_mode: pse - name: Port 20 type: 1000base-t - poe_mode: pse - name: Port 21 type: 1000base-t - poe_mode: pse - name: Port 22 type: 1000base-t - poe_mode: pse - name: Port 23 type: 1000base-t - poe_mode: pse - name: Port 24 type: 1000base-t - poe_mode: pse - name: Port 25 type: 10gbase-x-sfpp - name: Port 26 diff --git a/device-types/Ericsson/GRU0401.yml b/device-types/Ericsson/GRU0401.yml index 27ceb8cc4..1b82d5057 100644 --- a/device-types/Ericsson/GRU0401.yml +++ b/device-types/Ericsson/GRU0401.yml @@ -13,8 +13,10 @@ interfaces: - name: TOD 1 type: other poe_mode: pd + poe_type: type1-ieee802.3af description: RJ45 port 1PPS+TOD (ITU-T G.703 Amd1) - name: TOD 2 type: other poe_mode: pd + poe_type: type1-ieee802.3af description: RJ45 port 1PPS+TOD (ITU-T G.703 Amd1) diff --git a/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml b/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml index 0dd7220f9..88a8fa285 100644 --- a/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml +++ b/device-types/MikroTik/RBLHGR&R11e-LTE-US.yaml @@ -16,5 +16,6 @@ interfaces: - name: ether1 type: 100base-tx poe_mode: pd + poe_type: type2-ieee802.3at - name: lte1 type: lte diff --git a/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml b/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml index 6230bbccf..00e4c540c 100644 --- a/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml +++ b/device-types/MikroTik/RBLHGR&R11e-LTE6.yaml @@ -19,5 +19,6 @@ interfaces: - name: ether1 type: 100base-tx poe_mode: pd + poe_type: type2-ieee802.3at - name: lte1 type: lte diff --git a/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml b/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml index 340b6fa8a..a3ec6b477 100644 --- a/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml +++ b/device-types/MikroTik/RBSXTR&R11e-LTE6.yaml @@ -19,7 +19,10 @@ interfaces: - name: ether1 type: 100base-tx poe_mode: pd + poe_type: type2-ieee802.3at - name: ether2 type: 100base-tx + poe_mode: pse + poe_type: type1-ieee802.3af - name: lte1 type: lte diff --git a/device-types/Mimosa Networks/a5.yaml b/device-types/Mimosa Networks/a5.yaml index 1bef59368..6a50d11f2 100644 --- a/device-types/Mimosa Networks/a5.yaml +++ b/device-types/Mimosa Networks/a5.yaml @@ -5,11 +5,15 @@ slug: mimosa-networks-a5 part_number: a5 u_height: 0 is_full_depth: false +weight: 2.73 +weight_unit: kg +airflow: passive interfaces: - name: eth1_emac1 label: Ethernet type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Mimosa Networks/a5c.yaml b/device-types/Mimosa Networks/a5c.yaml index 3b3637805..d39a68883 100644 --- a/device-types/Mimosa Networks/a5c.yaml +++ b/device-types/Mimosa Networks/a5c.yaml @@ -5,11 +5,15 @@ slug: mimosa-networks-a5c part_number: a5c u_height: 0 is_full_depth: false +weight: 1.75 +weight_unit: kg +airflow: passive interfaces: - name: eth1_emac1 label: Ethernet type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Mimosa Networks/a5x.yaml b/device-types/Mimosa Networks/a5x.yaml index 2e377fe30..a7ca414f4 100644 --- a/device-types/Mimosa Networks/a5x.yaml +++ b/device-types/Mimosa Networks/a5x.yaml @@ -5,11 +5,15 @@ slug: mimosa-networks-a5x part_number: a5x u_height: 0 is_full_depth: false +weight: 0.3 +weight_unit: kg +airflow: passive interfaces: - name: eth1_emac1 label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-2pair - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Mimosa Networks/b5c.yaml b/device-types/Mimosa Networks/b5c.yaml index ed3bf19c9..2489b11a3 100644 --- a/device-types/Mimosa Networks/b5c.yaml +++ b/device-types/Mimosa Networks/b5c.yaml @@ -10,6 +10,7 @@ interfaces: label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-2pair - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Mimosa Networks/b5x.yaml b/device-types/Mimosa Networks/b5x.yaml index f842ea9ee..e667487e9 100644 --- a/device-types/Mimosa Networks/b5x.yaml +++ b/device-types/Mimosa Networks/b5x.yaml @@ -5,11 +5,15 @@ slug: mimosa-networks-b5x part_number: b5x u_height: 0 is_full_depth: false +weight: 1.4 +weight_unit: kg +airflow: passive interfaces: - name: eth1_emac1 label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-2pair - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Mimosa Networks/c5c.yaml b/device-types/Mimosa Networks/c5c.yaml index 4eca2a8f6..c5d56d4c2 100644 --- a/device-types/Mimosa Networks/c5c.yaml +++ b/device-types/Mimosa Networks/c5c.yaml @@ -5,11 +5,15 @@ slug: mimosa-networks-c5c part_number: C5c u_height: 0 is_full_depth: false +weight: 295 +weight_unit: g +airflow: passive interfaces: - name: eth1_emac1 label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-2pair - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Mimosa Networks/c5x.yaml b/device-types/Mimosa Networks/c5x.yaml index a7243efff..9c38b4c6e 100644 --- a/device-types/Mimosa Networks/c5x.yaml +++ b/device-types/Mimosa Networks/c5x.yaml @@ -5,11 +5,15 @@ slug: mimosa-networks-c5x part_number: C5x u_height: 0 is_full_depth: false +weight: 0.37 +weight_unit: kg +airflow: passive interfaces: - name: eth1_emac1 label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-2pair - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Mimosa Networks/c6x.yaml b/device-types/Mimosa Networks/c6x.yaml index ddbfe6e70..da22146f6 100644 --- a/device-types/Mimosa Networks/c6x.yaml +++ b/device-types/Mimosa Networks/c6x.yaml @@ -5,11 +5,15 @@ slug: mimosa-networks-c6x part_number: C6x u_height: 0 is_full_depth: false +weight: 0.7 +weight_unit: kg +airflow: passive interfaces: - name: eth1_emac1 label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wifi0 label: Wireless type: ieee802.11ax diff --git a/device-types/Ubiquiti/Bullet-M2.yaml b/device-types/Ubiquiti/Bullet-M2.yaml index e0367be67..6205f12f4 100644 --- a/device-types/Ubiquiti/Bullet-M2.yaml +++ b/device-types/Ubiquiti/Bullet-M2.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-bullet-m2 part_number: bullet m2 u_height: 0 is_full_depth: false +weight: 180 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/LBE-5AC-23.yaml b/device-types/Ubiquiti/LBE-5AC-23.yaml index f5e05a29c..1897dc691 100644 --- a/device-types/Ubiquiti/LBE-5AC-23.yaml +++ b/device-types/Ubiquiti/LBE-5AC-23.yaml @@ -6,9 +6,13 @@ part_number: LBE-5AC-23 u_height: 0 is_full_depth: false comments: '[LiteBeam AC](https://www.ui.com/airmax/litebeam-ac)' +weight: 750 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/LBE-5AC-Gen2.yaml b/device-types/Ubiquiti/LBE-5AC-Gen2.yaml index 02cda5d0a..729500459 100644 --- a/device-types/Ubiquiti/LBE-5AC-Gen2.yaml +++ b/device-types/Ubiquiti/LBE-5AC-Gen2.yaml @@ -6,9 +6,13 @@ part_number: LBE-5AC-Gen2 u_height: 0 is_full_depth: false comments: '[LiteBeam AC Gen2](https://www.ui.com/airmax/litebeam-ac-gen2/)' +weight: 800 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/LiteAP-120.yaml b/device-types/Ubiquiti/LiteAP-120.yaml index fcdcb82d7..bd74da7a8 100644 --- a/device-types/Ubiquiti/LiteAP-120.yaml +++ b/device-types/Ubiquiti/LiteAP-120.yaml @@ -2,12 +2,17 @@ manufacturer: Ubiquiti model: LiteAP 120 slug: ubiquiti-liteap-120 +part_number: LAP-120 u_height: 0 is_full_depth: false comments: '[LiteAP AC](https://www.ui.com/airmax/liteap-ac/)' +weight: 420 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/NanoBeam-2AC-13.yaml b/device-types/Ubiquiti/NanoBeam-2AC-13.yaml index bdec92128..2df18e2ef 100644 --- a/device-types/Ubiquiti/NanoBeam-2AC-13.yaml +++ b/device-types/Ubiquiti/NanoBeam-2AC-13.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-nanobeam-2ac-13 part_number: NBE-2AC-13 u_height: 0 is_full_depth: false +weight: 530 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/NanoBeam-5AC-19.yaml b/device-types/Ubiquiti/NanoBeam-5AC-19.yaml index 469f00dab..40a19f6e8 100644 --- a/device-types/Ubiquiti/NanoBeam-5AC-19.yaml +++ b/device-types/Ubiquiti/NanoBeam-5AC-19.yaml @@ -5,9 +5,11 @@ slug: ubiquiti-nbe-5ac-19 part_number: NBE-5AC-19 u_height: 0 is_full_depth: false +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/NanoBeam-5AC-Gen2.yaml b/device-types/Ubiquiti/NanoBeam-5AC-Gen2.yaml index e018c7e77..bebe93b9d 100644 --- a/device-types/Ubiquiti/NanoBeam-5AC-Gen2.yaml +++ b/device-types/Ubiquiti/NanoBeam-5AC-Gen2.yaml @@ -2,13 +2,17 @@ manufacturer: Ubiquiti model: NanoBeam 5AC Gen2 slug: ubiquiti-nanobeam-5ac-gen2 -part_number: NBE-5AC-Ge2n +part_number: NBE-5AC-Gen2 u_height: 0 is_full_depth: false comments: '[NanoBeam AC Gen2](https://www.ui.com/airmax/nanobeam-ac-gen2/)' +weight: 530 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/NanoBeam-M5-19.yaml b/device-types/Ubiquiti/NanoBeam-M5-19.yaml index ceab69cad..9c01cbd7c 100644 --- a/device-types/Ubiquiti/NanoBeam-M5-19.yaml +++ b/device-types/Ubiquiti/NanoBeam-M5-19.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-nbe-m5-19 part_number: NBE-M5-19 u_height: 0 is_full_depth: false +weight: 320 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: virtual diff --git a/device-types/Ubiquiti/NanoStation-5AC.yaml b/device-types/Ubiquiti/NanoStation-5AC.yaml index 6f5978006..b86c89cc0 100644 --- a/device-types/Ubiquiti/NanoStation-5AC.yaml +++ b/device-types/Ubiquiti/NanoStation-5AC.yaml @@ -5,10 +5,14 @@ slug: ubiquiti-nanostation-5ac part_number: NS-5AC u_height: 0 is_full_depth: false +weight: 233 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: eth1 type: 1000base-t - name: wlan0 diff --git a/device-types/Ubiquiti/NanoStation-LOCO-5AC.yaml b/device-types/Ubiquiti/NanoStation-LOCO-5AC.yaml index 59f3e7643..1219d4e6f 100644 --- a/device-types/Ubiquiti/NanoStation-LOCO-5AC.yaml +++ b/device-types/Ubiquiti/NanoStation-LOCO-5AC.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-nanostation-loco-5ac part_number: LOCO5AC u_height: 0 is_full_depth: false +weight: 180 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/NanoStation-LOCO-M2.yaml b/device-types/Ubiquiti/NanoStation-LOCO-M2.yaml index 60924ea3b..3e6de874e 100644 --- a/device-types/Ubiquiti/NanoStation-LOCO-M2.yaml +++ b/device-types/Ubiquiti/NanoStation-LOCO-M2.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-nanostation-loco-m2 part_number: nanostation loco m2 u_height: 0 is_full_depth: false +weight: 180 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/NanoStation-LOCO-M5.yaml b/device-types/Ubiquiti/NanoStation-LOCO-M5.yaml index 2b2052cdd..22297c627 100644 --- a/device-types/Ubiquiti/NanoStation-LOCO-M5.yaml +++ b/device-types/Ubiquiti/NanoStation-LOCO-M5.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-nanostation-loco-m5 part_number: nanostation loco m5 u_height: 0 is_full_depth: false +weight: 180 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/NanoStation-LOCO-M900.yaml b/device-types/Ubiquiti/NanoStation-LOCO-M900.yaml index b90207f0e..b5e671e10 100644 --- a/device-types/Ubiquiti/NanoStation-LOCO-M900.yaml +++ b/device-types/Ubiquiti/NanoStation-LOCO-M900.yaml @@ -5,10 +5,14 @@ slug: ubiquiti-nanostation-loco-m900 part_number: nanostation loco m900 u_height: 0 is_full_depth: false +weight: 900 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 100base-tx poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: virtual description: 900MHz diff --git a/device-types/Ubiquiti/NanoStation-M2.yaml b/device-types/Ubiquiti/NanoStation-M2.yaml index dee90322b..323502cab 100644 --- a/device-types/Ubiquiti/NanoStation-M2.yaml +++ b/device-types/Ubiquiti/NanoStation-M2.yaml @@ -5,10 +5,14 @@ slug: ubiquiti-nanostation-m2 part_number: nanostation m2 u_height: 0 is_full_depth: false +weight: 400 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: eth1 type: 1000base-t - name: wlan0 diff --git a/device-types/Ubiquiti/NanoStation-M5.yaml b/device-types/Ubiquiti/NanoStation-M5.yaml index a2fbb3679..e82f52e83 100644 --- a/device-types/Ubiquiti/NanoStation-M5.yaml +++ b/device-types/Ubiquiti/NanoStation-M5.yaml @@ -5,10 +5,14 @@ slug: ubiquiti-nanostation-m5 part_number: nanostation m5 u_height: 0 is_full_depth: false +weight: 400 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: eth1 type: 1000base-t - name: wlan0 diff --git a/device-types/Ubiquiti/PicoStation-M2.yaml b/device-types/Ubiquiti/PicoStation-M2.yaml index c1d700c2b..ebaeb4f7d 100644 --- a/device-types/Ubiquiti/PicoStation-M2.yaml +++ b/device-types/Ubiquiti/PicoStation-M2.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-picostation-m2 part_number: picostation m2 u_height: 0 is_full_depth: false +weight: 0.1 +weight_unit: kg +airflow: passive interfaces: - name: eth0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/PowerBeam-2AC-400.yaml b/device-types/Ubiquiti/PowerBeam-2AC-400.yaml index ee3eb8cf4..2ef5d6440 100644 --- a/device-types/Ubiquiti/PowerBeam-2AC-400.yaml +++ b/device-types/Ubiquiti/PowerBeam-2AC-400.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-powerbeam-2ac-400 part_number: PBE-2AC-400 u_height: 0 is_full_depth: false +weight: 1.8 +weight_unit: kg +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/PowerBeam-5AC-300.yaml b/device-types/Ubiquiti/PowerBeam-5AC-300.yaml index 3293515e0..67f47a767 100644 --- a/device-types/Ubiquiti/PowerBeam-5AC-300.yaml +++ b/device-types/Ubiquiti/PowerBeam-5AC-300.yaml @@ -6,9 +6,11 @@ part_number: PBE-5AC-300 u_height: 0 is_full_depth: false comments: '[PowerBeam AC](https://www.ui.com/airmax/powerbeam-ac/)' +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/PowerBeam-5AC-500.yaml b/device-types/Ubiquiti/PowerBeam-5AC-500.yaml index ea6bb83f2..d9c09a44c 100644 --- a/device-types/Ubiquiti/PowerBeam-5AC-500.yaml +++ b/device-types/Ubiquiti/PowerBeam-5AC-500.yaml @@ -6,9 +6,13 @@ part_number: PBE-5AC-500 u_height: 0 is_full_depth: false comments: '[PowerBeam AC](https://www.ui.com/airmax/powerbeam-ac/)' +weight: 3.2 +weight_unit: kg +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/PowerBeam-5AC-Gen2.yaml b/device-types/Ubiquiti/PowerBeam-5AC-Gen2.yaml index 1ad33a9ed..ac87dd15c 100644 --- a/device-types/Ubiquiti/PowerBeam-5AC-Gen2.yaml +++ b/device-types/Ubiquiti/PowerBeam-5AC-Gen2.yaml @@ -6,9 +6,13 @@ part_number: PBE-5AC-Gen2 u_height: 0 is_full_depth: false comments: '[PowerBeam AC Gen2](https://www.ui.com/airmax/powerbeam-ac-gen2/)' +weight: 2.2 +weight_unit: kg +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/PowerBeam-M2-400.yaml b/device-types/Ubiquiti/PowerBeam-M2-400.yaml index a84197065..e2ad50992 100644 --- a/device-types/Ubiquiti/PowerBeam-M2-400.yaml +++ b/device-types/Ubiquiti/PowerBeam-M2-400.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-powerbeam-m2-400 part_number: PBE-M2-400 u_height: 0 is_full_depth: false +weight: 1.8 +weight_unit: kg +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/R2AC-PRISM.yaml b/device-types/Ubiquiti/R2AC-PRISM.yaml index 2a460643a..d69e07427 100644 --- a/device-types/Ubiquiti/R2AC-PRISM.yaml +++ b/device-types/Ubiquiti/R2AC-PRISM.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-rocket-2ac-prism part_number: R2AC-PRISM u_height: 0 is_full_depth: false +weight: 400 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/RP-5AC-Gen2.yaml b/device-types/Ubiquiti/RP-5AC-Gen2.yaml index 0c58298e1..039facf33 100644 --- a/device-types/Ubiquiti/RP-5AC-Gen2.yaml +++ b/device-types/Ubiquiti/RP-5AC-Gen2.yaml @@ -6,9 +6,13 @@ part_number: RP-5AC-Gen2 u_height: 0 is_full_depth: false comments: '[Rocket Prism 5AC Gen2](https://dl.ubnt.com/datasheets/RocketAC/Rocket_Prism_AC_Gen2_DS.pdf)' +weight: 400 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11ac diff --git a/device-types/Ubiquiti/Rocket-M2-Titanium.yaml b/device-types/Ubiquiti/Rocket-M2-Titanium.yaml index e6c197270..7827d13f7 100644 --- a/device-types/Ubiquiti/Rocket-M2-Titanium.yaml +++ b/device-types/Ubiquiti/Rocket-M2-Titanium.yaml @@ -5,10 +5,14 @@ slug: ubiquiti-rocket-m2-titanium part_number: Rocket M2 Titanium u_height: 0 is_full_depth: false +weight: 350 +weight_unit: g +airflow: passive interfaces: - name: lan0 - type: 100base-tx + type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: lan1 type: 100base-tx - name: wlan0 diff --git a/device-types/Ubiquiti/Rocket-M2.yaml b/device-types/Ubiquiti/Rocket-M2.yaml index 7b4e4bd5f..28dabcc82 100644 --- a/device-types/Ubiquiti/Rocket-M2.yaml +++ b/device-types/Ubiquiti/Rocket-M2.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-rocket-m2 part_number: Rocket M2 u_height: 0 is_full_depth: false +weight: 500 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 100base-tx poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/Rocket-M5.yaml b/device-types/Ubiquiti/Rocket-M5.yaml index 08c4ffd04..032fe86a5 100644 --- a/device-types/Ubiquiti/Rocket-M5.yaml +++ b/device-types/Ubiquiti/Rocket-M5.yaml @@ -5,9 +5,13 @@ slug: ubiquiti-rocket-m5 part_number: Rocket M5 u_height: 0 is_full_depth: false +weight: 500 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 100base-tx poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: ieee802.11n diff --git a/device-types/Ubiquiti/Rocket-M900.yaml b/device-types/Ubiquiti/Rocket-M900.yaml index d8db7f568..7cee19e0b 100644 --- a/device-types/Ubiquiti/Rocket-M900.yaml +++ b/device-types/Ubiquiti/Rocket-M900.yaml @@ -5,10 +5,14 @@ slug: ubiquiti-rocket-m900 part_number: rocket m900 u_height: 0 is_full_depth: false +weight: 500 +weight_unit: g +airflow: passive interfaces: - name: eth0 type: 100base-tx poe_mode: pd + poe_type: passive-24v-2pair - name: wlan0 type: virtual description: 900MHz diff --git a/device-types/Ubiquiti/UAP-AC-Lite.yaml b/device-types/Ubiquiti/UAP-AC-Lite.yaml index 717e2f4f5..7246a3fc4 100644 --- a/device-types/Ubiquiti/UAP-AC-Lite.yaml +++ b/device-types/Ubiquiti/UAP-AC-Lite.yaml @@ -7,11 +7,13 @@ u_height: 0 is_full_depth: false weight: 170 weight_unit: g +airflow: passive comments: '[AC Lite](https://www.ui.com/unifi/unifi-ap-ac-lite/)' interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: wlan0 type: ieee802.11n - name: wlan1 diff --git a/device-types/Ubiquiti/UAP-AC-M.yaml b/device-types/Ubiquiti/UAP-AC-M.yaml index 9c63aa82e..fb98d3e16 100644 --- a/device-types/Ubiquiti/UAP-AC-M.yaml +++ b/device-types/Ubiquiti/UAP-AC-M.yaml @@ -7,10 +7,14 @@ u_height: 0 is_full_depth: false comments: | [Access Point AC Mesh](https://store.ui.com/collections/wireless/products/unifi-ac-mesh-ap) +weight: 152 +weight_unit: g +airflow: passive interfaces: - name: lan0 type: 1000base-t poe_mode: pd + poe_type: type1-ieee802.3af - name: wlan0 type: ieee802.11n - name: wlan1 diff --git a/device-types/Ubiquiti/USW-Flex-Mini.yaml b/device-types/Ubiquiti/USW-Flex-Mini.yaml index 4912594cb..ec3bfe281 100644 --- a/device-types/Ubiquiti/USW-Flex-Mini.yaml +++ b/device-types/Ubiquiti/USW-Flex-Mini.yaml @@ -7,10 +7,14 @@ comments: | 107.16 x 70.15 x 21.17 mm (4.22 x 2.76 x 0.83") u_height: 0 is_full_depth: false +weight: 150 +weight_unit: g +airflow: passive interfaces: - name: Port 1 (PoE IN) type: 1000base-t poe_mode: pd + poe_type: type2-ieee802.3at - name: Port 2 type: 1000base-t - name: Port 3 diff --git a/device-types/Ubiquiti/USW-Flex.yaml b/device-types/Ubiquiti/USW-Flex.yaml index 63ce554a7..28cc94132 100644 --- a/device-types/Ubiquiti/USW-Flex.yaml +++ b/device-types/Ubiquiti/USW-Flex.yaml @@ -7,19 +7,27 @@ comments: | 122.5 x 107.1 x 28.0 mm (4.82 x 4.22 x 1.10") u_height: 0 is_full_depth: false +weight: 230 +weight_unit: g +airflow: passive interfaces: - name: Port 1 (PoE++ IN) type: 1000base-t poe_mode: pd + poe_type: type3-ieee802.3bt - name: Port 2 (PoE+) type: 1000base-t poe_mode: pse + poe_type: type2-ieee802.3at - name: Port 3 (PoE+) type: 1000base-t poe_mode: pse + poe_type: type2-ieee802.3at - name: Port 4 (PoE+) type: 1000base-t poe_mode: pse + poe_type: type2-ieee802.3at - name: Port 5 (PoE+) type: 1000base-t poe_mode: pse + poe_type: type2-ieee802.3at diff --git a/device-types/Ubiquiti/WAVE-LR.yaml b/device-types/Ubiquiti/WAVE-LR.yaml index 187bb1ebf..35c034524 100644 --- a/device-types/Ubiquiti/WAVE-LR.yaml +++ b/device-types/Ubiquiti/WAVE-LR.yaml @@ -16,6 +16,7 @@ interfaces: label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-4pair - name: prs0 label: Wireless type: ieee802.11ax diff --git a/device-types/Ubiquiti/airFiber-5XHD.yml b/device-types/Ubiquiti/airFiber-5XHD.yml index 719a9b661..c97916828 100644 --- a/device-types/Ubiquiti/airFiber-5XHD.yml +++ b/device-types/Ubiquiti/airFiber-5XHD.yml @@ -19,6 +19,7 @@ interfaces: label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-4pair - name: ath0 label: Wireless type: ieee802.11ax diff --git a/device-types/Ubiquiti/airFiber-60-HD.yml b/device-types/Ubiquiti/airFiber-60-HD.yml index 754bc7f64..5a538b603 100644 --- a/device-types/Ubiquiti/airFiber-60-HD.yml +++ b/device-types/Ubiquiti/airFiber-60-HD.yml @@ -21,6 +21,7 @@ interfaces: label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-4pair - name: ubond0 label: Wireless type: ieee802.11ax diff --git a/device-types/Ubiquiti/airFiber-60-LR.yml b/device-types/Ubiquiti/airFiber-60-LR.yml index 738a56cd5..4f85574f6 100644 --- a/device-types/Ubiquiti/airFiber-60-LR.yml +++ b/device-types/Ubiquiti/airFiber-60-LR.yml @@ -21,6 +21,7 @@ interfaces: label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-4pair - name: ath0 label: Wireless type: ieee802.11ax diff --git a/device-types/Ubiquiti/airFiber-60.yml b/device-types/Ubiquiti/airFiber-60.yml index 185c3757b..e9af5b8b9 100644 --- a/device-types/Ubiquiti/airFiber-60.yml +++ b/device-types/Ubiquiti/airFiber-60.yml @@ -19,6 +19,7 @@ interfaces: label: Ethernet type: 1000base-t poe_mode: pd + poe_type: passive-48v-4pair - name: ubond0 label: Wireless type: ieee802.11ax diff --git a/device-types/YAMAHA/SWX2322P-16MT.yaml b/device-types/YAMAHA/SWX2322P-16MT.yaml index 8f580cbde..eac9d5dc5 100644 --- a/device-types/YAMAHA/SWX2322P-16MT.yaml +++ b/device-types/YAMAHA/SWX2322P-16MT.yaml @@ -14,51 +14,51 @@ console-ports: type: usb-mini-b interfaces: - name: port1.1 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.2 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.3 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.4 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.5 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.6 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.7 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.8 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.9 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.10 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.11 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.12 - pse_mode: pse + poe_mode: pse poe_type: type4-ieee802.3bt type: 10gbase-t - name: port1.13 diff --git a/module-types/ZPE/NSR-16ETH-EXPN.yaml b/module-types/ZPE/NSR-16ETH-EXPN.yaml index 209b49b88..35cb50bab 100644 --- a/module-types/ZPE/NSR-16ETH-EXPN.yaml +++ b/module-types/ZPE/NSR-16ETH-EXPN.yaml @@ -8,64 +8,64 @@ interfaces: - name: netS{module}-1 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-2 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-3 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-4 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-5 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-6 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-7 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-8 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-9 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-10 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-11 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-12 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-13 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-14 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-15 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse - name: netS{module}-16 type: 1000base-t poe_type: type2-ieee802.3at - mgmt_only: false + poe_mode: pse diff --git a/schema/components.json b/schema/components.json index 75e77d1b3..90baf1dcf 100644 --- a/schema/components.json +++ b/schema/components.json @@ -8,10 +8,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/console-port/properties/type" @@ -29,10 +31,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/console-server-port/properties/type" @@ -47,10 +51,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/power-port/properties/type" @@ -71,16 +77,19 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/power-outlet/properties/type" }, "power_port": { - "type": "string" + "type": "string", + "maxLength": 64 }, "feed_leg": { "$ref": "urn:devicetype-library:generated-schema#/definitions/power-outlet/properties/feed-leg" @@ -95,10 +104,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/interface/properties/type" @@ -122,10 +133,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/front-port/properties/type" @@ -151,10 +164,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "type": { "$ref": "urn:devicetype-library:generated-schema#/definitions/rear-port/properties/type" @@ -179,10 +194,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "position": { "type": "string" @@ -197,10 +214,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 } }, "required": [ @@ -211,10 +230,12 @@ "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "maxLength": 64 }, "label": { - "type": "string" + "type": "string", + "maxLength": 64 }, "manufacturer": { "type": "string" diff --git a/tests/device_types.py b/tests/device_types.py index 1c88a9d41..b5dc3c426 100644 --- a/tests/device_types.py +++ b/tests/device_types.py @@ -234,6 +234,17 @@ def validate_components(component_types, device_or_module): return False known_components.append(eval_component) known_names.add(name) + # Bi-directional POE validation for interfaces + if component_type == "interfaces": + poe_mode_present = "poe_mode" in component and bool(component["poe_mode"]) + poe_type_present = "poe_type" in component and bool(component["poe_type"]) + + if poe_mode_present and not poe_type_present: + device_or_module.failureMessage = f'{device_or_module.file_path} has "poe_mode" defined in an interface without a matching "poe_type".' + return False + if poe_type_present and not poe_mode_present: + device_or_module.failureMessage = f'{device_or_module.file_path} has "poe_type" defined in an interface without a matching "poe_mode".' + return False # Adding check for duplicate positions within a component type # Stems from https://github.com/netbox-community/devicetype-library/pull/1586