Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/jsonschema-4.21.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sjurtf authored Feb 20, 2024
2 parents 9d9ab21 + bef2d45 commit 7926090
Show file tree
Hide file tree
Showing 10 changed files with 147 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
runs-on: ubuntu-latest
needs: [lint, format]
permissions:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@v4
Expand Down
18 changes: 18 additions & 0 deletions device-types/Ross/Ultrix-FR1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
manufacturer: Ross
model: Ultrix FR1
slug: ross-ultrix-fr1
part_number: 2101AR-201-02D
u_height: 1.0
is_full_depth: true
airflow: front-to-rear
weight: 4.0
weight_unit: kg
interfaces:
- name: ENET 1
type: 1000base-t
- name: ENET 2
type: 1000base-t
module-bays:
- name: Slot 1
- name: Slot 2
32 changes: 32 additions & 0 deletions device-types/Ross/Ultrix-FR12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
manufacturer: Ross
model: Ultrix FR12
slug: ross-ultrix-fr12
u_height: 12.0
is_full_depth: true
airflow: front-to-rear
comments: Must be accompanied by a Ultricore BCS
weight: 34.5
weight_unit: kg
interfaces:
- name: ENET 1
type: 1000base-t
- name: ENET 2
type: 1000base-t
module-bays:
- name: Slot 1
- name: Slot 2
- name: Slot 3
- name: Slot 4
- name: Slot 5
- name: Slot 6
- name: Slot 7
- name: Slot 8
- name: Slot 9
- name: Slot 10
- name: Slot 11
- name: Slot 12
- name: Slot 13
- name: Slot 14
- name: Slot 15
- name: Slot 16
20 changes: 20 additions & 0 deletions device-types/Ross/Ultrix-FR2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
manufacturer: Ross
model: Ultrix FR2
slug: ross-ultrix-fr2
part_number: 2101AR-202-02C
u_height: 2.0
is_full_depth: true
airflow: front-to-rear
weight: 5.4
weight_unit: kg
interfaces:
- name: ENET 1
type: 1000base-t
- name: ENET 2
type: 1000base-t
module-bays:
- name: Slot 1
- name: Slot 2
- name: Slot 3
- name: Slot 4
24 changes: 24 additions & 0 deletions device-types/Ross/Ultrix-FR5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
manufacturer: Ross
model: Ultrix FR5
slug: ross-ultrix-fr5
u_height: 5.0
is_full_depth: true
airflow: front-to-rear
weight: 6.4
weight_unit: kg
interfaces:
- name: ENET 1
type: 1000base-t
- name: ENET 2
type: 1000base-t
module-bays:
- name: Slot 1
- name: Slot 2
- name: Slot 3
- name: Slot 4
- name: Slot 5
- name: Slot 6
- name: Slot 7
- name: Slot 8
- name: Slot 9
22 changes: 22 additions & 0 deletions module-types/Ross/Ultrix-IP-IO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
manufacturer: Ross
model: ULTRIX-IP-IO
part_number: ULTRIX-IP-IO
interfaces:
- name: '1'
type: 25gbase-x-sfp28
- name: '2'
type: 25gbase-x-sfp28
- name: '3'
type: 25gbase-x-sfp28
- name: '4'
type: 25gbase-x-sfp28
rear-ports:
- name: AUX 1
type: other
positions: 1
description: SFP
- name: AUX 2
type: other
positions: 1
description: SFP
26 changes: 26 additions & 0 deletions module-types/Ross/Ultrix-IPX-IO.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
manufacturer: Ross
model: ULTRIX-IPX-IO
part_number: ULTRIX-IPX-IO
interfaces:
- name: '1'
type: 100gbase-x-qsfp28
- name: '2'
type: 100gbase-x-qsfp28
- name: '3'
type: 100gbase-x-qsfp28
- name: '4'
type: 100gbase-x-qsfp28
rear-ports:
- name: A
type: other
positions: 1
- name: B
type: other
positions: 1
- name: C
type: other
positions: 1
- name: D
type: other
positions: 1
Binary file modified tests/known-modules.pickle
Binary file not shown.
Binary file modified tests/known-slugs.pickle
Binary file not shown.
6 changes: 4 additions & 2 deletions tests/test_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
KNOWN_SLUGS = set()
KNOWN_MODULES = set()

USE_LOCAL_KNOWN_SLUGS = False
USE_LOCAL_KNOWN_SLUGS = True
USE_UPSTREAM_DIFF = True

NETBOX_DT_LIBRARY_URL = "https://github.com/netbox-community/devicetype-library.git"


NETBOX_DT_LIBRARY_URL = f"https://github.com/nrkno/netbox-devicetype-library.git"

0 comments on commit 7926090

Please sign in to comment.