From bf9c412d2a3e2ea66888d68aa786ec65abd6f841 Mon Sep 17 00:00:00 2001 From: simonreeser-snl <155495347+simonreeser-snl@users.noreply.github.com> Date: Fri, 25 Oct 2024 02:20:44 -0600 Subject: [PATCH] Improving support for ZPE NSR. Update static interfaces to modules. Modules added: 1. NSR-16ETH-EXPN 2. NSR-16SRL-EXPN 3. NSR-8SFP-EXPN (#2194) Co-authored-by: Harry --- device-types/ZPE/NSR-BASE-DAC.yaml | 101 +++++---------------------- module-types/ZPE/NSR-16ETH-EXPN.yaml | 71 +++++++++++++++++++ module-types/ZPE/NSR-16SRL-EXPN.yaml | 39 +++++++++++ module-types/ZPE/NSR-8SFP-EXPN.yaml | 23 ++++++ 4 files changed, 149 insertions(+), 85 deletions(-) create mode 100644 module-types/ZPE/NSR-16ETH-EXPN.yaml create mode 100644 module-types/ZPE/NSR-16SRL-EXPN.yaml create mode 100644 module-types/ZPE/NSR-8SFP-EXPN.yaml diff --git a/device-types/ZPE/NSR-BASE-DAC.yaml b/device-types/ZPE/NSR-BASE-DAC.yaml index d3d485ea7..d77388387 100644 --- a/device-types/ZPE/NSR-BASE-DAC.yaml +++ b/device-types/ZPE/NSR-BASE-DAC.yaml @@ -5,43 +5,13 @@ slug: zpe-nsr-base-dac part_number: NSR-BASE-DAC u_height: 1 is_full_depth: true -comments: ZPE Nodegrid Net Services Router. 16X RJ45 Serial, 20X ETH (18 GbE, 2 SFP+), 3X USB +comments: ZPE Nodegrid Net Services Router. NSR Chassis, Backplane Switch, 2 SFP+, 2 USB 2.0, 1 USB 3.0, 2 GbE, 1 HDMI, 1 console console-ports: - name: Console type: rj-45 + - name: HDMI + type: other console-server-ports: - - name: ttyS1-1 - type: rj-45 - - name: ttyS1-2 - type: rj-45 - - name: ttyS1-3 - type: rj-45 - - name: ttyS1-4 - type: rj-45 - - name: ttyS1-5 - type: rj-45 - - name: ttyS1-6 - type: rj-45 - - name: ttyS1-7 - type: rj-45 - - name: ttyS1-8 - type: rj-45 - - name: ttyS1-9 - type: rj-45 - - name: ttyS1-10 - type: rj-45 - - name: ttyS1-11 - type: rj-45 - - name: ttyS1-12 - type: rj-45 - - name: ttyS1-13 - type: rj-45 - - name: ttyS1-14 - type: rj-45 - - name: ttyS1-15 - type: rj-45 - - name: ttyS1-16 - type: rj-45 - name: usbS0-1 type: usb-a - name: usbS0-2 @@ -49,10 +19,10 @@ console-server-ports: - name: usbS0-3 type: usb-a power-ports: - - name: PSU1 + - name: PS1 type: dc-terminal allocated_draw: 45 - - name: PSU2 + - name: PS2 type: dc-terminal allocated_draw: 45 interfaces: @@ -64,56 +34,17 @@ interfaces: type: 10gbase-x-sfpp - name: SFP1 type: 10gbase-x-sfpp - - name: netS2-1 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-2 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-3 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-4 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-5 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-6 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-7 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-8 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-9 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-10 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-11 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-12 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-13 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-14 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-15 - type: 1000base-t - poe_type: type2-ieee802.3at - - name: netS2-16 - type: 1000base-t - poe_type: type2-ieee802.3at +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' # TODO 2xGPIO, 1xDigital Out, 1xRelay Port # 1 x optional WiFi module - # SLOTS??? this is a modular device but this yaml file is a first pass # 2 x LTE modem slots - # 1 x HDMI diff --git a/module-types/ZPE/NSR-16ETH-EXPN.yaml b/module-types/ZPE/NSR-16ETH-EXPN.yaml new file mode 100644 index 000000000..209b49b88 --- /dev/null +++ b/module-types/ZPE/NSR-16ETH-EXPN.yaml @@ -0,0 +1,71 @@ +--- +manufacturer: ZPE +model: NSR-16ETH-EXPN +part_number: ZPE-NSR-16ETH-EXPN +description: NSR 16-Port 1GbE - Ethernet Expansion Card +comments: '[ZPE Systems Net Services Router Product Sheet](https://www.zpesystems.com/nodegrid/Datasheet/New/NodeGrid%20Services%20Router.pdf)' +interfaces: + - name: netS{module}-1 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-2 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-3 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-4 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-5 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-6 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-7 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-8 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-9 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-10 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-11 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-12 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-13 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-14 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-15 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false + - name: netS{module}-16 + type: 1000base-t + poe_type: type2-ieee802.3at + mgmt_only: false diff --git a/module-types/ZPE/NSR-16SRL-EXPN.yaml b/module-types/ZPE/NSR-16SRL-EXPN.yaml new file mode 100644 index 000000000..e10124873 --- /dev/null +++ b/module-types/ZPE/NSR-16SRL-EXPN.yaml @@ -0,0 +1,39 @@ +--- +manufacturer: ZPE +model: NSR-16SRL-EXPN +part_number: ZPE-NSR-16SRL-EXPN +description: NSR 16-Port RJ45 Serial Rolled Expansion Card +comments: '[ZPE Systems Net Services Router Product Sheet](https://www.zpesystems.com/nodegrid/Datasheet/New/NodeGrid%20Services%20Router.pdf)' +console-server-ports: + - name: ttyS{module}-1 + type: rj-45 + - name: ttyS{module}-2 + type: rj-45 + - name: ttyS{module}-3 + type: rj-45 + - name: ttyS{module}-4 + type: rj-45 + - name: ttyS{module}-5 + type: rj-45 + - name: ttyS{module}-6 + type: rj-45 + - name: ttyS{module}-7 + type: rj-45 + - name: ttyS{module}-8 + type: rj-45 + - name: ttyS{module}-9 + type: rj-45 + - name: ttyS{module}-10 + type: rj-45 + - name: ttyS{module}-11 + type: rj-45 + - name: ttyS{module}-12 + type: rj-45 + - name: ttyS{module}-13 + type: rj-45 + - name: ttyS{module}-14 + type: rj-45 + - name: ttyS{module}-15 + type: rj-45 + - name: ttyS{module}-16 + type: rj-45 diff --git a/module-types/ZPE/NSR-8SFP-EXPN.yaml b/module-types/ZPE/NSR-8SFP-EXPN.yaml new file mode 100644 index 000000000..853ec6306 --- /dev/null +++ b/module-types/ZPE/NSR-8SFP-EXPN.yaml @@ -0,0 +1,23 @@ +--- +manufacturer: ZPE +model: NSR-8SFP-EXPN +part_number: ZPE-NSR-8SFP-EXPN +description: NSR 8-Port 10GbE SFP Expansion Card +comments: '[ZPE Systems Net Services Router Product Sheet](https://www.zpesystems.com/nodegrid/Datasheet/New/NodeGrid%20Services%20Router.pdf)' +interfaces: + - name: netS{module}-1 + type: 10gbase-x-sfpp + - name: netS{module}-2 + type: 10gbase-x-sfpp + - name: netS{module}-3 + type: 10gbase-x-sfpp + - name: netS{module}-4 + type: 10gbase-x-sfpp + - name: netS{module}-5 + type: 10gbase-x-sfpp + - name: netS{module}-6 + type: 10gbase-x-sfpp + - name: netS{module}-7 + type: 10gbase-x-sfpp + - name: netS{module}-8 + type: 10gbase-x-sfpp