diff --git a/device-types/Cisco/N3K-C3064PQ-10GE.yaml b/device-types/Cisco/N3K-C3064PQ-10GE.yaml index b5051bb48..8dd4badca 100644 --- a/device-types/Cisco/N3K-C3064PQ-10GE.yaml +++ b/device-types/Cisco/N3K-C3064PQ-10GE.yaml @@ -1,7 +1,7 @@ --- manufacturer: Cisco model: Nexus C3064PQ-10GE -slug: cisco-nexus-c3064pq-10ge +slug: cisco-n3k-c3064pq-10ge part_number: N3K-C3064PQ-10GE u_height: 1 is_full_depth: false diff --git a/device-types/Extreme Networks/X150-24p.yaml b/device-types/Extreme Networks/X150-24p.yaml index 044216fb5..39217e134 100644 --- a/device-types/Extreme Networks/X150-24p.yaml +++ b/device-types/Extreme Networks/X150-24p.yaml @@ -7,6 +7,7 @@ is_full_depth: false weight: 5.5 weight_unit: kg airflow: right-to-left +front_image: true comments: '[Extreme Networks X150-24p Datasheet](https://documentation.extremenetworks.com/summit_16/GUID-0CD347F4-C441-47C3-9D5B-3BA8649DB783.shtml)' power-ports: - name: DCE2 diff --git a/device-types/Extreme Networks/X150-24t.yaml b/device-types/Extreme Networks/X150-24t.yaml index 28c65a252..008fdbe8a 100644 --- a/device-types/Extreme Networks/X150-24t.yaml +++ b/device-types/Extreme Networks/X150-24t.yaml @@ -7,6 +7,7 @@ is_full_depth: false weight: 4.8 weight_unit: kg airflow: right-to-left +front_image: true comments: '[Extreme Networks X150-24t Datasheet](https://documentation.extremenetworks.com/summit_16/GUID-A48D9BB9-E0EC-41DB-AE56-F2615275A38A.shtml)' power-ports: - name: DCE2 diff --git a/device-types/Extreme Networks/X150-48t.yaml b/device-types/Extreme Networks/X150-48t.yaml index aa259a762..7a5088d09 100644 --- a/device-types/Extreme Networks/X150-48t.yaml +++ b/device-types/Extreme Networks/X150-48t.yaml @@ -7,6 +7,7 @@ is_full_depth: false weight: 5.5 weight_unit: kg airflow: right-to-left +front_image: true comments: '[Extreme Networks X150-48t Datasheet](https://documentation.extremenetworks.com/summit_16/GUID-05C591DD-EB29-4D08-B5D5-F21C4AEFD200.shtml)' power-ports: - name: DCE2 diff --git a/device-types/Synology/RS3621xs+.yaml b/device-types/Synology/RS3621xs+.yaml index 2fe48232c..ab9d0a855 100644 --- a/device-types/Synology/RS3621xs+.yaml +++ b/device-types/Synology/RS3621xs+.yaml @@ -18,6 +18,10 @@ module-bays: - name: PSU-2 label: '2' position: PSU-2 + - name: PCIe Slot 1 + position: '1' + - name: PCIe Slot 2 + position: '2' interfaces: - name: LAN1 type: 1000base-t diff --git a/module-types/Cisco/NXA-PAC-1200W-PI.yaml b/module-types/Cisco/NXA-PAC-1200W-PI.yaml new file mode 100644 index 000000000..430b3967b --- /dev/null +++ b/module-types/Cisco/NXA-PAC-1200W-PI.yaml @@ -0,0 +1,12 @@ +--- +manufacturer: Cisco +model: NXA-PAC-1200W-PI +part_number: NXA-PAC-1200W-PI +description: Nexus AC 1200W PSU - Port Side Intake +comments: Nexus AC 1200W PSU - Port Side Intake / [Cisco Nexus 9300-FX2 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/nexus-9000-series-switches/datasheet-c78-742282.html) +weight: 1.1 +weight_unit: kg +power-ports: + - name: PSU{module} + type: iec-60320-c14 + maximum_draw: 1100 diff --git a/module-types/Synology/E25G30-F2.yaml b/module-types/Synology/E25G30-F2.yaml new file mode 100644 index 000000000..099b938da --- /dev/null +++ b/module-types/Synology/E25G30-F2.yaml @@ -0,0 +1,11 @@ +--- +manufacturer: Synology +model: E25G30-F2 +part_number: E25G30-F2 +description: Dual-port 25GbE SFP28 PCIe 3.0 x8 Network adapter +comments: '[E25G30-F2 Specs](https://www.synology.com/en-us/products/E25G30-F2#specs)' +interfaces: + - name: '{module}/LAN 1' + type: 25gbase-x-sfp28 + - name: '{module}/LAN 2' + type: 25gbase-x-sfp28 diff --git a/module-types/Synology/PSU 500W-RP Module_2.yml b/module-types/Synology/PSU 500W-RP Module_2.yml new file mode 100644 index 000000000..00c442971 --- /dev/null +++ b/module-types/Synology/PSU 500W-RP Module_2.yml @@ -0,0 +1,15 @@ +--- +manufacturer: Synology +model: PSU 500W-RP Module_2 +part_number: PSU 500W-RP Module_2 +description: Redundant Power Module 500W +weight: 0.77 +weight_unit: kg +comments: | + [PSU 500W-RP Redundant Power Module 500W](https://www.synology.com/de-de/products/spare_parts?search_by=category&category=PSU) + + for FS3410, SA6400, SA3610, SA3410, RS4021xs+, RS3621xs+, RS3621RPxs, RS2821RP+, RX1223RP. +power-ports: + - name: '{module}' + type: iec-60320-c14 + maximum_draw: 500 diff --git a/module-types/Synology/PSU 550W-RP Module_1.yml b/module-types/Synology/PSU 550W-RP Module_1.yml new file mode 100644 index 000000000..d5b658a20 --- /dev/null +++ b/module-types/Synology/PSU 550W-RP Module_1.yml @@ -0,0 +1,15 @@ +--- +manufacturer: Synology +model: PSU 550W-RP Module_1 +part_number: PSU 550W-RP Module_1 +description: Redundant Power Module 550W +weight: 0.82 +weight_unit: kg +comments: | + [PSU 550W-RP Redundant Power Module 550W](https://www.synology.com/de-de/products/spare_parts?search_by=category&category=PSU) + + for FS3410, SA6400, SA3610, SA3410, RS4021xs+, RS3621xs+, RS3621RPxs, RS2821RP+, RX1223RP. +power-ports: + - name: '{module}' + type: iec-60320-c14 + maximum_draw: 550 diff --git a/tests/definitions_test.py b/tests/definitions_test.py index ed760470f..14a8372a0 100644 --- a/tests/definitions_test.py +++ b/tests/definitions_test.py @@ -159,6 +159,14 @@ def test_definitions(file_path, schema, change_type): # Load YAML data from file definition = yaml.load(content, Loader=DecimalSafeLoader) + + # Check for non-ASCII characters + non_ascii_chars = [char for char in content if ord(char) > 127] + if non_ascii_chars: + pytest.fail( + f"{file_path} contains non-ASCII characters: {', '.join(set(non_ascii_chars))}", + pytrace=False + ) # Validate YAML definition against the supplied schema try: diff --git a/tests/known-modules.pickle b/tests/known-modules.pickle index 0a8451019..2fafe6506 100644 Binary files a/tests/known-modules.pickle and b/tests/known-modules.pickle differ diff --git a/tests/known-slugs.pickle b/tests/known-slugs.pickle index 7f3548c3c..46bbe6b0c 100644 Binary files a/tests/known-slugs.pickle and b/tests/known-slugs.pickle differ