From 5c223e35f28d0dfc511be3de00c71e12f95b568e Mon Sep 17 00:00:00 2001 From: J vanBemmel Date: Tue, 28 Mar 2023 10:39:34 -0500 Subject: [PATCH] Nokia device/module model fixes (#1213) * * Add missing fan trays * Correct D1 PSU model name to include 'IXR' * Mark devices as full depth such that both front and rear images show up * Remove duplicate "Nokia" vendor name from model (title and mouse-over assume no vendor name in model string) * Fix merge typo --------- Co-authored-by: Daniel W. Anner --- device-types/Nokia/7220-IXR-D1.yaml | 2 +- device-types/Nokia/7220-IXR-D2.yaml | 2 +- device-types/Nokia/7220-IXR-D2L.yaml | 4 ++++ device-types/Nokia/7220-IXR-D3.yaml | 2 +- device-types/Nokia/7220-IXR-D3L.yaml | 2 ++ device-types/Nokia/7250 IXR-s.yaml | 2 +- module-types/Nokia/PS-7220-IXR-D1-AC-B2F.yaml | 2 +- module-types/Nokia/PS-7220-IXR-D1-AC-F2B.yaml | 2 +- module-types/Nokia/PS-7220-IXR-D1-DC-B2F.yaml | 2 +- module-types/Nokia/PS-7220-IXR-D1-DC-F2B.yaml | 2 +- 10 files changed, 14 insertions(+), 8 deletions(-) diff --git a/device-types/Nokia/7220-IXR-D1.yaml b/device-types/Nokia/7220-IXR-D1.yaml index fa64e9301..f9e380349 100644 --- a/device-types/Nokia/7220-IXR-D1.yaml +++ b/device-types/Nokia/7220-IXR-D1.yaml @@ -4,7 +4,7 @@ model: 7220 IXR-D1 88G 48baseT 4SFP+ slug: nokia-7220-ixr-d1 part_number: 3HE15621AA u_height: 1 -is_full_depth: false # 15.75" +is_full_depth: true # 15.75" weight: 16.31 weight_unit: lb front_image: true diff --git a/device-types/Nokia/7220-IXR-D2.yaml b/device-types/Nokia/7220-IXR-D2.yaml index d20308a60..462d069d0 100644 --- a/device-types/Nokia/7220-IXR-D2.yaml +++ b/device-types/Nokia/7220-IXR-D2.yaml @@ -4,7 +4,7 @@ model: 7220 IXR-D2 25/100GE slug: nokia-7220-ixr-d2 part_number: 3HE15622AA u_height: 1 -is_full_depth: false # 18.11" +is_full_depth: true # 18.11" weight: 18.08 weight_unit: lb front_image: true diff --git a/device-types/Nokia/7220-IXR-D2L.yaml b/device-types/Nokia/7220-IXR-D2L.yaml index bc20c1a90..65f0effc4 100644 --- a/device-types/Nokia/7220-IXR-D2L.yaml +++ b/device-types/Nokia/7220-IXR-D2L.yaml @@ -150,3 +150,7 @@ module-bays: position: '3' - name: Fan Tray 4 position: '4' + - name: Fan Tray 5 + position: '5' + - name: Fan Tray 6 + position: '6' diff --git a/device-types/Nokia/7220-IXR-D3.yaml b/device-types/Nokia/7220-IXR-D3.yaml index b3696227a..838f3a61b 100644 --- a/device-types/Nokia/7220-IXR-D3.yaml +++ b/device-types/Nokia/7220-IXR-D3.yaml @@ -4,7 +4,7 @@ model: 7220 IXR-D3 32*100GE slug: nokia-7220-ixr-d3 part_number: 3HE15623AA u_height: 1 -is_full_depth: false # 18.11" +is_full_depth: true # 18.11" weight: 19.20 weight_unit: lb front_image: true diff --git a/device-types/Nokia/7220-IXR-D3L.yaml b/device-types/Nokia/7220-IXR-D3L.yaml index 8f438ceef..465def282 100644 --- a/device-types/Nokia/7220-IXR-D3L.yaml +++ b/device-types/Nokia/7220-IXR-D3L.yaml @@ -102,3 +102,5 @@ module-bays: position: '4' - name: Fan Tray 5 position: '5' + - name: Fan Tray 6 + position: '6' diff --git a/device-types/Nokia/7250 IXR-s.yaml b/device-types/Nokia/7250 IXR-s.yaml index ecb37d5fa..5c856fef1 100644 --- a/device-types/Nokia/7250 IXR-s.yaml +++ b/device-types/Nokia/7250 IXR-s.yaml @@ -1,7 +1,7 @@ --- manufacturer: Nokia model: 7250 IXR-s -slug: 7250-ixr-s +slug: nokia-7250-ixr-s part_number: 3HE13343AA u_height: 1 is_full_depth: false diff --git a/module-types/Nokia/PS-7220-IXR-D1-AC-B2F.yaml b/module-types/Nokia/PS-7220-IXR-D1-AC-B2F.yaml index e3bd88486..cfbfed516 100644 --- a/module-types/Nokia/PS-7220-IXR-D1-AC-B2F.yaml +++ b/module-types/Nokia/PS-7220-IXR-D1-AC-B2F.yaml @@ -1,6 +1,6 @@ --- manufacturer: Nokia -model: PS-7220-D1-AC-B2F +model: PS-7220-IXR-D1-AC-B2F part_number: 3HE15626AA comments: 240W AC Power Supply B2F airflow # airflow: rear-to-front diff --git a/module-types/Nokia/PS-7220-IXR-D1-AC-F2B.yaml b/module-types/Nokia/PS-7220-IXR-D1-AC-F2B.yaml index dc3b19985..b7fd45f45 100644 --- a/module-types/Nokia/PS-7220-IXR-D1-AC-F2B.yaml +++ b/module-types/Nokia/PS-7220-IXR-D1-AC-F2B.yaml @@ -1,6 +1,6 @@ --- manufacturer: Nokia -model: PS-7220-D1-AC-F2B +model: PS-7220-IXR-D1-AC-F2B part_number: 3HE15625AA comments: 240W AC Power Supply F2B airflow # airflow: front-to-rear diff --git a/module-types/Nokia/PS-7220-IXR-D1-DC-B2F.yaml b/module-types/Nokia/PS-7220-IXR-D1-DC-B2F.yaml index 3e562c4d7..ecaedd947 100644 --- a/module-types/Nokia/PS-7220-IXR-D1-DC-B2F.yaml +++ b/module-types/Nokia/PS-7220-IXR-D1-DC-B2F.yaml @@ -1,6 +1,6 @@ --- manufacturer: Nokia -model: PS-7220-D1-DC-B2F +model: PS-7220-IXR-D1-DC-B2F part_number: 3HE15630AA comments: 550W DC Power Supply B2F airflow # airflow: rear-to-front diff --git a/module-types/Nokia/PS-7220-IXR-D1-DC-F2B.yaml b/module-types/Nokia/PS-7220-IXR-D1-DC-F2B.yaml index 5d6f7ef8a..7f345dec8 100644 --- a/module-types/Nokia/PS-7220-IXR-D1-DC-F2B.yaml +++ b/module-types/Nokia/PS-7220-IXR-D1-DC-F2B.yaml @@ -1,6 +1,6 @@ --- manufacturer: Nokia -model: PS-7220-D1-DC-F2B +model: PS-7220-IXR-D1-DC-F2B part_number: 3HE16212AA comments: 550W DC Power Supply F2B airflow # airflow: front-to-rear