Merge branch 'master' into cisco-ws-c2960c-8tc-s

.github/workflows/master-slugs.yml

@@ -6,11 +6,14 @@ on:
  - master
 jobs:
  build:
+ if: "!contains(github.event.head_commit.message, 'Regenerate master slug list after successful PR merge')"
  runs-on: ubuntu-latest
  permissions:
  contents: write
  steps:
  - uses: actions/checkout@v4
+ with:
+ ssh-key: ${{secrets.SLUG_DEPLOY_KEY}}
  - name: Setup Python
  uses: actions/setup-python@v5
  id: setup_python
@@ -32,13 +35,24 @@ jobs:
  if: steps.cache-venv.outputs.cache-hit != 'true'
  - name: Regenerate Master Slug List
  run: python3 tests/generate-slug-list.py
- - name: Commit and Push Changes to Master
- uses: EndBug/add-and-commit@v9
- with:
- author_name: NetBox-Bot
- author_email: [email protected]
- committer_name: NetBox-Bot
- committer_email: [email protected]
- default_author: github_actions
- message: "Regenerate master slug list after successful PR merge"
- push: true
+ - name: Set-Up Git
+ run: |
+ git config --global user.name 'NetBox-Bot'
+ git config --global user.email '[email protected]'
+ - name: Commit
+ run: |
+ git add .
+ git commit -m "Regenerate master slug list after successful PR merge"
+ - name: Push to remote
+ run: |
+ git push
+# - name: Commit and Push Changes to Master
+# uses: EndBug/add-and-commit@v9
+# with:
+# author_name: NetBox-Bot
+# author_email: [email protected]
+# committer_name: NetBox-Bot
+# committer_email: [email protected]
+# default_author: github_actions
+# message: "Regenerate master slug list after successful PR merge"
+# push: true

.github/workflows/update-generated-schema.yml

@@ -46,7 +46,7 @@ jobs:
  run: python3 scripts/update-schema.py
  if: ${{ steps.netbox-release.outputs.release != vars.SCHEMA_VERSION }}
  - name: Create Pull Request
- uses: peter-evans/create-pull-request@v6
+ uses: peter-evans/create-pull-request@v7
  with:
  commit-message: "Regenerate master slug list after successful PR merge"
  committer: "NetBox-Bot <[email protected]>"

.github/workflows/validation.yml

@@ -97,7 +97,7 @@ jobs:
  run: pytest --tb=short -v
  - name: Check for pickle file change
  id: pickle-change
- uses: tj-actions/changed-files@v44
+ uses: tj-actions/changed-files@v45
  with:
  files: 'tests/known-slugs.pickle'
  - name: Add PR Comment if pickle file is modified

device-types/APC/SRT2200RMXLI-NC.yaml

@@ -0,0 +1,54 @@
+---
+manufacturer: APC
+model: Smart-UPS SRT 2200VA RM NC
+slug: apc-smart-ups-srt-2200va-rm-nc
+part_number: SRT2200RMXLI-NC
+comments: APC Smart-UPS SRT, 2200 VA, Rackmount, 230 V, Network Card
+u_height: 2
+is_full_depth: true
+console-ports:
+ - name: Serial
+ type: rj-45
+power-ports:
+ - name: Inlet
+ type: iec-60320-c20
+ - name: XLBP Source
+ type: dc-terminal
+power-outlets:
+ - name: Group 1 Outlet 1
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: Group 1 Outlet 2
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: Group 1 Outlet 3
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: Group 1 Outlet 4
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: Group 2 Outlet 1
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: Group 2 Outlet 2
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: Group 2 Outlet 3
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: Group 2 Outlet 4
+ type: iec-60320-c13
+ power_port: Inlet
+ - name: 16A Outlet 1
+ type: iec-60320-c19
+ power_port: Inlet
+ - name: 16A Outlet 2
+ type: iec-60320-c19
+ power_port: Inlet
+interfaces:
+ - name: Ethernet
+ type: 100base-tx
+ mgmt_only: true
+module-bays:
+ - name: SmartSlot
+ position: Rear

device-types/APC/SRT72RMBP.yaml

@@ -0,0 +1,14 @@
+---
+manufacturer: APC
+model: APC Smart-UPS SRT, 72 V, 2,2 kVA, Rackmount Battery Module
+slug: apc-srt72rmbp
+part_number: SRT72RMBP
+comments: APC Smart-UPS SRT, 72 V, 2,2 kVA, Rackmount Battery Module
+u_height: 2
+is_full_depth: true
+power-ports:
+ - name: XLBP Source
+ type: dc-terminal
+power-outlets:
+ - name: XLBP Output
+ type: dc-terminal

device-types/Apple/mac-mini-2023.yaml

@@ -0,0 +1,32 @@
+---
+manufacturer: Apple
+model: Mac mini (2023)
+slug: apple-mac-mini-2023
+part_number: Mac14,3
+u_height: 1.0
+is_full_depth: false
+airflow: passive
+weight: 2.6
+weight_unit: lb
+comments: https://support.apple.com/en-us/111837
+power-ports:
+ - name: Power
+ type: nema-1-15p
+ maximum_draw: 150
+interfaces:
+ - name: eth
+ type: 10gbase-t
+ enabled: true
+ mgmt_only: false
+ - name: thunderbolt-1
+ type: other
+ enabled: true
+ mgmt_only: false
+ - name: thunderbolt-2
+ type: other
+ enabled: true
+ mgmt_only: false
+ - name: wireless
+ type: ieee802.11ax
+ enabled: true
+ mgmt_only: false

device-types/Arista/DCS-7050CX3-32C-F.yaml

@@ -17,6 +17,8 @@ module-bays:
  position: '0'
  - name: PSU 1
  position: '1'
+front_image: true
+rear_image: true
 interfaces:
  - name: Ethernet1/1
  type: 100gbase-x-qsfp28

device-types/Arista/DCS-7050CX3-32C-R.yaml

@@ -17,6 +17,8 @@ module-bays:
  position: '0'
  - name: PSU 1
  position: '1'
+front_image: true
+rear_image: false
 interfaces:
  - name: Ethernet1/1
  type: 100gbase-x-qsfp28

device-types/Arista/DCS-7050TX-64.yaml

@@ -0,0 +1,125 @@
+---
+manufacturer: Arista
+model: DCS-7050TX-64
+slug: arista-dcs-7050tx-64
+part_number: DCS-7050TX-64
+airflow: front-to-rear
+weight: 8.6
+weight_unit: kg
+is_full_depth: true
+u_height: 1
+interfaces:
+ - name: Ethernet1
+ type: 10gbase-t
+ - name: Ethernet2
+ type: 10gbase-t
+ - name: Ethernet3
+ type: 10gbase-t
+ - name: Ethernet4
+ type: 10gbase-t
+ - name: Ethernet5
+ type: 10gbase-t
+ - name: Ethernet6
+ type: 10gbase-t
+ - name: Ethernet7
+ type: 10gbase-t
+ - name: Ethernet8
+ type: 10gbase-t
+ - name: Ethernet9
+ type: 10gbase-t
+ - name: Ethernet10
+ type: 10gbase-t
+ - name: Ethernet11
+ type: 10gbase-t
+ - name: Ethernet12
+ type: 10gbase-t
+ - name: Ethernet13
+ type: 10gbase-t
+ - name: Ethernet14
+ type: 10gbase-t
+ - name: Ethernet15
+ type: 10gbase-t
+ - name: Ethernet16
+ type: 10gbase-t
+ - name: Ethernet17
+ type: 10gbase-t
+ - name: Ethernet18
+ type: 10gbase-t
+ - name: Ethernet19
+ type: 10gbase-t
+ - name: Ethernet20
+ type: 10gbase-t
+ - name: Ethernet21
+ type: 10gbase-t
+ - name: Ethernet22
+ type: 10gbase-t
+ - name: Ethernet23
+ type: 10gbase-t
+ - name: Ethernet24
+ type: 10gbase-t
+ - name: Ethernet25
+ type: 10gbase-t
+ - name: Ethernet26
+ type: 10gbase-t
+ - name: Ethernet27
+ type: 10gbase-t
+ - name: Ethernet28
+ type: 10gbase-t
+ - name: Ethernet29
+ type: 10gbase-t
+ - name: Ethernet30
+ type: 10gbase-t
+ - name: Ethernet31
+ type: 10gbase-t
+ - name: Ethernet32
+ type: 10gbase-t
+ - name: Ethernet33
+ type: 10gbase-t
+ - name: Ethernet34
+ type: 10gbase-t
+ - name: Ethernet35
+ type: 10gbase-t
+ - name: Ethernet36
+ type: 10gbase-t
+ - name: Ethernet37
+ type: 10gbase-t
+ - name: Ethernet38
+ type: 10gbase-t
+ - name: Ethernet39
+ type: 10gbase-t
+ - name: Ethernet40
+ type: 10gbase-t
+ - name: Ethernet41
+ type: 10gbase-t
+ - name: Ethernet42
+ type: 10gbase-t
+ - name: Ethernet43
+ type: 10gbase-t
+ - name: Ethernet44
+ type: 10gbase-t
+ - name: Ethernet45
+ type: 10gbase-t
+ - name: Ethernet46
+ type: 10gbase-t
+ - name: Ethernet47
+ type: 10gbase-t
+ - name: Ethernet48
+ type: 10gbase-t
+ - name: Ethernet49
+ type: 40gbase-x-qsfpp
+ - name: Ethernet50
+ type: 40gbase-x-qsfpp
+ - name: Ethernet51
+ type: 40gbase-x-qsfpp
+ - name: Ethernet52
+ type: 40gbase-x-qsfpp
+ - name: Management1
+ type: 1000base-t
+console-ports:
+ - name: Console
+ type: rj-45
+module-bays:
+ - name: PS1
+ position: '1'
+ - name: PS2
+ position: '2'