From 0a8fe5893da67029118e3c81ef259b05049546e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chabert=20Lo=C3=AFc?= Date: Thu, 7 Mar 2024 17:14:51 +0100 Subject: [PATCH] Juniper add small devices and add modular PSU/FAN (#1961) * Juniper add small devices and add modular PSU/FAN * Fix typo on module-bays --------- Co-authored-by: loic.chabert --- device-types/Juniper/EX4500-40F.yaml | 15 ++++---- device-types/Juniper/MX204.yaml | 18 ++++++---- device-types/Juniper/MX80.yaml | 1 + device-types/Juniper/SRX100B.yaml | 34 +++++++++++++++++++ device-types/Juniper/SRX100H.yaml | 34 +++++++++++++++++++ device-types/Juniper/SRX100H2.yaml | 34 +++++++++++++++++++ device-types/Juniper/SRX210HE2.yaml | 2 ++ module-types/Juniper/EX-FAN-AFI.yaml | 5 +++ module-types/Juniper/EX-FAN-AFO.yaml | 5 +++ module-types/Juniper/EX4500-PWR1-AC-BF.yml | 9 +++++ module-types/Juniper/EX4500-PWR1-AC-FB.yml | 9 +++++ ...-650W-AC-AI.yaml => JPSU-650W-AC-AFI.yaml} | 5 ++- module-types/Juniper/MX-FAN-AFI.yaml | 5 +++ module-types/Juniper/MX-FAN-AFO.yaml | 5 +++ module-types/Juniper/QFX5100-FAN-AFI.yaml | 4 +++ 15 files changed, 168 insertions(+), 17 deletions(-) create mode 100644 device-types/Juniper/SRX100B.yaml create mode 100644 device-types/Juniper/SRX100H.yaml create mode 100644 device-types/Juniper/SRX100H2.yaml create mode 100644 module-types/Juniper/EX-FAN-AFI.yaml create mode 100644 module-types/Juniper/EX-FAN-AFO.yaml create mode 100644 module-types/Juniper/EX4500-PWR1-AC-BF.yml create mode 100644 module-types/Juniper/EX4500-PWR1-AC-FB.yml rename module-types/Juniper/{JPSU-650W-AC-AI.yaml => JPSU-650W-AC-AFI.yaml} (63%) create mode 100644 module-types/Juniper/MX-FAN-AFI.yaml create mode 100644 module-types/Juniper/MX-FAN-AFO.yaml create mode 100644 module-types/Juniper/QFX5100-FAN-AFI.yaml diff --git a/device-types/Juniper/EX4500-40F.yaml b/device-types/Juniper/EX4500-40F.yaml index 852866b3..1ea41811 100644 --- a/device-types/Juniper/EX4500-40F.yaml +++ b/device-types/Juniper/EX4500-40F.yaml @@ -5,6 +5,8 @@ slug: juniper-ex4500-40f part_number: EX4500-40F-VC1-BF-C u_height: 2 is_full_depth: true +weight: 17 +weight_unit: kg interfaces: - name: xe-0/0/0 type: 10gbase-x-sfpp @@ -93,13 +95,12 @@ interfaces: - name: me0 type: 1000base-t mgmt_only: true -power-ports: - - name: PEM0 - type: iec-60320-c20 - maximum_draw: 1200 - - name: PEM1 - type: iec-60320-c20 - maximum_draw: 1200 console-ports: - name: Console type: rj-45 +module-bays: + - name: Fan Tray + - name: PEM0 + position: '0' + - name: PEM1 + position: '1' diff --git a/device-types/Juniper/MX204.yaml b/device-types/Juniper/MX204.yaml index 32dcd6ad..79ad730b 100644 --- a/device-types/Juniper/MX204.yaml +++ b/device-types/Juniper/MX204.yaml @@ -37,13 +37,17 @@ interfaces: type: 10gbase-x-sfpp - name: xe-0/1/7 type: 10gbase-x-sfpp -power-ports: - - name: PSU0 - type: iec-60320-c14 - maximum_draw: 650 - - name: PSU1 - type: iec-60320-c14 - maximum_draw: 650 +module-bays: + - name: Power Supply 0 + position: PEM 0 + - name: Power Supply 1 + position: PEM 1 + - name: Fan tray 0 + position: '0' + - name: Fan tray 1 + position: '1' + - name: Fan tray 2 + position: '2' console-ports: - name: Console type: rj-45 diff --git a/device-types/Juniper/MX80.yaml b/device-types/Juniper/MX80.yaml index d80ccd7a..bba60fc9 100644 --- a/device-types/Juniper/MX80.yaml +++ b/device-types/Juniper/MX80.yaml @@ -36,3 +36,4 @@ module-bays: position: '1' - name: MIC1 position: '2' + - name: Fan Tray diff --git a/device-types/Juniper/SRX100B.yaml b/device-types/Juniper/SRX100B.yaml new file mode 100644 index 00000000..e06074a3 --- /dev/null +++ b/device-types/Juniper/SRX100B.yaml @@ -0,0 +1,34 @@ +--- +manufacturer: Juniper +model: SRX100B +slug: juniper-srx100b +part_number: srx100b +u_height: 1 +is_full_depth: false +airflow: passive +weight: 1.86 +weight_unit: lb +comments: '[Juniper SXR100b](https://www.juniper.net/documentation/en_US/release-independent/junos/information-products/pathway-pages/hardware/srx100/srx100-index.pdf)' +console-ports: + - name: Con0 + type: rj-45 +power-ports: + - name: PSU0 + type: iec-60320-c14 +interfaces: + - name: fe-0/0/0 + type: 100base-tx + - name: fe-0/0/1 + type: 100base-tx + - name: fe-0/0/2 + type: 100base-tx + - name: fe-0/0/3 + type: 100base-tx + - name: fe-0/0/4 + type: 100base-tx + - name: fe-0/0/5 + type: 100base-tx + - name: fe-0/0/6 + type: 100base-tx + - name: fe-0/0/7 + type: 100base-tx diff --git a/device-types/Juniper/SRX100H.yaml b/device-types/Juniper/SRX100H.yaml new file mode 100644 index 00000000..3bf71fbf --- /dev/null +++ b/device-types/Juniper/SRX100H.yaml @@ -0,0 +1,34 @@ +--- +manufacturer: Juniper +model: SRX100H +slug: juniper-srx100h +part_number: srx100h +u_height: 1 +is_full_depth: false +airflow: passive +weight: 1.86 +weight_unit: lb +comments: '[Juniper SXR100H](https://www.juniper.net/documentation/en_US/release-independent/junos/information-products/pathway-pages/hardware/srx100/srx100-index.pdf)' +console-ports: + - name: Con0 + type: rj-45 +power-ports: + - name: PSU0 + type: iec-60320-c14 +interfaces: + - name: fe-0/0/0 + type: 100base-tx + - name: fe-0/0/1 + type: 100base-tx + - name: fe-0/0/2 + type: 100base-tx + - name: fe-0/0/3 + type: 100base-tx + - name: fe-0/0/4 + type: 100base-tx + - name: fe-0/0/5 + type: 100base-tx + - name: fe-0/0/6 + type: 100base-tx + - name: fe-0/0/7 + type: 100base-tx diff --git a/device-types/Juniper/SRX100H2.yaml b/device-types/Juniper/SRX100H2.yaml new file mode 100644 index 00000000..d65d5908 --- /dev/null +++ b/device-types/Juniper/SRX100H2.yaml @@ -0,0 +1,34 @@ +--- +manufacturer: Juniper +model: SRX100H2 +slug: juniper-srx100h2 +part_number: srx100h2 +u_height: 1 +is_full_depth: false +airflow: passive +weight: 1.1 +weight_unit: kg +comments: '[Juniper SXR100H2](https://www.juniper.net/documentation/en_US/release-independent/junos/information-products/pathway-pages/hardware/srx100/srx100-2g-index.pdf)' +console-ports: + - name: Con0 + type: rj-45 +power-ports: + - name: PSU0 + type: iec-60320-c14 +interfaces: + - name: fe-0/0/0 + type: 100base-tx + - name: fe-0/0/1 + type: 100base-tx + - name: fe-0/0/2 + type: 100base-tx + - name: fe-0/0/3 + type: 100base-tx + - name: fe-0/0/4 + type: 100base-tx + - name: fe-0/0/5 + type: 100base-tx + - name: fe-0/0/6 + type: 100base-tx + - name: fe-0/0/7 + type: 100base-tx diff --git a/device-types/Juniper/SRX210HE2.yaml b/device-types/Juniper/SRX210HE2.yaml index 5388045f..7e9ccf10 100644 --- a/device-types/Juniper/SRX210HE2.yaml +++ b/device-types/Juniper/SRX210HE2.yaml @@ -3,6 +3,8 @@ manufacturer: Juniper model: SRX210HE2 slug: juniper-srx210he2 is_full_depth: false +weight: 1.61 +weight_unit: kg interfaces: - name: ge-0/0/0 type: 1000base-t diff --git a/module-types/Juniper/EX-FAN-AFI.yaml b/module-types/Juniper/EX-FAN-AFI.yaml new file mode 100644 index 00000000..a62a638e --- /dev/null +++ b/module-types/Juniper/EX-FAN-AFI.yaml @@ -0,0 +1,5 @@ +--- +manufacturer: Juniper +model: EX-FAN-AFI +comments: | + fan with back-to-front airflow diff --git a/module-types/Juniper/EX-FAN-AFO.yaml b/module-types/Juniper/EX-FAN-AFO.yaml new file mode 100644 index 00000000..9cc98f06 --- /dev/null +++ b/module-types/Juniper/EX-FAN-AFO.yaml @@ -0,0 +1,5 @@ +--- +manufacturer: Juniper +model: EX-FAN-AFO +comments: | + fan with front-to-back airflow diff --git a/module-types/Juniper/EX4500-PWR1-AC-BF.yml b/module-types/Juniper/EX4500-PWR1-AC-BF.yml new file mode 100644 index 00000000..64f946c7 --- /dev/null +++ b/module-types/Juniper/EX4500-PWR1-AC-BF.yml @@ -0,0 +1,9 @@ +--- +manufacturer: Juniper +model: EX4500-PWR1-AC-BF +part_number: 740-029654 +comments: back-to-front airflow +power-ports: + - name: PSU {module} + type: iec-60320-c20 + maximum_draw: 1200 diff --git a/module-types/Juniper/EX4500-PWR1-AC-FB.yml b/module-types/Juniper/EX4500-PWR1-AC-FB.yml new file mode 100644 index 00000000..a2d6e268 --- /dev/null +++ b/module-types/Juniper/EX4500-PWR1-AC-FB.yml @@ -0,0 +1,9 @@ +--- +manufacturer: Juniper +model: EX4500-PWR1-AC-FB +part_number: 740-029654 +comments: front-to-back airflow +power-ports: + - name: PSU {module} + type: iec-60320-c20 + maximum_draw: 1200 diff --git a/module-types/Juniper/JPSU-650W-AC-AI.yaml b/module-types/Juniper/JPSU-650W-AC-AFI.yaml similarity index 63% rename from module-types/Juniper/JPSU-650W-AC-AI.yaml rename to module-types/Juniper/JPSU-650W-AC-AFI.yaml index 9bb80e76..f6ab07b7 100644 --- a/module-types/Juniper/JPSU-650W-AC-AI.yaml +++ b/module-types/Juniper/JPSU-650W-AC-AFI.yaml @@ -1,8 +1,7 @@ --- manufacturer: Juniper -model: JPSU-650W-AC-AI -part_number: JPSU-650W-AC-AI -# airflow: rear-to-front +model: JPSU-650W-AC-AFI +part_number: JPSU-650W-AC-AFI weight: 2.2 weight_unit: lb power-ports: diff --git a/module-types/Juniper/MX-FAN-AFI.yaml b/module-types/Juniper/MX-FAN-AFI.yaml new file mode 100644 index 00000000..520cb07d --- /dev/null +++ b/module-types/Juniper/MX-FAN-AFI.yaml @@ -0,0 +1,5 @@ +--- +manufacturer: Juniper +model: MX-FAN-AFI +comments: | + fan with back-to-front airflow diff --git a/module-types/Juniper/MX-FAN-AFO.yaml b/module-types/Juniper/MX-FAN-AFO.yaml new file mode 100644 index 00000000..daf32244 --- /dev/null +++ b/module-types/Juniper/MX-FAN-AFO.yaml @@ -0,0 +1,5 @@ +--- +manufacturer: Juniper +model: MX-FAN-AFO +comments: | + fan with front-to-back airflow diff --git a/module-types/Juniper/QFX5100-FAN-AFI.yaml b/module-types/Juniper/QFX5100-FAN-AFI.yaml new file mode 100644 index 00000000..dbf83097 --- /dev/null +++ b/module-types/Juniper/QFX5100-FAN-AFI.yaml @@ -0,0 +1,4 @@ +--- +manufacturer: Juniper +model: QFX5100-FAN-AFI +part_number: QFX5100-FAN-AFI