From f6f7257a0c5bded7dc7b9cdd0514a8ec521d6970 Mon Sep 17 00:00:00 2001 From: Sjur Fredriksen Date: Wed, 24 Apr 2024 14:27:21 +0200 Subject: [PATCH] fixes on Ross equipment --- device-types/Ross/Ultricore-BCS.yaml | 2 ++ device-types/Ross/Ultripower-PS.yaml | 1 + device-types/Ross/Ultritoutch-2.yaml | 2 ++ device-types/Ross/Ultritoutch-4.yaml | 2 ++ device-types/Ross/Ultrix-FR1.yaml | 6 ++++- device-types/Ross/Ultrix-FR12.yaml | 18 +++++++++++++ device-types/Ross/Ultrix-FR2.yaml | 6 +++++ device-types/Ross/Ultrix-FR5.yaml | 12 ++++++++- module-types/Ross/Ultrix-IP-IO.yaml | 29 ++++++-------------- module-types/Ross/Ultrix-IPX-IO.yaml | 40 +++++++--------------------- 10 files changed, 64 insertions(+), 54 deletions(-) diff --git a/device-types/Ross/Ultricore-BCS.yaml b/device-types/Ross/Ultricore-BCS.yaml index 02b91711..47867dca 100644 --- a/device-types/Ross/Ultricore-BCS.yaml +++ b/device-types/Ross/Ultricore-BCS.yaml @@ -10,8 +10,10 @@ front_image: true interfaces: - name: ENET 1 type: 1000base-t + mgmt_only: true - name: ENET 2 type: 1000base-t + mgmt_only: true power-ports: - name: PWR1 type: dc-terminal diff --git a/device-types/Ross/Ultripower-PS.yaml b/device-types/Ross/Ultripower-PS.yaml index 82157a35..fa821e48 100644 --- a/device-types/Ross/Ultripower-PS.yaml +++ b/device-types/Ross/Ultripower-PS.yaml @@ -13,6 +13,7 @@ rear_image: true interfaces: - name: ETHERNET type: 1000base-t + mgmt_only: true module-bays: - name: PS-A position: A diff --git a/device-types/Ross/Ultritoutch-2.yaml b/device-types/Ross/Ultritoutch-2.yaml index 6dafce02..3434acec 100644 --- a/device-types/Ross/Ultritoutch-2.yaml +++ b/device-types/Ross/Ultritoutch-2.yaml @@ -9,8 +9,10 @@ front_image: true interfaces: - name: ENET 1 type: 1000base-t + mgmt_only: true - name: ENET 2 type: 1000base-t + mgmt_only: true power-ports: - name: PWR1 type: dc-terminal diff --git a/device-types/Ross/Ultritoutch-4.yaml b/device-types/Ross/Ultritoutch-4.yaml index a8b83718..1fed7651 100644 --- a/device-types/Ross/Ultritoutch-4.yaml +++ b/device-types/Ross/Ultritoutch-4.yaml @@ -9,8 +9,10 @@ front_image: true interfaces: - name: ENET 1 type: 1000base-t + mgmt_only: true - name: ENET 2 type: 1000base-t + mgmt_only: true power-ports: - name: PWR1 type: dc-terminal diff --git a/device-types/Ross/Ultrix-FR1.yaml b/device-types/Ross/Ultrix-FR1.yaml index 7575bc89..cdfcac66 100644 --- a/device-types/Ross/Ultrix-FR1.yaml +++ b/device-types/Ross/Ultrix-FR1.yaml @@ -13,11 +13,15 @@ rear_image: true interfaces: - name: ENET 1 type: 1000base-t + mgmt_only: true - name: ENET 2 type: 1000base-t + mgmt_only: true module-bays: - name: Slot 1 - - name: Slot 2 + position: '1' + - name: Slot 2 MIOB + position: '2' power-ports: - name: PWR1 type: dc-terminal diff --git a/device-types/Ross/Ultrix-FR12.yaml b/device-types/Ross/Ultrix-FR12.yaml index 3ac6b0c5..7db28927 100644 --- a/device-types/Ross/Ultrix-FR12.yaml +++ b/device-types/Ross/Ultrix-FR12.yaml @@ -13,25 +13,43 @@ rear_image: true interfaces: - name: ENET 1 type: 1000base-t + mgmt_only: true - name: ENET 2 type: 1000base-t + mgmt_only: true module-bays: - name: Slot 1 + position: '1' - name: Slot 2 + position: '2' - name: Slot 3 + position: '3' - name: Slot 4 + position: '4' - name: Slot 5 + position: '5' - name: Slot 6 + position: '6' - name: Slot 7 + position: '7' - name: Slot 8 + position: '8' - name: Slot 9 + position: '9' - name: Slot 10 + position: '10' - name: Slot 11 + position: '11' - name: Slot 12 + position: '12' - name: Slot 13 + position: '13' - name: Slot 14 + position: '14' - name: Slot 15 + position: '15' - name: Slot 16 + position: '16' power-ports: - name: PWR1 type: dc-terminal diff --git a/device-types/Ross/Ultrix-FR2.yaml b/device-types/Ross/Ultrix-FR2.yaml index 42ccfbb5..f024dd87 100644 --- a/device-types/Ross/Ultrix-FR2.yaml +++ b/device-types/Ross/Ultrix-FR2.yaml @@ -13,13 +13,19 @@ rear_image: true interfaces: - name: ENET 1 type: 1000base-t + mgmt_only: true - name: ENET 2 type: 1000base-t + mgmt_only: true module-bays: - name: Slot 1 + position: '1' - name: Slot 2 + position: '2' - name: Slot 3 + position: '3' - name: Slot 4 + position: '4' power-ports: - name: PWR1 type: dc-terminal diff --git a/device-types/Ross/Ultrix-FR5.yaml b/device-types/Ross/Ultrix-FR5.yaml index 18ca1152..16baed11 100644 --- a/device-types/Ross/Ultrix-FR5.yaml +++ b/device-types/Ross/Ultrix-FR5.yaml @@ -12,18 +12,28 @@ rear_image: true interfaces: - name: ENET 1 type: 1000base-t + mgmt_only: true - name: ENET 2 type: 1000base-t + mgmt_only: true module-bays: + - name: Flex - name: Slot 1 + position: '1' - name: Slot 2 + position: '2' - name: Slot 3 + position: '3' - name: Slot 4 + position: '4' - name: Slot 5 + position: '5' - name: Slot 6 + position: '6' - name: Slot 7 + position: '7' - name: Slot 8 - - name: Slot 9 + position: '8' power-ports: - name: PWR1 type: dc-terminal diff --git a/module-types/Ross/Ultrix-IP-IO.yaml b/module-types/Ross/Ultrix-IP-IO.yaml index 7c23e29d..a1688afb 100644 --- a/module-types/Ross/Ultrix-IP-IO.yaml +++ b/module-types/Ross/Ultrix-IP-IO.yaml @@ -5,28 +5,15 @@ part_number: ULTRIX-IP-IO description: The primary function of each ULTRIX-IP-IO PORT (1-4) is to provide a 25GbE network interface (SFP28) that can be configured as a Receiver and/or a Sender in DashBoard. interfaces: - - name: '1' + - name: eth{module}1 + label: '1' type: 25gbase-x-sfp28 - - name: '2' + - name: eth{module}2 + label: '2' type: 25gbase-x-sfp28 - - name: '3' + - name: eth{module}3 + label: '3' type: 25gbase-x-sfp28 - - name: '4' + - name: eth{module}4 + label: '4' type: 25gbase-x-sfp28 -rear-ports: - - name: Backplane interconnect - type: other - positions: 2 -front-ports: - - name: AUX 1 - type: other - positions: 1 - description: SFP - rear_port: Backplane interconnect - rear_port_position: 1 - - name: AUX 2 - type: other - positions: 1 - description: SFP - rear_port: Backplane interconnect - rear_port_position: 2 diff --git a/module-types/Ross/Ultrix-IPX-IO.yaml b/module-types/Ross/Ultrix-IPX-IO.yaml index 785e59a9..8af68fbd 100644 --- a/module-types/Ross/Ultrix-IPX-IO.yaml +++ b/module-types/Ross/Ultrix-IPX-IO.yaml @@ -2,39 +2,17 @@ manufacturer: Ross model: ULTRIX-IPX-IO part_number: ULTRIX-IPX-IO -description: The Ultrix IPX-IO cards are designed to seamlessly integrate SMPTE ST-2110 IP streams into the Ultrix platform, without compromising on its - powerful features and licensing capabilities. The cards offer scalability and high total bandwidth, making them suitable for a range of IP applications. +description: The Ultrix IPX-IO cards are designed to seamlessly integrate SMPTE ST-2110 IP streams into the Ultrix platform. interfaces: - - name: '1' + - name: eth{module}1 + label: '1' type: 100gbase-x-qsfp28 - - name: '2' + - name: eth{module}2 + label: '2' type: 100gbase-x-qsfp28 - - name: '3' + - name: eth{module}3 + label: '3' type: 100gbase-x-qsfp28 - - name: '4' + - name: eth{module}4 + label: '4' type: 100gbase-x-qsfp28 -rear-ports: - - name: Backplane interconnect - type: other - positions: 4 -front-ports: - - name: A - type: other - description: SFP - rear_port: Backplane interconnect - rear_port_position: 1 - - name: B - type: other - description: SFP - rear_port: Backplane interconnect - rear_port_position: 2 - - name: C - type: other - description: SFP - rear_port: Backplane interconnect - rear_port_position: 3 - - name: D - type: other - description: SFP - rear_port: Backplane interconnect - rear_port_position: 4