Remove unrelated development path

Still outstanding:

* IPAddress and IPRange triggers
* Triggers for VRF changes on Prefix
* Triggers for changing to "container" on Prefix
* Rework logic for saving on all models

.github/ISSUE_TEMPLATE/01-feature_request.yaml

@@ -2,7 +2,7 @@
 name: ✨ Feature Request
 type: Feature
 description: Propose a new NetBox feature or enhancement
-labels: ["netbox", "type: feature", "status: needs triage"]
+labels: ["type: feature", "status: needs triage"]
 body:
   - type: markdown
     attributes:
@@ -15,7 +15,7 @@ body:
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-      placeholder: v4.4.9
+      placeholder: v4.4.0
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/02-bug_report.yaml

@@ -2,32 +2,32 @@
 name: 🐛 Bug Report
 type: Bug
 description: Report a reproducible bug in the current release of NetBox
-labels: ["netbox", "type: bug", "status: needs triage"]
+labels: ["type: bug", "status: needs triage"]
 body:
   - type: markdown
     attributes:
       value: >
         **NOTE:** This form is only for reporting _reproducible bugs_ in a current NetBox
-        release. If you're having trouble with installation or just looking for assistance
-        using NetBox, please visit our
+        installation. If you're having trouble with installation or just looking for
+        assistance with using NetBox, please visit our
         [discussion forum](https://github.com/netbox-community/netbox/discussions) instead.
   - type: dropdown
     attributes:
-      label: NetBox Edition
+      label: Deployment Type
       description: >
-        Users of [NetBox Cloud](https://netboxlabs.com/netbox-cloud/) or
-        [NetBox Enterprise](https://netboxlabs.com/netbox-enterprise/), please contact the
-        [NetBox Labs](https://netboxlabs.com/) support team for assistance to ensure your
-        request receives immediate attention.
+        How are you running NetBox? (For issues with the Docker image, please go to the
+        [netbox-docker](https://github.com/netbox-community/netbox-docker) repo.)
       options:
-        - NetBox Community
+        - NetBox Cloud
+        - NetBox Enterprise
+        - Self-hosted
     validations:
       required: true
   - type: input
     attributes:
       label: NetBox Version
       description: What version of NetBox are you currently running?
-      placeholder: v4.4.9
+      placeholder: v4.4.0
     validations:
       required: true
   - type: dropdown
@@ -35,9 +35,9 @@ body:
       label: Python Version
       description: What version of Python are you currently running?
       options:
-        - "3.10"
-        - "3.11"
         - "3.12"
+        - "3.13"
+        - "3.14"
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/03-documentation_change.yaml

@@ -2,7 +2,7 @@
 name: 📖 Documentation Change
 type: Documentation
 description: Suggest an addition or modification to the NetBox documentation
-labels: ["netbox", "type: documentation", "status: needs triage"]
+labels: ["type: documentation", "status: needs triage"]
 body:
   - type: dropdown
     attributes:
@@ -25,12 +25,9 @@ body:
         - Getting started
         - Configuration
         - Customization
-        - Best practices
         - Integrations/API
         - Plugins
         - Administration
-        - Data model
-        - Reference
         - Development
         - Other
     validations:

.github/ISSUE_TEMPLATE/04-translation.yaml

@@ -2,7 +2,7 @@
 name: 🌍 Translation
 type: Translation
 description: Request support for a new language in the user interface
-labels: ["netbox", "type: translation"]
+labels: ["type: translation"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/05-housekeeping.yaml

@@ -2,7 +2,7 @@
 name: 🏡 Housekeeping
 type: Housekeeping
 description: A change pertaining to the codebase itself (developers only)
-labels: ["netbox", "type: housekeeping"]
+labels: ["type: housekeeping"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/06-deprecation.yaml

@@ -2,7 +2,7 @@
 name: 🗑️ Deprecation
 type: Deprecation
 description: The removal of an existing feature or resource
-labels: ["netbox", "type: deprecation"]
+labels: ["type: deprecation"]
 body:
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -13,6 +13,9 @@ contact_links:
   - name: 🌎 Correct a Translation
     url: https://explore.transifex.com/netbox-community/netbox/
     about: "Spot an incorrect translation? You can propose a fix on Transifex."
+  - name: 💡 Plugin Idea
+    url: https://plugin-ideas.netbox.dev
+    about: "Have an idea for a plugin? Head over to the ideas board!"
   - name: 💬 Community Slack
     url: https://netdev.chat
     about: "Join #netbox on the NetDev Community Slack for assistance with installation issues and other problems."

.github/codeql/codeql-config.yml

@@ -1,11 +1,3 @@
 paths-ignore:
   # Ignore compiled JS
   - netbox/project-static/dist
-
-query-filters:
-  # Exclude py/url-redirection: NetBox uses safe_for_redirect() wrapper function
-  # which validates all redirects via Django's url_has_allowed_host_and_scheme().
-  # CodeQL's taint tracking doesn't recognize wrapper functions without custom
-  # query configuration. See #20484.
-  - exclude:
-      id: py/url-redirection

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
       NETBOX_CONFIGURATION: netbox.configuration_testing
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: ['3.12', '3.13']
         node-version: ['20.x']
     services:
       redis:

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.14.1
+  rev: v0.6.9
   hooks:
     - id: ruff
       name: "Ruff linter"

README.md

@@ -5,7 +5,7 @@
   <a href="https://github.com/netbox-community/netbox/blob/main/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache_2.0-blue.svg" alt="License" /></a>
   <a href="https://github.com/netbox-community/netbox/graphs/contributors"><img src="https://img.shields.io/github/contributors/netbox-community/netbox?color=blue" alt="Contributors" /></a>
   <a href="https://github.com/netbox-community/netbox/stargazers"><img src="https://img.shields.io/github/stars/netbox-community/netbox?style=flat" alt="GitHub stars" /></a>
-  <a href="https://explore.transifex.com/netbox-community/netbox/"><img src="https://img.shields.io/badge/languages-16-blue" alt="Languages supported" /></a>
+  <a href="https://explore.transifex.com/netbox-community/netbox/"><img src="https://img.shields.io/badge/languages-15-blue" alt="Languages supported" /></a>
   <a href="https://github.com/netbox-community/netbox/actions/workflows/ci.yml"><img src="https://github.com/netbox-community/netbox/actions/workflows/ci.yml/badge.svg" alt="CI status" /></a>
   <p>
     <strong><a href="https://netboxlabs.com/community/">NetBox Community</a></strong> |
@@ -91,6 +91,7 @@ NetBox automatically logs the creation, modification, and deletion of all manage
 * Join the conversation on [the discussion forum](https://github.com/netbox-community/netbox/discussions) and [Slack](https://netdev.chat/)!
 * Already a power user? You can [suggest a feature](https://github.com/netbox-community/netbox/issues/new?assignees=&labels=type%3A+feature&template=feature_request.yaml) or [report a bug](https://github.com/netbox-community/netbox/issues/new?assignees=&labels=type%3A+bug&template=bug_report.yaml) on GitHub.
 * Contributions from the community are encouraged and appreciated! Check out our [contributing guide](CONTRIBUTING.md) to get started.
+* [Share your idea](https://plugin-ideas.netbox.dev/) for a new plugin, or [learn how to build one](https://github.com/netbox-community/netbox-plugin-tutorial) yourself!
 
 ## Screenshots
 

SECURITY.md

@@ -34,4 +34,4 @@ For any security concerns regarding the community-maintained Docker image for Ne
 
 ### Bug Bounties
 
-As NetBox is provided as free open source software, we do not offer any monetary compensation for vulnerability or bug reports; however, your contributions are greatly appreciated.
+As NetBox is provided as free open source software, we do not offer any monetary compensation for vulnerability or bug reports, however your contributions are greatly appreciated.

base_requirements.txt

@@ -12,7 +12,9 @@ django-cors-headers
 
 # Runtime UI tool for debugging Django
 # https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst
-django-debug-toolbar
+# django-debug-toolbar v6.0.0 raises "Attribute Error at /: 'function' object has no attribute 'set'" 
+# see https://github.com/netbox-community/netbox/issues/19974
+django-debug-toolbar==5.2.0
 
 # Library for writing reusable URL query filters
 # https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst
@@ -28,13 +30,17 @@ django-htmx
 
 # Modified Preorder Tree Traversal (recursive nesting of objects)
 # https://github.com/django-mptt/django-mptt/blob/main/CHANGELOG.rst
-# v0.18.0 introduces errant migrations which need to be resolved
-django-mptt==0.17.0
+django-mptt
 
 # Context managers for PostgreSQL advisory locks
 # https://github.com/Xof/django-pglocks/blob/master/CHANGES.txt
 django-pglocks
 
+
+# Manager for managing PostgreSQL triggers
+# https://github.com/AmbitionEng/django-pgtrigger/blob/main/CHANGELOG.md
+django-pgtrigger
+
 # Prometheus metrics library for Django
 # https://github.com/korfuri/django-prometheus/blob/master/CHANGELOG.md
 django-prometheus
@@ -69,8 +75,7 @@ django-timezone-field
 
 # A REST API framework for Django projects
 # https://www.django-rest-framework.org/community/release-notes/
-# TODO: Re-evaluate the monkey-patch of get_unique_validators() before upgrading
-djangorestframework==3.16.1
+djangorestframework
 
 # Sane and flexible OpenAPI 3 schema generation for Django REST framework.
 # https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst
@@ -139,7 +144,8 @@ requests
 
 # rq
 # https://github.com/rq/rq/blob/master/CHANGES.md
-rq
+# RQ v2.5 drops support for Redis < 5.0
+rq==2.4.1
 
 # Django app for social-auth-core
 # https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md
@@ -166,8 +172,7 @@ strawberry-graphql-django
 svgwrite
 
 # Tabular dataset library (for table-based exports)
-# Current: https://github.com/jazzband/tablib/releases
-# Previous: https://github.com/jazzband/tablib/blob/master/HISTORY.md
+# https://github.com/jazzband/tablib/blob/master/HISTORY.md
 tablib
 
 # Timezone data (required by django-timezone-field on Python 3.9+)

contrib/generated_schema.json

@@ -186,7 +186,6 @@
                         "usb-3-micro-b",
                         "molex-micro-fit-1x2",
                         "molex-micro-fit-2x2",
-                        "molex-micro-fit-2x3",
                         "molex-micro-fit-2x4",
                         "dc-terminal",
                         "saf-d-grid",
@@ -294,7 +293,6 @@
                         "usb-c",
                         "molex-micro-fit-1x2",
                         "molex-micro-fit-2x2",
-                        "molex-micro-fit-2x3",
                         "molex-micro-fit-2x4",
                         "dc-terminal",
                         "eaton-c39",
@@ -332,120 +330,46 @@
                         "100base-lfx",
                         "100base-tx",
                         "100base-t1",
-                        "1000base-bx10-d",
-                        "1000base-bx10-u",
-                        "1000base-cwdm",
-                        "1000base-cx",
-                        "1000base-dwdm",
-                        "1000base-ex",
-                        "1000base-lsx",
-                        "1000base-lx",
-                        "1000base-lx10",
-                        "1000base-sx",
                         "1000base-t",
+                        "1000base-sx",
+                        "1000base-lx",
                         "1000base-tx",
-                        "1000base-zx",
                         "2.5gbase-t",
                         "5gbase-t",
-                        "10gbase-br-d",
-                        "10gbase-br-u",
-                        "10gbase-cx4",
-                        "10gbase-er",
-                        "10gbase-lr",
-                        "10gbase-lrm",
-                        "10gbase-lx4",
-                        "10gbase-sr",
                         "10gbase-t",
-                        "10gbase-zr",
-                        "25gbase-cr",
-                        "25gbase-er",
-                        "25gbase-lr",
-                        "25gbase-sr",
-                        "25gbase-t",
-                        "40gbase-cr4",
-                        "40gbase-er4",
-                        "40gbase-fr4",
-                        "40gbase-lr4",
-                        "40gbase-sr4",
-                        "50gbase-cr",
-                        "50gbase-er",
-                        "50gbase-fr",
-                        "50gbase-lr",
-                        "50gbase-sr",
-                        "100gbase-cr1",
-                        "100gbase-cr2",
-                        "100gbase-cr4",
-                        "100gbase-cr10",
-                        "100gbase-cwdm4",
-                        "100gbase-dr",
-                        "100gbase-er4",
-                        "100gbase-fr1",
-                        "100gbase-lr1",
-                        "100gbase-lr4",
-                        "100gbase-sr1",
-                        "100gbase-sr1.2",
-                        "100gbase-sr2",
-                        "100gbase-sr4",
-                        "100gbase-sr10",
-                        "100gbase-zr",
-                        "200gbase-cr2",
-                        "200gbase-cr4",
-                        "200gbase-dr4",
-                        "200gbase-er4",
-                        "200gbase-fr4",
-                        "200gbase-lr4",
-                        "200gbase-sr2",
-                        "200gbase-sr4",
-                        "200gbase-vr2",
-                        "400gbase-cr4",
-                        "400gbase-dr4",
-                        "400gbase-er8",
-                        "400gbase-fr4",
-                        "400gbase-fr8",
-                        "400gbase-lr4",
-                        "400gbase-lr8",
-                        "400gbase-sr4",
-                        "400gbase-sr4_2",
-                        "400gbase-sr8",
-                        "400gbase-sr16",
-                        "400gbase-vr4",
-                        "400gbase-zr",
-                        "800gbase-cr8",
-                        "800gbase-dr8",
-                        "800gbase-sr8",
-                        "800gbase-vr8",
+                        "10gbase-cx4",
                         "100base-x-sfp",
                         "1000base-x-gbic",
                         "1000base-x-sfp",
                         "10gbase-x-sfpp",
-                        "10gbase-x-xenpak",
                         "10gbase-x-xfp",
+                        "10gbase-x-xenpak",
                         "10gbase-x-x2",
                         "25gbase-x-sfp28",
+                        "50gbase-x-sfp56",
                         "40gbase-x-qsfpp",
                         "50gbase-x-sfp28",
-                        "50gbase-x-sfp56",
                         "100gbase-x-cfp",
                         "100gbase-x-cfp2",
+                        "200gbase-x-cfp2",
+                        "400gbase-x-cfp2",
                         "100gbase-x-cfp4",
                         "100gbase-x-cxp",
                         "100gbase-x-cpak",
                         "100gbase-x-dsfp",
+                        "100gbase-x-sfpdd",
                         "100gbase-x-qsfp28",
                         "100gbase-x-qsfpdd",
-                        "100gbase-x-sfpdd",
-                        "200gbase-x-cfp2",
                         "200gbase-x-qsfp56",
                         "200gbase-x-qsfpdd",
                         "400gbase-x-qsfp112",
                         "400gbase-x-qsfpdd",
-                        "400gbase-x-cdfp",
-                        "400gbase-x-cfp2",
-                        "400gbase-x-cfp8",
                         "400gbase-x-osfp",
                         "400gbase-x-osfp-rhs",
-                        "800gbase-x-osfp",
+                        "400gbase-x-cdfp",
+                        "400gbase-x-cfp8",
                         "800gbase-x-qsfpdd",
+                        "800gbase-x-osfp",
                         "1000base-kx",
                         "2.5gbase-kx",
                         "5gbase-kr",

docs/administration/authentication/microsoft-entra-id.md

@@ -25,7 +25,7 @@ Once finished, make note of the application (client) ID; this will be used when
 ![Completed app registration](../../media/authentication/azure_ad_app_registration_created.png)
 
 !!! tip "Multitenant authentication"
-    NetBox also supports multitenant authentication via Azure AD; however, it requires a different backend and an additional configuration parameter. Please see the [`python-social-auth` documentation](https://python-social-auth.readthedocs.io/en/latest/backends/azuread.html#tenant-support) for details concerning multitenant authentication.
+    NetBox also supports multitenant authentication via Azure AD, however it requires a different backend and an additional configuration parameter. Please see the [`python-social-auth` documentation](https://python-social-auth.readthedocs.io/en/latest/backends/azuread.html#tenant-support) for details concerning multitenant authentication.
 
 ### 3. Create a secret
 

docs/administration/authentication/overview.md

@@ -2,7 +2,7 @@
 
 ## Local Authentication
 
-Local user accounts and groups can be created in NetBox under the "Authentication" section in the "Admin" menu. This section is available only to users with the "staff" permission enabled.
+Local user accounts and groups can be created in NetBox under the "Authentication" section in the "Admin" menu.
 
 At a minimum, each user account must have a username and password set. User accounts may also denote a first name, last name, and email address. [Permissions](../permissions.md) may also be assigned to individual users and/or groups as needed.
 

docs/administration/netbox-shell.md

@@ -106,7 +106,7 @@ This approach can span multiple levels of relations. For example, the following
 ```
 
 !!! note
-    While the above query is functional, it's not very efficient. There are ways to optimize such requests; however, they are out of scope for this document. For more information, see the [Django queryset method reference](https://docs.djangoproject.com/en/stable/ref/models/querysets/) documentation.
+    While the above query is functional, it's not very efficient. There are ways to optimize such requests, however they are out of scope for this document. For more information, see the [Django queryset method reference](https://docs.djangoproject.com/en/stable/ref/models/querysets/) documentation.
 
 Reverse relationships can be traversed as well. For example, the following will find all devices with an interface named "em0":
 

docs/best-practices/modeling-pluggable-transceivers.md

@@ -1,74 +0,0 @@
-# Modeling Pluggable Transceivers
-
-## Use Case
-
-Many network devices utilize field-swappable [small-form factor pluggable transceivers (SFPs)](https://en.wikipedia.org/wiki/Small_Form-factor_Pluggable) to enable changing the physical media type of a fixed interface. For example, a 10 Gigabit Ethernet interface might be connected using copper, multimode fiber, or single-mode fiber, each of which requires a different type of SFP+ transceiver.
-
-It can be challenging to model SFPs given their dynamic nature. This guide intends to capture the recommended strategy for modeling SFPs on NetBox v4.4 and later.
-
-## Modeling Strategy
-
-Pluggable transceivers are most accurately represented in NetBox as discrete [modules](../models/dcim/module.md) which are installed within [module bays](../models/dcim/modulebay.md). A module can deliver one or more [interfaces](../models/dcim/interface.md) (or other components) to the device in which it is installed. This approach ensures that a new interface is automatically created on the device when the module is installed, and deleted when the module is removed.
-
-```mermaid
-flowchart BT
-    interface1[Interface 1/1]--> module1[SFP]
-    interface2[Interface 2/1]--> module2[SFP]
-    interface3[Interface 3/1] & interface4[Interface 3/2]--> module3[SFP]
-    module1 --> modulebay1[Module Bay 1]
-    module2 --> modulebay2[Module Bay 2]
-    module3 --> modulebay3[Module Bay 3]
-    modulebay1 & modulebay2 & modulebay3 --> device[Device]
-```
-
-### 1. Create an SFP Module Type Profile
-
-If one has not already been defined, create a [module type profile](../models/dcim/moduletypeprofile.md) for SFPs. This profile will be assigned for all module types which represent a pluggable transceiver. Typically, you will need only one profile for all pluggable transceivers.
-
-You might opt to define custom attributes for the profile by defining a custom [JSON schema](https://json-schema.org/). Profile attributes might be used to define characteristics unique to transceivers, such as optical wavelength and power ranges. Adding profile attributes is optional, and can be done at a later point.
-
-!!! note
-    Creating a module type profile is optional, but recommended as it allows for defining custom module attributes.
-
-### 2. Create a Module Type for Each SFP Model in Inventory
-
-Next, create a [module type](../models/dcim/moduletype.md) to represent each unique SFP model present in your network. Each module type should define a manufacturer and a unique model name, and may also include a part number. For example, you might create a module type for each of the following transceivers:
-
-| Manufacturer | Model            | Media Type |
-|--------------|------------------|------------|
-| Cisco        | SFP-10G-SR       | 10GE MMF   |
-| Cisco        | SFP-10G-LR       | 10GE SMF   |
-| Juniper      | QFX-QSFP-40G-SR4 | 40GE MMF   |
-| Juniper      | JNP-QSFP-DAC-5M  | 40GE DAC   |
-
-### 3. Add an Interface to the Module Type
-
-After creating each module type, create an interface template on it to represent its physical interface. The definition of this interface template will depend on the transceiver's physical media type. (Reference the table above for examples.) When a new module is "installed" within a module bay on a device, its templated interface(s) will be automatically instantiated on that device as child interfaces of the module.
-
-Determining which name to use for the transceiver's interface can be tricky, as the interface name might depend on the type of device in which the SFP is installed. To avoid having to rename interfaces, consider using the `{module}` token in place of a static interface name. The interface's name will inherit the position of the bay in which its parent module is installed. If creating multiple interfaces on a module, be sure to append a unique ID (e.g. `{module}:1`) to ensure each interface gets assigned a unique name.
-
-### 4. Create Device Types
-
-If you haven't already, create a [device type](../models/dcim/devicetype.md) to represent each unique device model in your network.
-
-!!! note
-    Skip this step if you've already created the necessary device types.
-
-### 5. Add Module Bays to the Device Type
-
-Once you've created a device type, add the appropriate number of module bays on each device type to represent its SFP slots. For example, a Juniper QFX5110 would have module bays numbered `0/0/0` through `0/0/55`: 48 SFP+ bays and 8 QSFP28 bays (56 total).
-
-Be sure to define both the name **and position** of each module bay with a unique value. The module bay's position will be used to automatically name SFP interfaces.
-
-### 6. Create a Device
-
-Create a new device using the device type added in the previous step. The module bays (and any other components) defined on the device type will be instantiated on the new device automatically.
-
-!!! note
-    If you've already created the necessary devices in NetBox, you'll need to add their module bays manually. You can add multiple module bays at once by selecting the desired devices from the device list and selecting **Add Components > Module Bays** at the bottom of the page.
-
-### 7. Add the SFP Modules
-
-Finally, create each SFP in the new device by "installing" a new module of the appropriate type in each module bay. The interface(s) defined on the selected module type will be automatically populated on the new module. If present, the `{module}` token in the name of each interface template will be replaced with the position of the bay in which the module is being installed. For example, an interface template with the name `et-{module}` being created on a module installed in a bay with position `0/0/14` will create an interface named `et-0/0/14`.
-
-When adding many modules at once, you may find it helpful to utilize NetBox's bulk import functionality. This allows you to create many modules at once from CSV, JSON, or YAML data.

docs/best-practices/performance-handbook.md

@@ -1,187 +0,0 @@
-# Performance Handbook
-
-The purpose of this handbook is to help users and administrators use NetBox efficiently. It contains assorted recommendations and best practices compiled over time, intending to serve a wide variety of use cases. 
-
-## Server Configuration
-
-### WSGI Server Configuration
-
-NetBox operates as a [Web Server Gateway Interface (WSGI)](https://en.wikipedia.org/wiki/Web_Server_Gateway_Interface) application, which sits behind a frontend HTTP server such as nginx or Apache. The HTTP server handles low-level HTTP request processing and serving static assets, and forwards application-level requests to NetBox via WSGI.
-
-A backend WSGI server (typically [Gunicorn](https://gunicorn.org/) or [uWSGI](https://uwsgi-docs.readthedocs.io/en/latest/)) is responsible for running the NetBox application. This is accomplished by initializing a number of WSGI worker processes which accept WSGI requests relayed from the frontend HTTP server.
-
-Tuning your WSGI server is crucial to realizing optimal performance from NetBox. Below are some recommended configuration parameters.
-
-#### Provision Multiple Workers
-
-General guidance is to set the number of worker processes to double the number of CPU cores available, plus one (`2 * CPUs + 1`).
-
-#### Limit the Worker Lifetime
-
-Set a maximum number of requests that a worker can service before being respawned. This helps protect against potential memory leaks.
-
-#### Set a Request Timeout
-
-Limit the time a worker may spend processing any request. This prevents a long-running request from tying up a worker beyond an acceptable threshold. We suggest a limit of 120 seconds as a reasonable safeguard.
-
-#### Bind Using a Unix Socket
-
-When running the HTTP frontend and WSGI server on the same machine, binding via a Unix socket (instead of a TCP socket) may yield slight performance gains.
-
-### NetBox Configuration
-
-NetBox ships with a reasonable default configuration for most environments, but administrators are encouraged to explore all the [available parameters](../configuration/index.md) to tune their installation. Some of the most notable parameters impacting performance are called out below.
-
-#### Reduce the Maximum Page Size
-
-NetBox paginates large result sets to reduce the overall response size. The [`MAX_PAGE_SIZE`](../configuration/miscellaneous.md#max_page_size) parameter specifies the maximum number of results per page that a client can request. This is set to 1,000 by default. Consider lowering this number if you find that API clients are frequently requesting very large result sets.
-
-#### Limit GraphQL Aliases
-
-By default, NetBox restricts a GraphQL query to 10 aliases. Consider reducing this number by setting [`GRAPHQL_MAX_ALIASES`](../configuration/graphql-api.md#graphql_max_aliases) to a lower value.
-
-#### Designate Isolated Deployments
-
-If your NetBox installation does not have Internet access, set [`ISOLATED_DEPLOYMENT`](../configuration/system.md#isolated_deployment) to True. This will prevent the application from attempting routine external requests.
-
-#### Reduce Sentry Sampling
-
-If [Sentry](https://sentry.io/) has been enabled for error reporting and analytics, consider lowering its sampling rate. This can be accomplished by modifying the values for `sample_rate` and `traces_sample_rate` under [`SENTRY_CONFIG`](../configuration/error-reporting.md#sentry_config).
-
-#### Remove Unneeded Event Handlers
-
-Check whether any custom event handlers have been added under [`EVENTS_PIPELINE`](../configuration/miscellaneous.md#events_pipeline). Remove any that are no longer needed.
-
-### Background Task Workers
-
-NetBox defers the execution of certain tasks to background workers via Redis queues serviced by one or more background workers. These workers operate asynchronously from the frontend WSGI workers, and process tasks in the order they are enqueued.
-
-NetBox creates three default queues for background tasks: `high`, `default`, and `low`. Additional queues can be configured via the [`QUEUE_MAPPINGS`](../configuration/miscellaneous.md#queue_mappings) configuration parameter.
-
-By default, a background worker (spawned via `manage.py rqworker`) will listen to all available queues. To improve responsiveness to high-priority background tasks, consider dedicating one or more workers to service the `high` queue only:
-
-```
-$ ./manage.py rqworker high
-19:31:20 Worker 861be45b32214afc95c235beeb19c9fa: started with PID 2300029, version 2.6.0
-19:31:20 Worker 861be45b32214afc95c235beeb19c9fa: subscribing to channel rq:pubsub:861be45b32214afc95c235beeb19c9fa
-19:31:20 *** Listening on high...
-19:31:20 Worker 861be45b32214afc95c235beeb19c9fa: cleaning registries for queue: high
-19:31:20 Scheduler for high started with PID 2300096
-```
-
-## API Clients
-
-### REST API
-
-NetBox's [REST API](../integrations/rest-api.md) is the primary means of integration with external systems, allowing full create, read, update, and delete (CRUD) operations. There are a few performance considerations to keep in mind when dealing with very large data sets.
-
-#### Use "Brief" Mode for Simple Lists
-
-In cases where you need to retrieve only a minimal representation of objects, append `?brief=True` to the URL. This instructs NetBox to omit all fields except the following:
-
-* ID
-* URL
-* Display text
-* Name (or similar identifier)
-* Slug (if present)
-* Description
-* Counts of notable related objects (where applicable)
-
-For example, a site fetched using brief mode returns only the following:
-
-```json
-{
-    "id": 2,
-    "url": "https://netbox/api/dcim/sites/2/",
-    "display": "DM-Akron",
-    "name": "DM-Akron",
-    "slug": "dm-akron",
-    "description": ""
-}
-```
-
-Omitting all other fields (especially those which fetch and return related objects) often results in much faster queries.
-
-#### Declare Selected Fields
-
-If you need more flexibility regarding the fields to be returned for an object type, you can specify a list of fields to include using the `fields` query parameter. For example, a request for `/api/dcim/sites/?fields=id,name,status,region` will return the following:
-
-```json
-{
-    "id": 2,
-    "name": "DM-Akron",
-    "status": {
-        "value": "active",
-        "label": "Active"
-    },
-    "region": {
-        "id": 51,
-        "url": "https://netbox/api/dcim/regions/51/",
-        "display": "Ohio",
-        "name": "Ohio",
-        "slug": "us-oh",
-        "description": "",
-        "site_count": 0,
-        "_depth": 2
-    }
-}
-```
-
-Like brief mode, this approach can significantly reduce the response time of an API request by omitting unneeded data.
-
-#### Employ Pagination
-
-Like the user interface, the REST API employs pagination to limit the number of objects returned in a single response. If a page size is not specified by the request (i.e. by passing `?limit=10`), NetBox will use the default size defined by [`PAGINATE_COUNT`](../configuration/default-values.md#paginate_count). The default page size is 50.
-
-For some requests, especially those using brief mode or a minimal selection of fields, it may be desirable to specify a higher page size, so that fewer requests are needed to retrieve all objects. Appending `?limit=0` to the request effectively seeks to disable pagination. (Note, however, that the requested page size cannot exceed the value of [`MAX_PAGE_SIZE`](../configuration/miscellaneous.md#max_page_size), which defaults to 1,000.)
-
-Complex API requests, which pull in many related objects, generate a relatively high load on the application, and generally benefit from reduced page size. If you find that your API requests are taking an inordinate amount of time, try reducing the page size from the default value so that fewer objects need to be returned for each request.
-
-### GraphQL API
-
-NetBox's read-only [GraphQL API](../integrations/graphql-api.md) offers an alternative to its REST API, and provides a very flexible means of retrieving data. GraphQL enables the client to request any object from a single endpoint, specifying only the desired attributes and relations. Many users prefer this to the more rigid structure of the REST API, but it's important to understand the trade-offs of crafting complex queries.
-
-#### Request Only the Necessary Fields
-
-For optimal performance, craft your GraphQL queries to return only the fields needed by the client. This will reduce the overall query time, especially when omitting related objects.
-
-#### Avoid Overly Complex Queries
-
-The primary benefit of the GraphQL API is that it allows the client to offload to the server the work of stitching together various related objects, which would require the client to make multiple requests to different endpoints if using the REST API. However, this advantage does not come for free: The more information that is requested in a single query, the more work the server needs to do to fetch the raw data from the database and render it into a GraphQL response. Very complex queries can yield dozens or hundreds of SQL queries on the backend, which increase the time it takes to render a response.
-
-While it can be tempting to pack as much data as possible into a single GraphQL query, realize that there is a balance to be struck between minimizing the number of queries needed and avoiding complexity in the interest of performance. For example, while it is possible to retrieve via a single GraphQL API request all the IP addresses and all attached cables for every device in a site, it is probably more efficient (often _much_ more efficient) to make two or three separate requests and correlate the data locally.
-
-#### Use Filters
-
-You can specify filters when making a GraphQL query to limit the set of objects returned. This works a bit differently from the REST API, as filters are declared inside the query statement rather than appended to the URL, but the concept is the same. For example, to return only active sites:
-
-```graphql
-query {
-  site_list(
-    filters: {
-      status: STATUS_ACTIVE
-    }
-  ) {
-    name
-  }
-}
-```
-
-This returns only sites with a status of "active" and avoid needing to parse through all the others. For further information about filters, see the [GraphQL API documentation](../integrations/graphql-api.md).
-
-#### Employ Pagination
-
-Like the REST API, the GraphQL API supports pagination. Queries which return a large number of objects should employ pagination to limit the size of each response.
-
-```graphql
-{
-  device_list(
-    pagination: {limit: 100}
-  ) {
-    id
-    name
-    serial
-    status
-  }
-}
-```

docs/configuration/data-validation.md

@@ -17,7 +17,7 @@ CUSTOM_VALIDATORS = {
         },
         "my_plugin.validators.Validator1"
     ],
-    "dcim.device": [
+    "dim.device": [
         "my_plugin.validators.Validator1"
     ]
 }

docs/configuration/default-values.md

@@ -4,7 +4,7 @@
 
 This parameter controls the content and layout of user's default dashboard. Once the dashboard has been created, the user is free to customize it as they please by adding, removing, and reconfiguring widgets.
 
-This parameter must specify an iterable of dictionaries, each representing a discrete dashboard widget and its configuration. The following widget attributes are supported:
+This parameter must specify an iterable of dictionaries, each representing a discrete dashboard widget and its configuration. The follow widget attributes are supported:
 
 * `widget`: Dotted path to the Python class (required)
 * `width`: Default widget width (between 1 and 12, inclusive)
@@ -63,8 +63,6 @@ DEFAULT_USER_PREFERENCES = {
 
 For a complete list of available preferences, log into NetBox and navigate to `/user/preferences/`. A period in a preference name indicates a level of nesting in the JSON data. The example above maps to `pagination.per_page`.
 
-See also: [Clearing table preferences](../features/user-preferences.md#clearing-table-preferences) for resolving errors caused by saved table columns or ordering.
-
 ---
 
 ## PAGINATE_COUNT

docs/configuration/error-reporting.md

@@ -1,32 +1,7 @@
 # Error Reporting Settings
 
-## SENTRY_CONFIG
-
-A dictionary mapping keyword arguments to values, to be passed to `sentry_sdk.init()`. See the [Sentry Python SDK documentation](https://docs.sentry.io/platforms/python/) for more information on supported parameters.
-
-The default configuration is shown below:
-
-```python
-{
-    "sample_rate": 1.0,
-    "send_default_pii": False,
-    "traces_sample_rate": 0,
-}
-```
-
-Additionally, `http_proxy` and `https_proxy` are set to the HTTP and HTTPS proxies, respectively, configured for NetBox (if any).
-
 ## SENTRY_DSN
 
-!!! warning "This parameter will be removed in NetBox v4.5."
-    Set this using `SENTRY_CONFIG` instead:
-
-    ```
-    SENTRY_CONFIG = {
-        "dsn": "https://examplePublicKey@o0.ingest.sentry.io/0",
-    }
-    ```
-
 Default: `None`
 
 Defines a Sentry data source name (DSN) for automated error reporting. `SENTRY_ENABLED` must be `True` for this parameter to take effect. For example:
@@ -50,15 +25,6 @@ Set to `True` to enable automatic error reporting via [Sentry](https://sentry.io
 
 ## SENTRY_SAMPLE_RATE
 
-!!! warning "This parameter will be removed in NetBox v4.5."
-    Set this using `SENTRY_CONFIG` instead:
-
-    ```
-    SENTRY_CONFIG = {
-        "sample_rate": 0.2,
-    }
-    ```
-
 Default: `1.0` (all)
 
 The sampling rate for errors. Must be a value between 0 (disabled) and 1.0 (report on all errors).
@@ -67,15 +33,6 @@ The sampling rate for errors. Must be a value between 0 (disabled) and 1.0 (repo
 
 ## SENTRY_SEND_DEFAULT_PII
 
-!!! warning "This parameter will be removed in NetBox v4.5."
-    Set this using `SENTRY_CONFIG` instead:
-
-    ```
-    SENTRY_CONFIG = {
-        "send_default_pii": True,
-    }
-    ```
-
 Default: `False`
 
 Maps to the Sentry SDK's [`send_default_pii`](https://docs.sentry.io/platforms/python/configuration/options/#send-default-pii) parameter. If enabled, certain personally identifiable information (PII) is added.
@@ -103,15 +60,6 @@ SENTRY_TAGS = {
 
 ## SENTRY_TRACES_SAMPLE_RATE
 
-!!! warning "This parameter will be removed in NetBox v4.5."
-    Set this using `SENTRY_CONFIG` instead:
-
-    ```
-    SENTRY_CONFIG = {
-        "traces_sample_rate": 0.2,
-    }
-    ```
-
 Default: `0` (disabled)
 
 The sampling rate for transactions. Must be a value between 0 (disabled) and 1.0 (report on all transactions).

docs/configuration/index.md

@@ -35,7 +35,6 @@ Some configuration parameters are primarily controlled via NetBox's admin interf
 * [`POWERFEED_DEFAULT_MAX_UTILIZATION`](./default-values.md#powerfeed_default_max_utilization)
 * [`POWERFEED_DEFAULT_VOLTAGE`](./default-values.md#powerfeed_default_voltage)
 * [`PREFER_IPV4`](./miscellaneous.md#prefer_ipv4)
-* [`PROTECTION_RULES`](./data-validation.md#protection_rules)
 * [`RACK_ELEVATION_DEFAULT_UNIT_HEIGHT`](./default-values.md#rack_elevation_default_unit_height)
 * [`RACK_ELEVATION_DEFAULT_UNIT_WIDTH`](./default-values.md#rack_elevation_default_unit_width)
 

docs/configuration/miscellaneous.md

@@ -53,16 +53,6 @@ Sets content for the top banner in the user interface.
 
 ---
 
-## COPILOT_ENABLED
-
-!!! tip "Dynamic Configuration Parameter"
-
-Default: `True`
-
-Enables or disables the [NetBox Copilot](https://netboxlabs.com/docs/copilot/) agent globally. When enabled, users can opt to toggle the agent individually.
-
----
-
 ## CENSUS_REPORTING_ENABLED
 
 Default: `True`

docs/configuration/remote-authentication.md

@@ -127,19 +127,3 @@ The list of groups that promote an remote User to Superuser on Login. If group i
 Default: `[]` (Empty list)
 
 The list of users that get promoted to Superuser on Login. If user isn't present in list on next Login, the Role gets revoked. (Requires `REMOTE_AUTH_ENABLED` and `REMOTE_AUTH_GROUP_SYNC_ENABLED` )
-
----
-
-## REMOTE_AUTH_STAFF_GROUPS
-
-Default: `[]` (Empty list)
-
-The list of groups that promote an remote User to Staff on Login. If group isn't present on next Login, the Role gets revoked. (Requires `REMOTE_AUTH_ENABLED` and `REMOTE_AUTH_GROUP_SYNC_ENABLED` )
-
----
-
-## REMOTE_AUTH_STAFF_USERS
-
-Default: `[]` (Empty list)
-
-The list of users that get promoted to Staff on Login. If user isn't present in list on next Login, the Role gets revoked. (Requires `REMOTE_AUTH_ENABLED` and `REMOTE_AUTH_GROUP_SYNC_ENABLED` )

docs/configuration/security.md

@@ -92,7 +92,7 @@ If `True`, the cookie employed for cross-site request forgery (CSRF) protection
 
 Default: `[]`
 
-Defines a list of trusted origins for unsafe (e.g. `POST`) requests. This is a pass-through to Django's [`CSRF_TRUSTED_ORIGINS`](https://docs.djangoproject.com/en/stable/ref/settings/#csrf-trusted-origins) setting. Note that each host listed must specify a scheme (e.g. `http://` or `https://`).
+Defines a list of trusted origins for unsafe (e.g. `POST`) requests. This is a pass-through to Django's [`CSRF_TRUSTED_ORIGINS`](https://docs.djangoproject.com/en/stable/ref/settings/#csrf-trusted-origins) setting. Note that each host listed must specify a scheme (e.g. `http://` or `https://).
 
 ```python
 CSRF_TRUSTED_ORIGINS = (

docs/configuration/system.md

@@ -232,9 +232,6 @@ STORAGES = {
     },
     "scripts": {
         "BACKEND": "extras.storage.ScriptFileSystemStorage",
-        "OPTIONS": {
-            "allow_overwrite": True,
-        },
     },
 }
 ```
@@ -250,7 +247,6 @@ STORAGES = {
         "OPTIONS": { 
             'access_key': 'access key', 
             'secret_key': 'secret key',
-            "allow_overwrite": True,
         }
     }, 
 }
@@ -261,46 +257,6 @@ The specific configuration settings for each storage backend can be found in the
 !!! note
     Any keys defined in the `STORAGES` configuration parameter replace those in the default configuration. It is only necessary to define keys within the `STORAGES` for the specific backend(s) you wish to configure.
 
-### Environment Variables and Third-Party Libraries
-
-NetBox uses an explicit Python configuration approach rather than automatic environment variable detection. While this provides clear configuration management and version control capabilities, it affects how some third-party libraries like `django-storages` function within NetBox's context.
-
-Many Django libraries (including `django-storages`) expect to automatically detect environment variables like `AWS_STORAGE_BUCKET_NAME` or `AWS_S3_ACCESS_KEY_ID`. However, NetBox's configuration processing prevents this automatic detection from working as documented in some of these libraries.
-
-When using third-party libraries that rely on environment variable detection, you may need to explicitly read environment variables in your NetBox `configuration.py`:
-
-```python
-import os
-
-STORAGES = {
-    'default': {
-        'BACKEND': 'storages.backends.s3.S3Storage',
-        'OPTIONS': {
-            'bucket_name': os.environ.get('AWS_STORAGE_BUCKET_NAME'),
-            'access_key': os.environ.get('AWS_S3_ACCESS_KEY_ID'),
-            'secret_key': os.environ.get('AWS_S3_SECRET_ACCESS_KEY'),
-            'endpoint_url': os.environ.get('AWS_S3_ENDPOINT_URL'),
-            'location': 'media/',
-        }
-    },
-    'staticfiles': {
-        'BACKEND': 'storages.backends.s3.S3Storage',
-        'OPTIONS': {
-            'bucket_name': os.environ.get('AWS_STORAGE_BUCKET_NAME'),
-            'access_key': os.environ.get('AWS_S3_ACCESS_KEY_ID'),
-            'secret_key': os.environ.get('AWS_S3_SECRET_ACCESS_KEY'),
-            'endpoint_url': os.environ.get('AWS_S3_ENDPOINT_URL'),
-            'location': 'static/',
-        }
-    },
-}
-```
-
-This approach works because the environment variables are resolved during NetBox's configuration processing, before the third-party library attempts its own environment variable detection.
-
-!!! warning "Configuration Behavior"
-    Simply setting environment variables like `AWS_STORAGE_BUCKET_NAME` without explicitly reading them in your configuration will not work. The variables must be read using `os.environ.get()` within your `configuration.py` file.
-
 ---
 
 ## TIME_ZONE

docs/customization/custom-scripts.md

@@ -95,7 +95,7 @@ An example fieldset definition is provided below:
 
 ```python
 class MyScript(Script):
-    class Meta(Script.Meta):
+    class Meta:
         fieldsets = (
             ('First group', ('field1', 'field2', 'field3')),
             ('Second group', ('field4', 'field5')),
@@ -404,61 +404,6 @@ A complete date & time. Returns a `datetime.datetime` object.
 
 Custom scripts can be run via the web UI by navigating to the script, completing any required form data, and clicking the "run script" button. It is possible to schedule a script to be executed at specified time in the future. A scheduled script can be canceled by deleting the associated job result object.
 
-#### Prefilling variables via URL parameters
-
-Script form fields can be prefilled by appending query parameters to the script URL. Each parameter name must match the variable name defined on the script class. Prefilled values are treated as initial values and can be edited before execution. Multiple values can be supplied by repeating the same parameter. Query values must be percent‑encoded where required (for example, spaces as `%20`).
-
-Examples:
-
-For string and integer variables, when a script defines:
-
-```python
-from extras.scripts import Script, StringVar, IntegerVar
-
-class MyScript(Script):
-    name = StringVar()
-    count = IntegerVar()
-```
-
-the following URL prefills the `name` and `count` fields:
-
-```
-https://<netbox>/extras/scripts/<script_id>/?name=Branch42&count=3
-```
-
-For object variables (`ObjectVar`), supply the object’s primary key (PK):
-
-```
-https://<netbox>/extras/scripts/<script_id>/?device=1
-```
-
-If an object ID cannot be resolved or the object is not visible to the requesting user, the field remains unpopulated.
-
-Supported variable types:
-
-| Variable class           | Expected input                  | Example query string                        |
-|--------------------------|---------------------------------|---------------------------------------------|
-| `StringVar`              | string (percent‑encoded)        | `?name=Branch42`                            |
-| `TextVar`                | string (percent‑encoded)        | `?notes=Initial%20value`                    |
-| `IntegerVar`             | integer                         | `?count=3`                                  |
-| `DecimalVar`             | decimal number                  | `?ratio=0.75`                               |
-| `BooleanVar`             | value → `True`; empty → `False` | `?enabled=true` (True), `?enabled=` (False) |
-| `ChoiceVar`              | choice value (not label)        | `?role=edge`                                |
-| `MultiChoiceVar`         | choice values (repeat)          | `?roles=edge&roles=core`                    |
-| `ObjectVar(Device)`      | PK (integer)                    | `?device=1`                                 |
-| `MultiObjectVar(Device)` | PKs (repeat)                    | `?devices=1&devices=2`                      |
-| `IPAddressVar`           | IP address                      | `?ip=198.51.100.10`                         |
-| `IPAddressWithMaskVar`   | IP address with mask            | `?addr=192.0.2.1/24`                        |
-| `IPNetworkVar`           | IP network prefix               | `?network=2001:db8::/64`                    |
-| `DateVar`                | date `YYYY-MM-DD`               | `?date=2025-01-05`                          |
-| `DateTimeVar`            | ISO datetime                    | `?when=2025-01-05T14:30:00`                 |
-| `FileVar`                | — (not supported)               | —                                           |
-
-!!! note
-    - The parameter names above are examples; use the actual variable attribute names defined by the script.
-    - For `BooleanVar`, only an empty value (`?enabled=`) unchecks the box; any other value including `false` or `0` checks it.
-    - File uploads (`FileVar`) cannot be prefilled via URL parameters.
-
 ### Via the API
 
 To run a script via the REST API, issue a POST request to the script's endpoint specifying the form data and commitment. For example, to run a script named `example.MyReport`, we would make a request such as the following:
@@ -510,7 +455,7 @@ from extras.scripts import *
 
 class NewBranchScript(Script):
 
-    class Meta(Script.Meta):
+    class Meta:
         name = "New Branch"
         description = "Provision a new branch site"
         field_order = ['site_name', 'switch_count', 'switch_model']

docs/development/getting-started.md

@@ -7,7 +7,7 @@ Getting started with NetBox development is pretty straightforward, and should fe
 * A Linux system or compatible environment
 * A PostgreSQL server, which can be installed locally [per the documentation](../installation/1-postgresql.md)
 * A Redis server, which can also be [installed locally](../installation/2-redis.md)
-* Python 3.10 or later
+* Python 3.12 or later
 
 ### 1. Fork the Repo
 

docs/development/models.md

@@ -12,7 +12,7 @@ Depending on its classification, each NetBox model may support various features
 
 | Feature                                                    | Feature Mixin           | Registry Key        | Description                                                                             |
 |------------------------------------------------------------|-------------------------|---------------------|-----------------------------------------------------------------------------------------|
-| [Bookmarks](../features/user-preferences.md#bookmarks)     | `BookmarksMixin`        | `bookmarks`         | These models can be bookmarked natively in the user interface                           |
+| [Bookmarks](../features/customization.md#bookmarks)        | `BookmarksMixin`        | `bookmarks`         | These models can be bookmarked natively in the user interface                           |
 | [Change logging](../features/change-logging.md)            | `ChangeLoggingMixin`    | `change_logging`    | Changes to these objects are automatically recorded in the change log                   |
 | Cloning                                                    | `CloningMixin`          | `cloning`           | Provides the `clone()` method to prepare a copy                                         |
 | [Contacts](../features/contacts.md)                        | `ContactsMixin`         | `contacts`          | Contacts can be associated with these models                                            |

docs/development/release-checklist.md

@@ -123,6 +123,16 @@ $ node bundle.js
 Done in 1.00s.
 ```
 
+### Rebuild the Device Type Definition Schema
+
+Run the following command to update the device type definition validation schema:
+
+```nohighlight
+./manage.py buildschema --write
+```
+
+This will automatically update the schema file at `contrib/generated_schema.json`.
+
 ### Update & Compile Translations
 
 Updated language translations should be pulled from [Transifex](https://app.transifex.com/netbox-community/netbox/dashboard/) and re-compiled for each new release. First, retrieve any updated translation files using the Transifex CLI client:
@@ -150,24 +160,6 @@ Then, compile these portable (`.po`) files for use in the application:
 !!! tip
     Put yourself in the shoes of the user when recording change notes. Focus on the effect that each change has for the end user, rather than the specific bits of code that were modified in a PR. Ensure that each message conveys meaning absent context of the initial feature request or bug report. Remember to include keywords or phrases (such as exception names) that can be easily searched.
 
-### Rebuild the Device Type Definition Schema
-
-Run the following command to update the device type definition validation schema:
-
-```nohighlight
-./manage.py buildschema --write
-```
-
-This will automatically update the schema file at `contrib/generated_schema.json`.
-
-### Update the OpenAPI Schema
-
-Update the static OpenAPI schema definition at `contrib/openapi.json` with the management command below. If the schema file is up-to-date, only the NetBox version will be changed.
-
-```nohighlight
-./manage.py spectacular --format openapi-json > ../contrib/openapi.json
-```
-
 ### Submit a Pull Request
 
 Commit the above changes and submit a pull request titled **"Release vX.Y.Z"** to merge the current release branch (e.g. `release-vX.Y.Z`) into `main`. Copy the documented release notes into the pull request's body.

docs/development/user-preferences.md

@@ -2,18 +2,12 @@
 
 The `users.UserConfig` model holds individual preferences for each user in the form of JSON data. This page serves as a manifest of all recognized user preferences in NetBox.
 
-For end‑user guidance on resetting saved table layouts, see [Features > User Preferences](../features/user-preferences.md#clearing-table-preferences).
-
 ## Available Preferences
 
-| Name                       | Description                                                   |
-|----------------------------|---------------------------------------------------------------|
-| `csv_delimiter`            | The delimiting character used when exporting CSV data         |
-| `data_format`              | Preferred format when rendering raw data (JSON or YAML)       |
-| `locale.language`          | The language selected for UI translation                      |
-| `pagination.per_page`      | The number of items to display per page of a paginated table  |
-| `pagination.placement`     | Where to display the paginator controls relative to the table |
-| `tables.${table}.columns`  | The ordered list of columns to display when viewing the table |
-| `tables.${table}.ordering` | A list of column names by which the table should be ordered   |
-| `ui.copilot_enabled`       | Toggles the NetBox Copilot AI agent                           |
-| `ui.tables.striping`       | Toggles visual striping of tables in the UI                   |
+| Name                     | Description                                                   |
+|--------------------------|---------------------------------------------------------------|
+| data_format              | Preferred format when rendering raw data (JSON or YAML)       |
+| pagination.per_page      | The number of items to display per page of a paginated table  |
+| pagination.placement     | Where to display the paginator controls relative to the table |
+| tables.${table}.columns  | The ordered list of columns to display when viewing the table |
+| tables.${table}.ordering | A list of column names by which the table should be ordered   |

docs/features/customization.md

@@ -2,8 +2,6 @@
 
 While NetBox strives to meet the needs of every network, the needs of users to cater to their own unique environments cannot be ignored. NetBox was built with this in mind, and can be customized in many ways to better suit your particular needs.
 
-For end‑user personalization topics (bookmarks, table preferences, language, CSV delimiter, and more), see [Features > User Preferences](../features/user-preferences.md).
-
 ## Tags
 
 Most objects in NetBox can be assigned user-created tags to aid with organization and filtering. Tag values are completely arbitrary: They may be used to store data in key-value pairs, or they may be employed simply as labels against which objects can be filtered. Each tag can also be assigned a color for quicker differentiation in the user interface.
@@ -20,6 +18,10 @@ The `tag` filter can be specified multiple times to match only objects which hav
 GET /api/dcim/devices/?tag=monitored&tag=deprecated
 ```
 
+## Bookmarks
+
+Users can bookmark their most commonly visited objects for convenient access. Bookmarks are listed under a user's profile, and can be displayed with custom filtering and ordering on the user's personal dashboard.
+
 ## Custom Fields
 
 While NetBox provides a rather extensive data model out of the box, the need may arise to store certain additional data associated with NetBox objects. For example, you might need to record the invoice ID alongside an installed device, or record an approving authority when creating a new IP prefix. NetBox administrators can create custom fields on built-in objects to meet these needs.
@@ -36,7 +38,7 @@ Custom links allow you to conveniently reference external resources related to N
 http://server.local/vms/?name={{ object.name }}
 ```
 
-Now, when viewing a virtual machine in NetBox, a user will see a handy button with the chosen title and link (complete with the name of the VM being viewed). Both the text and URL of custom links can be templatized in this manner, and custom links can be grouped together into dropdowns for a more efficient display.
+Now, when viewing a virtual machine in NetBox, a user will see a handy button with the chosen title and link (complete with the name of the VM being viewed). Both the text and URL of custom links can be templatized in this manner, and custom links can be grouped together into dropdowns for more efficient display.
 
 To learn more about this feature, check out the [custom link documentation](../customization/custom-links.md).
 

docs/features/user-preferences.md

@@ -1,63 +0,0 @@
-# User Preferences
-
-NetBox stores per‑user options that control aspects of the web interface and data display. Preferences persist across sessions and can be managed under **User → Preferences**.
-
-## Table configurations
-
-When a list view is configured using **Configure**, NetBox records the selected columns and ordering as per‑user table preferences for that table. These preferences are applied automatically on subsequent visits.
-
-### Clearing table preferences
-
-Saved table preferences may need to be reset, for example, if a table fails to render or after an upgrade that changes available columns.
-
-To clear saved preferences for one or more tables:
-
-1. Click the username in the top‑right corner.
-2. Select **Preferences** from the dropdown.
-3. Scroll to the **Table Configurations** section.
-4. Select the tables to reset.
-5. Click **Submit** to clear the selected preferences.
-
-After clearing preferences, reopen the list view and use **Configure** to set the desired columns and ordering.
-
-!!! note
-    Per‑user table preferences are distinct from **Table Configs**, which are named, reusable configurations managed under *Customization → Table Configs*. Clearing preferences does not delete any Table Configs. See [Table Configs](../models/extras/tableconfig.md) for details.
-
-## Other preferences
-
-### Language
-Selects the user interface language from installed translations (subject to system configuration).
-
-### Page length
-Sets the default number of rows displayed on paginated tables.
-
-### Paginator placement
-Controls where pagination controls are rendered relative to a table.
-
-### HTMX navigation (experimental)
-Enables partial‑page navigation for supported views. Disable this preference if unexpected behavior is observed.
-
-### Striped table rows
-Toggles alternating row backgrounds on tables.
-
-### Data format (raw views)
-Sets the default format (JSON or YAML) when rendering raw data blocks.
-
-### CSV delimiter
-Overrides the delimiter used when exporting CSV data.
-
-## Bookmarks
-
-Users can bookmark frequently visited objects for convenient access. Bookmarks appear under the user menu and can be displayed on the personal dashboard using the bookmarks' widget. See [Bookmark](../models/extras/bookmark.md) for model details.
-
-## Notifications and subscriptions
-
-Users may subscribe to objects to receive notifications when changes occur. Notifications are listed under the user menu and can be marked as read or deleted. See [Features > Notifications](notifications.md) and the data‑model references for [Subscription](../models/extras/subscription.md) and [Notification](../models/extras/notification.md).
-
-## Admin defaults
-
-Administrators can define defaults for new users via [`DEFAULT_USER_PREFERENCES`](../configuration/default-values.md#default_user_preferences). Users may override these values under their own preferences.
-
-## See also
-
-- [Development > User Preferences](../development/user-preferences.md) (manifest of recognized preference keys)

docs/getting-started/planning.md

@@ -17,7 +17,7 @@ Dedicate some time to take stock of your own sources of truth for your infrastru
 
 * **Multiple conflicting sources** for a given domain. For example, there may be multiple versions of a spreadsheet circulating, each of which asserts a conflicting set of data.
 * **Sources with no domain defined.** You may encounter that different teams within your organization use different tools for the same purpose, with no normal definition of when either should be used.
-* **Inaccessible data formatting.** Some tools are better suited for programmatic usage than others. For example, spreadsheets are generally very easy to parse and export; however, free-form notes on wiki or similar application are much more difficult to consume.
+* **Inaccessible data formatting.** Some tools are better suited for programmatic usage than others. For example, spreadsheets are generally very easy to parse and export, however free-form notes on wiki or similar application are much more difficult to consume.
 * **There is no source of truth.** Sometimes you'll find that a source of truth simply doesn't exist for a domain. For example, when assigning IP addresses, operators may be just using any (presumed) available IP from a subnet without ever recording its usage.
 
 See if you can identify each domain of infrastructure data for your organization, and the source of truth for each. Once you have these compiled, you'll need to determine what belongs in NetBox.

docs/installation/3-netbox.md

@@ -6,8 +6,8 @@ This section of the documentation discusses installing and configuring the NetBo
 
 Begin by installing all system packages required by NetBox and its dependencies.
 
-!!! warning "Python 3.10 or later required"
-    NetBox supports Python 3.10, 3.11, and 3.12.
+!!! warning "Python 3.12 or later required"
+    NetBox supports only Python 3.12 or later.
 
 ```no-highlight
 sudo apt install -y python3 python3-pip python3-venv python3-dev \
@@ -15,7 +15,7 @@ build-essential libxml2-dev libxslt1-dev libffi-dev libpq-dev \
 libssl-dev zlib1g-dev
 ```
 
-Before continuing, check that your installed Python version is at least 3.10:
+Before continuing, check that your installed Python version is at least 3.12:
 
 ```no-highlight
 python3 -V
@@ -235,10 +235,10 @@ Once NetBox has been configured, we're ready to proceed with the actual installa
 sudo /opt/netbox/upgrade.sh
 ```
 
-Note that **Python 3.10 or later is required** for NetBox v4.0 and later releases. If the default Python installation on your server is set to a lesser version,  pass the path to the supported installation as an environment variable named `PYTHON`. (Note that the environment variable must be passed _after_ the `sudo` command.)
+Note that **Python 3.12 or later is required** for NetBox v4.5 and later releases. If the default Python installation on your server is set to a lesser version,  pass the path to the supported installation as an environment variable named `PYTHON`. (Note that the environment variable must be passed _after_ the `sudo` command.)
 
 ```no-highlight
-sudo PYTHON=/usr/bin/python3.10 /opt/netbox/upgrade.sh
+sudo PYTHON=/usr/bin/python3.12 /opt/netbox/upgrade.sh
 ```
 
 !!! note

docs/installation/4a-gunicorn.md

@@ -60,6 +60,3 @@ You should see output similar to the following:
     If the NetBox service fails to start, issue the command `journalctl -eu netbox` to check for log messages that may indicate the problem.
 
 Once you've verified that the WSGI workers are up and running, move on to HTTP server setup.
-
-!!! note
-    There is a bug in the current stable release of gunicorn (v21.2.0) where automatic restarts of the worker processes can result in 502 errors under heavy load. (See [gunicorn bug #3038](https://github.com/benoitc/gunicorn/issues/3038) for more detail.) Users who encounter this issue may opt to downgrade to an earlier, unaffected release of gunicorn (`pip install gunicorn==20.1.0`). Note, however, that this earlier release does not officially support Python 3.11.

docs/installation/6-ldap.md

@@ -121,7 +121,6 @@ AUTH_LDAP_MIRROR_GROUPS = True
 # Define special user types using groups. Exercise great caution when assigning superuser status.
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {
     "is_active": "cn=active,ou=groups,dc=example,dc=com",
-    "is_staff": "cn=staff,ou=groups,dc=example,dc=com",
     "is_superuser": "cn=superuser,ou=groups,dc=example,dc=com"
 }
 
@@ -134,7 +133,6 @@ AUTH_LDAP_CACHE_TIMEOUT = 3600
 ```
 
 * `is_active` - All users must be mapped to at least this group to enable authentication. Without this, users cannot log in.
-* `is_staff` - Users mapped to this group are enabled for access to the administration tools; this is the equivalent of checking the "staff status" box on a manually created user. This doesn't grant any specific permissions.
 * `is_superuser` - Users mapped to this group will be granted superuser status. Superusers are implicitly granted all permissions.
 
 !!! warning
@@ -248,7 +246,6 @@ AUTH_LDAP_MIRROR_GROUPS = True
 # Define special user types using groups. Exercise great caution when assigning superuser status.
 AUTH_LDAP_USER_FLAGS_BY_GROUP = {
     "is_active": "cn=active,ou=groups,dc=example,dc=com",
-    "is_staff": "cn=staff,ou=groups,dc=example,dc=com",
     "is_superuser": "cn=superuser,ou=groups,dc=example,dc=com"
 }
 

docs/installation/index.md

@@ -27,7 +27,7 @@ The following sections detail how to set up a new instance of NetBox:
 
 | Dependency | Supported Versions |
 |------------|--------------------|
-| Python     | 3.10, 3.11, 3.12   |
+| Python     | 3.12, 3.13, 3.14   |
 | PostgreSQL | 14+                |
 | Redis      | 4.0+               |
 

docs/installation/upgrading.md

@@ -19,7 +19,7 @@ NetBox requires the following dependencies:
 
 | Dependency | Supported Versions |
 |------------|--------------------|
-| Python     | 3.10, 3.11, 3.12   |
+| Python     | 3.12, 3.13, 3.14   |
 | PostgreSQL | 14+                |
 | Redis      | 4.0+               |
 
@@ -27,6 +27,7 @@ NetBox requires the following dependencies:
 
 | NetBox Version | Python min | Python max | PostgreSQL min | Redis min |                                       Documentation                                       |
 |:--------------:|:----------:|:----------:|:--------------:|:---------:|:-----------------------------------------------------------------------------------------:|
+|      4.5       |    3.12    |    3.14    |       14       |    4.0    | [Link](https://github.com/netbox-community/netbox/blob/v4.5.0/docs/installation/index.md) |
 |      4.4       |    3.10    |    3.12    |       14       |    4.0    | [Link](https://github.com/netbox-community/netbox/blob/v4.4.0/docs/installation/index.md) |
 |      4.3       |    3.10    |    3.12    |       14       |    4.0    | [Link](https://github.com/netbox-community/netbox/blob/v4.3.0/docs/installation/index.md) |
 |      4.2       |    3.10    |    3.12    |       13       |    4.0    | [Link](https://github.com/netbox-community/netbox/blob/v4.2.0/docs/installation/index.md) |
@@ -130,7 +131,7 @@ sudo ./upgrade.sh
     If the default version of Python is not at least 3.10, you'll need to pass the path to a supported Python version as an environment variable when calling the upgrade script. For example:
 
     ```no-highlight
-    sudo PYTHON=/usr/bin/python3.10 ./upgrade.sh
+    sudo PYTHON=/usr/bin/python3.12 ./upgrade.sh
     ```
 
 !!! note

docs/models/extras/tableconfig.md

@@ -4,9 +4,6 @@ This object represents the saved configuration of an object table in NetBox. Tab
 
 For example, you might wish to create a table config for the devices list to assist in inventory tasks. This view might show the device name, location, serial number, and asset tag, but omit operational details like IP addresses. Once applied, this table config can be saved for reuse in future audits.
 
-!!! note
-    Per‑user table preferences (columns and ordering remembered for an individual user) are distinct from Table Configs. If a list view fails to render due to outdated saved preferences, see [Clearing table preferences](../../features/user-preferences.md#clearing-table-preferences).
-
 ## Fields
 
 ### Name
@@ -23,7 +20,7 @@ The type of NetBox object to which the table config pertains.
 
 ### Table
 
-The name of the specific table to which the table config pertains. (Some NetBox objects use multiple tables.)
+The name of the specific table to which the table config pertains. (Some NetBox object use multiple tables.)
 
 ### Weight
 

docs/plugins/development/background-jobs.md

@@ -60,13 +60,6 @@ Four of the standard Python logging levels are supported:
 
 Log entries recorded using the runner's logger will be saved in the job's log in the database in addition to being processed by other [system logging handlers](../../configuration/system.md#logging).
 
-### Jobs running for Model instances
-
-A Job can be executed for a specific instance of a Model.
-To enable this functionality, the model must include the `JobsMixin`.
-
-When enqueuing a Job, you can associate it with a particular instance by passing that instance to the `instance` parameter.
-
 ### Scheduled Jobs
 
 As described above, jobs can be scheduled for immediate execution or at any later time using the `enqueue()` method. However, for management purposes, the `enqueue_once()` method allows a job to be scheduled exactly once avoiding duplicates. If a job is already scheduled for a particular instance, a second one won't be scheduled, respecting thread safety. An example use case would be to schedule a periodic task that is bound to an instance in general, but not to any event of that instance (such as updates). The parameters of the `enqueue_once()` method are identical to those of `enqueue()`.
@@ -80,10 +73,9 @@ As described above, jobs can be scheduled for immediate execution or at any late
 from django.db import models
 from core.choices import JobIntervalChoices
 from netbox.models import NetBoxModel
-from netbox.models.features import JobsMixin
 from .jobs import MyTestJob
 
-class MyModel(JobsMixin, NetBoxModel):
+class MyModel(NetBoxModel):
     foo = models.CharField()
 
     def save(self, *args, **kwargs):

docs/plugins/development/filtersets.md

@@ -1,6 +1,6 @@
 # Filters & Filter Sets
 
-Filter sets define the mechanisms available for filtering or searching through a set of objects in NetBox. For instance, sites can be filtered by their parent region or group, status, facility ID, and so on. The same filter set is used consistently for a model whether the request is made via the UI or REST API. (Note that the GraphQL API uses a separate filter class.) NetBox employs the [django-filter](https://django-filter.readthedocs.io/en/stable/) library to define filter sets.
+Filter sets define the mechanisms available for filtering or searching through a set of objects in NetBox. For instance, sites can be filtered by their parent region or group, status, facility ID, and so on. The same filter set is used consistently for a model whether the request is made via the UI or REST API. (Note that the GraphQL API uses a separate filter class.) NetBox employs the [django-filters2](https://django-tables2.readthedocs.io/en/latest/) library to define filter sets.
 
 ## FilterSet Classes
 
@@ -55,27 +55,6 @@ class MyModelViewSet(...):
     filterset_class = filtersets.MyModelFilterSet
 ```
 
-### Implementing Quick Search
-
-The `ObjectListView` has a field called Quick Search. For Quick Search to work the corresponding FilterSet has to override the `search` method that is implemented in `NetBoxModelFilterSet`. This function takes a queryset and can perform arbitrary operations on it and return it. A common use-case is to search for the given search value in multiple fields:
-
-```python
-from django.db.models import Q
-from netbox.filtersets import NetBoxModelFilterSet
-
-class MyFilterSet(NetBoxModelFilterSet):
-    ...
-    def search(self, queryset, name, value):
-        if not value.strip():
-            return queryset
-        return queryset.filter(
-            Q(name__icontains=value) |
-            Q(description__icontains=value)
-        )
-```
-
-The `search` method is also used by the `q` filter in `NetBoxModelFilterSet` which in turn is used by the Search field in the filters tab.
-
 ## Filter Classes
 
 ### TagFilter

docs/plugins/development/index.md

@@ -66,7 +66,7 @@ The top level is the project root, which can have any name that you like. Immedi
 * `README.md` - A brief introduction to your plugin, how to install and configure it, where to find help, and any other pertinent information. It is recommended to write `README` files using a markup language such as Markdown to enable human-friendly display.
 * The plugin source directory. This must be a valid Python package name, typically comprising only lowercase letters, numbers, and underscores.
 
-The plugin source directory contains all the actual Python code and other resources used by your plugin. Its structure is left to the author's discretion; however, it is recommended to follow best practices as outlined in the [Django documentation](https://docs.djangoproject.com/en/stable/intro/reusable-apps/). At a minimum, this directory **must** contain an `__init__.py` file containing an instance of NetBox's `PluginConfig` class, discussed below.
+The plugin source directory contains all the actual Python code and other resources used by your plugin. Its structure is left to the author's discretion, however it is recommended to follow best practices as outlined in the [Django documentation](https://docs.djangoproject.com/en/stable/intro/reusable-apps/). At a minimum, this directory **must** contain an `__init__.py` file containing an instance of NetBox's `PluginConfig` class, discussed below.
 
 **Note:** The [Cookiecutter NetBox Plugin](https://github.com/netbox-community/cookiecutter-netbox-plugin) can be used to auto-generate all the needed directories and files for a new plugin.
 
@@ -173,12 +173,12 @@ classifiers=[
     'Intended Audience :: Developers',
     'Natural Language :: English',
     "Programming Language :: Python :: 3 :: Only",
-    'Programming Language :: Python :: 3.10',
-    'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
 ]
 
-requires-python = ">=3.10.0"
+requires-python = ">=3.12.0"
 
 ```
 
@@ -186,7 +186,7 @@ Many of these are self-explanatory, but for more information, see the [pyproject
 
 ## Create a Virtual Environment
 
-It is strongly recommended to create a Python [virtual environment](https://docs.python.org/3/tutorial/venv.html) for the development of your plugin, as opposed to using system-wide packages. This will afford you complete control over the installed versions of all dependencies and avoid conflict with system packages. This environment can live wherever you'd like;however, it should be excluded from revision control. (A popular convention is to keep all virtual environments in the user's home directory, e.g. `~/.virtualenvs/`.)
+It is strongly recommended to create a Python [virtual environment](https://docs.python.org/3/tutorial/venv.html) for the development of your plugin, as opposed to using system-wide packages. This will afford you complete control over the installed versions of all dependencies and avoid conflict with system packages. This environment can live wherever you'd like, however it should be excluded from revision control. (A popular convention is to keep all virtual environments in the user's home directory, e.g. `~/.virtualenvs/`.)
 
 ```shell
 python3 -m venv ~/.virtualenvs/my_plugin
@@ -195,7 +195,7 @@ python3 -m venv ~/.virtualenvs/my_plugin
 You can make NetBox available within this environment by creating a path file pointing to its location. This will add NetBox to the Python path upon activation. (Be sure to adjust the command below to specify your actual virtual environment path, Python version, and NetBox installation.)
 
 ```shell
-echo /opt/netbox/netbox > $VENV/lib/python3.10/site-packages/netbox.pth
+echo /opt/netbox/netbox > $VENV/lib/python3.12/site-packages/netbox.pth
 ```
 
 ## Development Installation

docs/plugins/development/navigation.md

@@ -64,14 +64,17 @@ item1 = PluginMenuItem(
 
 A `PluginMenuItem` has the following attributes:
 
-| Attribute       | Required | Description                                                                                              |
-|-----------------|----------|----------------------------------------------------------------------------------------------------------|
-| `link`          | Yes      | Name of the URL path to which this menu item links                                                       |
-| `link_text`     | Yes      | The text presented to the user                                                                           |
-| `permissions`   | -        | A list of permissions required to display this link                                                      |
-| `auth_required` | -        | Display only for authenticated users                                                                     |
-| `staff_only`    | -        | Display only for users who have `is_staff` set to true (any specified permissions will also be required) |
-| `buttons`       | -        | An iterable of PluginMenuButton instances to include                                                     |
+| Attribute       | Required | Description                                          |
+|-----------------|----------|------------------------------------------------------|
+| `link`          | Yes      | Name of the URL path to which this menu item links   |
+| `link_text`     | Yes      | The text presented to the user                       |
+| `permissions`   | -        | A list of permissions required to display this link  |
+| `auth_required` | -        | Display only for authenticated users                 |
+| `staff_only`    | -        | Display only for superusers                          |
+| `buttons`       | -        | An iterable of PluginMenuButton instances to include |
+
+!!! note "Changed in NetBox v4.5"
+    In releases prior to NetBox v4.5, `staff_only` restricted display of a menu item to only users with `is_staff` set to True. In NetBox v4.5, the `is_staff` flag was removed from the user model. Menu items with `staff_only` set to True are now displayed only for superusers.
 
 ## Menu Buttons
 

docs/plugins/development/tables.md

@@ -47,11 +47,6 @@ table.configure(request)
 
 This will automatically apply any user-specific preferences for the table. (If using a generic view provided by NetBox, table configuration is handled automatically.)
 
-
-### Bulk Edit and Delete Actions
-
-Bulk edit and delete buttons are automatically added to the table, if there is an appropriate view registered to the `${modelname}_bulk_edit` or `${modelname}_bulk_delete` path name.
-
 ## Columns
 
 The table column classes listed below are supported for use in plugins. These classes can be imported from `netbox.tables.columns`.

docs/release-notes/version-3.0.md

@@ -357,7 +357,7 @@ And the response:
 ...
 ```
 
-All GraphQL requests are made at the `/graphql` URL (which also serves the GraphiQL UI). The API is currently read-only; however, users who wish to disable it until needed can do so by setting the `GRAPHQL_ENABLED` configuration parameter to False. For more detail on NetBox's GraphQL implementation, see [the GraphQL API documentation](../integrations/graphql-api.md).
+All GraphQL requests are made at the `/graphql` URL (which also serves the GraphiQL UI). The API is currently read-only, however users who wish to disable it until needed can do so by setting the `GRAPHQL_ENABLED` configuration parameter to False. For more detail on NetBox's GraphQL implementation, see [the GraphQL API documentation](../integrations/graphql-api.md).
 
 #### IP Ranges ([#834](https://github.com/netbox-community/netbox/issues/834))
 

docs/release-notes/version-4.4.md

@@ -1,247 +1,5 @@
 # NetBox v4.4
 
-## v4.4.9 (2025-12-23)
-
-### Enhancements
-
-* [#20309](https://github.com/netbox-community/netbox/issues/20309) - Support ASDOT notation for ASN ranges
-* [#20720](https://github.com/netbox-community/netbox/issues/20720) - Add Latvian translations
-* [#20900](https://github.com/netbox-community/netbox/issues/20900) - Allow filtering custom choice fields by multiple values in the UI
-
-### Bug Fixes
-
-* [#17976](https://github.com/netbox-community/netbox/issues/17976) - Remove `devicetype_count` from nested manufacturer to correct OpenAPI schema
-* [#20011](https://github.com/netbox-community/netbox/issues/20011) - Provide a clear message when encountering duplicate object IDs during bulk import
-* [#20114](https://github.com/netbox-community/netbox/issues/20114) - Preserve `parent_bay` during device bulk import when tags are present
-* [#20491](https://github.com/netbox-community/netbox/issues/20491) - Improve handling of numeric ranges in tests
-* [#20873](https://github.com/netbox-community/netbox/issues/20873) - Fix `AttributeError` exception triggered by event rules associated with an object that supports file attachments
-* [#20875](https://github.com/netbox-community/netbox/issues/20875) - Ensure that parent object relations are cached (for filtering) on device/module components during instantiation
-* [#20876](https://github.com/netbox-community/netbox/issues/20876) - Allow editing an IP address that resides within a range marked as populated
-* [#20912](https://github.com/netbox-community/netbox/issues/20912) - Fix inconsistent clearing of `module` field on ModuleBay
-* [#20944](https://github.com/netbox-community/netbox/issues/20944) - Ensure cached scope is updated on child objects when a parent region/site/location is changed
-* [#20948](https://github.com/netbox-community/netbox/issues/20948) - Handle the deletion of related objects with `on_delete=RESTRICT` the same as `CASCADE`
-* [#20969](https://github.com/netbox-community/netbox/issues/20969) - Fix querying of front port templates by `rear_port_id`
-* [#21011](https://github.com/netbox-community/netbox/issues/21011) - Avoid writing to the database when loading active ConfigRevision
-* [#21032](https://github.com/netbox-community/netbox/issues/21032) - Avoid SQL subquery in RestrictedQuerySet where unnecessary
-
----
-
-## v4.4.8 (2025-12-09)
-
-### Enhancements
-
-* [#20068](https://github.com/netbox-community/netbox/issues/20068) - Support the assignment of module type profile attributes via bulk import
-* [#20914](https://github.com/netbox-community/netbox/issues/20914) - Enable filtering device components by tenant assigned to device
-
-### Bug Fixes
-
-* [#19918](https://github.com/netbox-community/netbox/issues/19918) - Fix support for `{module}` resolution of components of child modules
-* [#20759](https://github.com/netbox-community/netbox/issues/20759) - Improve legibility of object types in permissions form
-* [#20860](https://github.com/netbox-community/netbox/issues/20860) - Ensure user-provided changelog message is recorded when creating device components via the UI
-* [#20878](https://github.com/netbox-community/netbox/issues/20878) - Use the active database connection when executing custom scripts
-* [#20888](https://github.com/netbox-community/netbox/issues/20888) - Resolve warnings about non-decimal values for min/max latitude & longitude fields
-
----
-
-## v4.4.7 (2025-11-25)
-
-### Enhancements
-
-* [#20371](https://github.com/netbox-community/netbox/issues/20371) - Add Molex Micro-Fit 2x3 for power ports & power outlets
-* [#20731](https://github.com/netbox-community/netbox/issues/20731) - Enable specifying `data_source` & `data_file` when bulk import config templates
-* [#20820](https://github.com/netbox-community/netbox/issues/20820) - Enable filtering of custom fields by object type
-* [#20823](https://github.com/netbox-community/netbox/issues/20823) - Disallow creation of API tokens with an expiration date in the past
-* [#20841](https://github.com/netbox-community/netbox/issues/20841) - Support advanced filtering for available rack types when creating/editing a rack
-
-### Bug Fixes
-
-* [#20134](https://github.com/netbox-community/netbox/issues/20134) - Prevent out-of-band HTMX content swaps in embedded tables
-* [#20432](https://github.com/netbox-community/netbox/issues/20432) - Fix tracing of cables across multiple circuits in parallel
-* [#20465](https://github.com/netbox-community/netbox/issues/20465) - Ensure that scripts are updated immediately when a new file is uploaded
-* [#20638](https://github.com/netbox-community/netbox/issues/20638) - Correct OpenAPI schema for bulk create operations
-* [#20649](https://github.com/netbox-community/netbox/issues/20649) - Enforce view permissions on REST API endpoint for custom scripts
-* [#20740](https://github.com/netbox-community/netbox/issues/20740) - Ensure permissions constraints are enforced when executing custom scripts via the REST API
-* [#20743](https://github.com/netbox-community/netbox/issues/20743) - Pass request context to custom script when triggered by an event rule
-* [#20766](https://github.com/netbox-community/netbox/issues/20766) - Fix inadvertent translations on server error page
-* [#20775](https://github.com/netbox-community/netbox/issues/20775) - Fix `TypeError` exception when bulk renaming unnamed devices
-* [#20822](https://github.com/netbox-community/netbox/issues/20822) - Add missing `auto_sync_enabled` field in bulk edit forms
-* [#20827](https://github.com/netbox-community/netbox/issues/20827) - Fix UI styling issue when toggling between light and dark mode
-* [#20839](https://github.com/netbox-community/netbox/issues/20839) - Fix filtering by object type in UI for custom links and saved filters
-* [#20840](https://github.com/netbox-community/netbox/issues/20840) - Remove extraneous references to airflow for RackType model
-* [#20844](https://github.com/netbox-community/netbox/issues/20844) - Fix object type filter for L2VPN terminations
-* [#20859](https://github.com/netbox-community/netbox/issues/20859) - Prevent dashboard crash due to exception raised by a widget
-* [#20865](https://github.com/netbox-community/netbox/issues/20865) - Enforce proper min/max values for latitude & longitude fields
-
----
-
-## v4.4.6 (2025-11-11)
-
-### Enhancements
-
-* [#14171](https://github.com/netbox-community/netbox/issues/14171) - Support VLAN assignment for device & VM interfaces being bulk imported
-* [#20297](https://github.com/netbox-community/netbox/issues/20297) - Introduce additional coaxial cable types
-
-### Bug Fixes
-
-* [#20378](https://github.com/netbox-community/netbox/issues/20378) - Prevent exception when attempting to delete a data source utilized by a custom script
-* [#20645](https://github.com/netbox-community/netbox/issues/20645) - CSVChoiceField should defer to model field's default value when CSV field is empty
-* [#20647](https://github.com/netbox-community/netbox/issues/20647) - Improve handling of empty strings during bulk imports
-* [#20653](https://github.com/netbox-community/netbox/issues/20653) - Fix filtering of jobs by object type ID
-* [#20660](https://github.com/netbox-community/netbox/issues/20660) - Optimize loading of custom script modules from remote storage
-* [#20670](https://github.com/netbox-community/netbox/issues/20670) - Improve validation of related objects during bulk import
-* [#20688](https://github.com/netbox-community/netbox/issues/20688) - Suppress non-harmful "No active configuration revision found" warning message
-* [#20697](https://github.com/netbox-community/netbox/issues/20697) - Prevent duplication of signals which increment/decrement related object counts
-* [#20699](https://github.com/netbox-community/netbox/issues/20699) - Ensure proper ordering of changelog entries resulting from cascading deletions
-* [#20713](https://github.com/netbox-community/netbox/issues/20713) - Ensure a pre-change snapshot is recorded on virtual chassis members being added/removed
-* [#20721](https://github.com/netbox-community/netbox/issues/20721) - Fix breadcrumb navigation links in UI for background tasks
-* [#20738](https://github.com/netbox-community/netbox/issues/20738) - Deleting a virtual chassis should nullify the `vc_position` of all former members
-* [#20750](https://github.com/netbox-community/netbox/issues/20750) - Fix cloning of permissions when only one action is enabled
-* [#20755](https://github.com/netbox-community/netbox/issues/20755) - Prevent duplicate results under certain conditions when filtering providers
-* [#20771](https://github.com/netbox-community/netbox/issues/20771) - Comments are required when creating a new journal entry
-* [#20774](https://github.com/netbox-community/netbox/issues/20774) - Bulk action button labels should be translated
-
----
-
-## v4.4.5 (2025-10-28)
-
-### Enhancements
-
-* [#19751](https://github.com/netbox-community/netbox/issues/19751) - Disable occupied module bays in form dropdowns when installing a new module
-* [#20301](https://github.com/netbox-community/netbox/issues/20301) - Add a "dismiss all" option to the notifications dropdown
-* [#20399](https://github.com/netbox-community/netbox/issues/20399) - Add `assigned` and `primary` boolean filters for MAC addresses
-* [#20567](https://github.com/netbox-community/netbox/issues/20567) - Add contacts column to services table
-* [#20675](https://github.com/netbox-community/netbox/issues/20675) - Enable [NetBox Copilot](https://netboxlabs.com/products/netbox-copilot/) integration
-* [#20692](https://github.com/netbox-community/netbox/issues/20692) - Add contacts column to IP addresses table
-* [#20700](https://github.com/netbox-community/netbox/issues/20700) - Add contacts table column for various additional models
-
-### Bug Fixes
-
-* [#19872](https://github.com/netbox-community/netbox/issues/19872) - Ensure custom script validation failures display error messages
-* [#20389](https://github.com/netbox-community/netbox/issues/20389) - Fix "select all" behavior for bulk rename views
-* [#20422](https://github.com/netbox-community/netbox/issues/20422) - Enable filtering of aggregates and prefixes by family in GraphQL API
-* [#20459](https://github.com/netbox-community/netbox/issues/20459) - Fix validation of `is_oob` & `is_primary` fields under IP address bulk import
-* [#20466](https://github.com/netbox-community/netbox/issues/20466) - Fix querying of devices with a primary IP assigned in GraphQL API
-* [#20498](https://github.com/netbox-community/netbox/issues/20498) - Enforce the validation regex (if set) for custom URL fields
-* [#20524](https://github.com/netbox-community/netbox/issues/20524) - Raise a validation error when attempting to schedule a custom script for a past date/time
-* [#20541](https://github.com/netbox-community/netbox/issues/20541) - Fix resolution of GraphQL object fields which rely on custom filters
-* [#20551](https://github.com/netbox-community/netbox/issues/20551) - Fix automatic slug generation in quick-add UI form
-* [#20606](https://github.com/netbox-community/netbox/issues/20606) - Enable copying of values from table columns rendered as badges
-* [#20641](https://github.com/netbox-community/netbox/issues/20641) - Fix `AttributeError` exception raised by the object changes REST API endpoint
-* [#20646](https://github.com/netbox-community/netbox/issues/20646) - Prevent cables from connecting to objects marked as connected
-* [#20655](https://github.com/netbox-community/netbox/issues/20655) - Fix `FieldError` exception when attempting to sort permissions list by actions
-
----
-
-## v4.4.4 (2025-10-15)
-
-### Bug Fixes
-
-* [#20554](https://github.com/netbox-community/netbox/issues/20554) - Fix generic relation filters to accept `<app>.<model>` format matching POST requests
-* [#20574](https://github.com/netbox-community/netbox/issues/20574) - Fix excessive storage initialization overhead when listing scripts with remote backends
-* [#20584](https://github.com/netbox-community/netbox/issues/20584) - Enforce PoE mode requirement on interface templates when PoE type is set
-* [#20585](https://github.com/netbox-community/netbox/issues/20585) - Fix API schema generation crash for models with single-field UniqueConstraints
-* [#20587](https://github.com/netbox-community/netbox/issues/20587) - Fix upgrade.sh failure when removing stale content types
-
----
-
-## v4.4.3 (2025-10-14)
-
-### Enhancements
-
-* [#20426](https://github.com/netbox-community/netbox/issues/20426) - Add a copy-to-clipboard button for custom script output
-* [#20516](https://github.com/netbox-community/netbox/issues/20516) - Improve rendering of VLAN ID ranges in VLAN group tables
-
-### Bug Fixes
-
-* [#19302](https://github.com/netbox-community/netbox/issues/19302) - Fix uniqueness validation in REST API for nullable fields
-* [#19615](https://github.com/netbox-community/netbox/issues/19615) - Fix support for static file parameters in templates when external storage is in use
-* [#19818](https://github.com/netbox-community/netbox/issues/19818) - Hide primary IP assignment fields when creating a new virtual machine in the UI
-* [#19825](https://github.com/netbox-community/netbox/issues/19825) - Prevent cache for config revisions from being erroneously overwritten when debugging is enabled
-* [#20140](https://github.com/netbox-community/netbox/issues/20140) - Changing a site's region or group should update any associated circuit terminations
-* [#20156](https://github.com/netbox-community/netbox/issues/20156) - Fix display of rack elevation labels
-* [#20290](https://github.com/netbox-community/netbox/issues/20290) - Fix migration error when upgrading to NetBox v4.4 from releases earlier than v4.3
-* [#20471](https://github.com/netbox-community/netbox/issues/20471) - Saving an unmodified VLAN group should not generate a change record
-* [#20475](https://github.com/netbox-community/netbox/issues/20475) - Collapse singleton VLAN IDs in VLAN group display
-* [#20494](https://github.com/netbox-community/netbox/issues/20494) - Correct OpenAPI schema definition for `IntegerRangeSerializer`
-* [#20496](https://github.com/netbox-community/netbox/issues/20496) - REST API should always honor `MAX_PAGE_SIZE` value
-* [#20497](https://github.com/netbox-community/netbox/issues/20497) - Fix filtering of VLAN groups by VLAN ID range in GraphQL API
-* [#20507](https://github.com/netbox-community/netbox/issues/20507) - Fix support for fetching ASN contacts via GraphQL API
-* [#20523](https://github.com/netbox-community/netbox/issues/20523) - Hide password change form for users authenticated via SSO
-* [#20542](https://github.com/netbox-community/netbox/issues/20542) - Fix the creation of MAC addresses using the "quick add" form
-
----
-
-## v4.4.2 (2025-09-30)
-
-### Enhancements
-
-* [#17010](https://github.com/netbox-community/netbox/issues/17010) - Show admin navigation menu items only for staff & superusers
-* [#19590](https://github.com/netbox-community/netbox/issues/19590) - Add columns for device site & location to device component tables
-* [#19765](https://github.com/netbox-community/netbox/issues/19765) - Linkify assigned object types under saved filter view
-* [#20308](https://github.com/netbox-community/netbox/issues/20308) - Add a hotkey (`/`) for the global search field
-* [#20332](https://github.com/netbox-community/netbox/issues/20332) - Add a "none" option to object tag filters
-* [#20380](https://github.com/netbox-community/netbox/issues/20380) - Introduce the `SENTRY_CONFIG` configuration parameter
-* [#20412](https://github.com/netbox-community/netbox/issues/20412) - Linkify cluster type on virtual machine detail view
-* [#20438](https://github.com/netbox-community/netbox/issues/20438) - Add `facility` field to bulk edit forms for sites and locations
-
-### Bug Fixes
-
-* [#18878](https://github.com/netbox-community/netbox/issues/18878) - Automatically assign a designated primary MAC address upon creation of a new interface
-* [#20243](https://github.com/netbox-community/netbox/issues/20243) - Prevent scheduled system jobs from re-running multiple times
-* [#20253](https://github.com/netbox-community/netbox/issues/20253) - Fix support for filtering object contact assignments in GraphQL API
-* [#20365](https://github.com/netbox-community/netbox/issues/20365) - Address various inaccuracies in generated OpenAPI schema
-* [#20375](https://github.com/netbox-community/netbox/issues/20375) - Preserve filter parameters when performing bulk operations
-* [#20390](https://github.com/netbox-community/netbox/issues/20390) - Fix styling of page size selection dropdown
-* [#20392](https://github.com/netbox-community/netbox/issues/20392) - Clean up ordering of interface type options
-* [#20398](https://github.com/netbox-community/netbox/issues/20398) - Fix misleading error reporting for min/max custom field values
-* [#20419](https://github.com/netbox-community/netbox/issues/20419) - Correct action buttons for child object views
-* [#20425](https://github.com/netbox-community/netbox/issues/20425) - Fix Markdown preview functionality within "quick add" modal
-* [#20441](https://github.com/netbox-community/netbox/issues/20441) - Fix display of the "groups" column in contact assignments table 
-
----
-
-## v4.4.1 (2025-09-16)
-
-### Enhancements
-
-* [#15492](https://github.com/netbox-community/netbox/issues/15492) - Enable cloning of permissions
-* [#16381](https://github.com/netbox-community/netbox/issues/16381) - Display script result timestamps in system timezone
-* [#19262](https://github.com/netbox-community/netbox/issues/19262) - No longer restrict FHRP group assignment by assigned IP address
-* [#19408](https://github.com/netbox-community/netbox/issues/19408) - Support export templates for circuit terminations and virtual circuit terminations
-* [#19428](https://github.com/netbox-community/netbox/issues/19428) - Add an optional U height field to the devices table
-* [#19547](https://github.com/netbox-community/netbox/issues/19547) - Add individual "sync" buttons in data sources table
-* [#19865](https://github.com/netbox-community/netbox/issues/19865) - Reorganize cable type groupings
-* [#20222](https://github.com/netbox-community/netbox/issues/20222) - Enable the `HttpOnly` flag for CSRF cookie
-* [#20237](https://github.com/netbox-community/netbox/issues/20237) - Include VPN tunnel groups in global search results
-* [#20241](https://github.com/netbox-community/netbox/issues/20241) - Record A & B terminations in cable changelog data
-* [#20277](https://github.com/netbox-community/netbox/issues/20277) - Add support for attribute assignment to `deserialize_object()` utility
-* [#20321](https://github.com/netbox-community/netbox/issues/20321) - Add physical media types for transceiver interfaces
-* [#20347](https://github.com/netbox-community/netbox/issues/20347) - Add Wi-Fi Alliance aliases to 802.11 interface types
-
-### Bug Fixes
-
-* [#19729](https://github.com/netbox-community/netbox/issues/19729) - Restore `kind` filter for interfaces in GraphQL API
-* [#19744](https://github.com/netbox-community/netbox/issues/19744) - Plugins list should be orderable by "active" column
-* [#19851](https://github.com/netbox-community/netbox/issues/19851) - Fix `ValueError` complaining of missing `scope` when bulk importing wireless LANs
-* [#19896](https://github.com/netbox-community/netbox/issues/19896) - Min/max values for decimal custom fields should accept decimal values
-* [#20197](https://github.com/netbox-community/netbox/issues/20197) - Correct validation for virtual chassis parent interface
-* [#20215](https://github.com/netbox-community/netbox/issues/20215) - All GraphQL filters for config contexts should be optional
-* [#20217](https://github.com/netbox-community/netbox/issues/20217) - Remove "0 VLANs available" row at end of VLAN range table
-* [#20221](https://github.com/netbox-community/netbox/issues/20221) - JSON fields should not coerce empty dictionaries to null
-* [#20227](https://github.com/netbox-community/netbox/issues/20227) - Ensure consistent padding of Markdown content
-* [#20234](https://github.com/netbox-community/netbox/issues/20234) - Fix "add" button link for prerequisite object warning in UI
-* [#20236](https://github.com/netbox-community/netbox/issues/20236) - Strip invalid characters from uploaded image file names
-* [#20238](https://github.com/netbox-community/netbox/issues/20238) - Fix support for outside IP assignment during bulk import of tunnel terminations
-* [#20242](https://github.com/netbox-community/netbox/issues/20242) - Avoid `AttributeError` exception on background jobs with no request ID
-* [#20252](https://github.com/netbox-community/netbox/issues/20252) - Remove generic AddObject from ObjectChildrenView to prevent duplicate "add" buttons
-* [#20264](https://github.com/netbox-community/netbox/issues/20264) - Fix rendering of default icon in plugins list
-* [#20272](https://github.com/netbox-community/netbox/issues/20272) - ConfigContexts assigned to ancestor locations should apply to device/VM
-* [#20282](https://github.com/netbox-community/netbox/issues/20282) - Fix styling of prerequisite objects warning
-* [#20298](https://github.com/netbox-community/netbox/issues/20298) - Display a placeholder when an image thumbnail fails to load
-* [#20327](https://github.com/netbox-community/netbox/issues/20327) - Avoid calling `distinct()` on device/VM queryset when fetching config context data
-
----
-
 ## v4.4.0 (2025-09-02)
 
 ### New Features

mkdocs.yml

@@ -86,7 +86,6 @@ nav:
         - Change Logging: 'features/change-logging.md'
         - Journaling: 'features/journaling.md'
         - Event Rules: 'features/event-rules.md'
-        - User Preferences: 'features/user-preferences.md'
         - Notifications: 'features/notifications.md'
         - Background Jobs: 'features/background-jobs.md'
         - Auth & Permissions: 'features/authentication-permissions.md'
@@ -125,9 +124,6 @@ nav:
         - Export Templates: 'customization/export-templates.md'
         - Reports: 'customization/reports.md'
         - Custom Scripts: 'customization/custom-scripts.md'
-    - Best Practices:
-        - Modeling Pluggable Transceivers: 'best-practices/modeling-pluggable-transceivers.md'
-        - Performance Handbook: 'best-practices/performance-handbook.md'
     - Integrations:
         - REST API: 'integrations/rest-api.md'
         - GraphQL API: 'integrations/graphql-api.md'

netbox/circuits/apps.py

@@ -1,7 +1,5 @@
 from django.apps import AppConfig
 
-from netbox import denormalized
-
 
 class CircuitsConfig(AppConfig):
     name = "circuits"
@@ -10,16 +8,6 @@ class CircuitsConfig(AppConfig):
     def ready(self):
         from netbox.models.features import register_models
         from . import signals, search  # noqa: F401
-        from .models import CircuitTermination
 
         # Register models
         register_models(*self.get_models())
-
-        denormalized.register(CircuitTermination, '_site', {
-            '_region': 'region',
-            '_site_group': 'group',
-        })
-
-        denormalized.register(CircuitTermination, '_location', {
-            '_site': 'site',
-        })

netbox/circuits/filtersets.py

@@ -89,6 +89,8 @@ class ProviderFilterSet(NetBoxModelFilterSet, ContactModelFilterSet):
         return queryset.filter(
             Q(name__icontains=value) |
             Q(description__icontains=value) |
+            Q(accounts__account__icontains=value) |
+            Q(accounts__name__icontains=value) |
             Q(comments__icontains=value)
         )
 

netbox/circuits/models/circuits.py

@@ -6,6 +6,7 @@ from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from circuits.choices import *
+from circuits.constants import *
 from dcim.models import CabledObjectModel
 from netbox.models import ChangeLoggedModel, OrganizationalModel, PrimaryModel
 from netbox.models.mixins import DistanceMixin
@@ -230,7 +231,6 @@ class CircuitGroupAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin,
 class CircuitTermination(
     CustomFieldsMixin,
     CustomLinksMixin,
-    ExportTemplatesMixin,
     TagsMixin,
     ChangeLoggedModel,
     CabledObjectModel

netbox/circuits/models/virtual_circuits.py

@@ -8,7 +8,7 @@ from django.utils.translation import gettext_lazy as _
 
 from circuits.choices import *
 from netbox.models import ChangeLoggedModel, PrimaryModel
-from netbox.models.features import CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, TagsMixin
+from netbox.models.features import CustomFieldsMixin, CustomLinksMixin, TagsMixin
 from .base import BaseCircuitType
 
 __all__ = (
@@ -121,7 +121,6 @@ class VirtualCircuit(PrimaryModel):
 class VirtualCircuitTermination(
     CustomFieldsMixin,
     CustomLinksMixin,
-    ExportTemplatesMixin,
     TagsMixin,
     ChangeLoggedModel
 ):

netbox/circuits/views.py

@@ -83,7 +83,6 @@ class ProviderBulkEditView(generic.BulkEditView):
 @register_model_view(Provider, 'bulk_rename', path='rename', detail=False)
 class ProviderBulkRenameView(generic.BulkRenameView):
     queryset = Provider.objects.all()
-    filterset = filtersets.ProviderFilterSet
 
 
 @register_model_view(Provider, 'bulk_delete', path='delete', detail=False)
@@ -151,7 +150,6 @@ class ProviderAccountBulkEditView(generic.BulkEditView):
 @register_model_view(ProviderAccount, 'bulk_rename', path='rename', detail=False)
 class ProviderAccountBulkRenameView(generic.BulkRenameView):
     queryset = ProviderAccount.objects.all()
-    filterset = filtersets.ProviderAccountFilterSet
 
 
 @register_model_view(ProviderAccount, 'bulk_delete', path='delete', detail=False)
@@ -228,7 +226,6 @@ class ProviderNetworkBulkEditView(generic.BulkEditView):
 @register_model_view(ProviderNetwork, 'bulk_rename', path='rename', detail=False)
 class ProviderNetworkBulkRenameView(generic.BulkRenameView):
     queryset = ProviderNetwork.objects.all()
-    filterset = filtersets.ProviderNetworkFilterSet
 
 
 @register_model_view(ProviderNetwork, 'bulk_delete', path='delete', detail=False)
@@ -293,7 +290,6 @@ class CircuitTypeBulkEditView(generic.BulkEditView):
 @register_model_view(CircuitType, 'bulk_rename', path='rename', detail=False)
 class CircuitTypeBulkRenameView(generic.BulkRenameView):
     queryset = CircuitType.objects.all()
-    filterset = filtersets.CircuitTypeFilterSet
 
 
 @register_model_view(CircuitType, 'bulk_delete', path='delete', detail=False)
@@ -366,7 +362,6 @@ class CircuitBulkEditView(generic.BulkEditView):
 class CircuitBulkRenameView(generic.BulkRenameView):
     queryset = Circuit.objects.all()
     field_name = 'cid'
-    filterset = filtersets.CircuitFilterSet
 
 
 @register_model_view(Circuit, 'bulk_delete', path='delete', detail=False)
@@ -562,7 +557,6 @@ class CircuitGroupBulkEditView(generic.BulkEditView):
 @register_model_view(CircuitGroup, 'bulk_rename', path='rename', detail=False)
 class CircuitGroupBulkRenameView(generic.BulkRenameView):
     queryset = CircuitGroup.objects.all()
-    filterset = filtersets.CircuitGroupFilterSet
 
 
 @register_model_view(CircuitGroup, 'bulk_delete', path='delete', detail=False)
@@ -678,7 +672,6 @@ class VirtualCircuitTypeBulkEditView(generic.BulkEditView):
 @register_model_view(VirtualCircuitType, 'bulk_rename', path='rename', detail=False)
 class VirtualCircuitTypeBulkRenameView(generic.BulkRenameView):
     queryset = VirtualCircuitType.objects.all()
-    filterset = filtersets.VirtualCircuitTypeFilterSet
 
 
 @register_model_view(VirtualCircuitType, 'bulk_delete', path='delete', detail=False)
@@ -751,7 +744,6 @@ class VirtualCircuitBulkEditView(generic.BulkEditView):
 class VirtualCircuitBulkRenameView(generic.BulkRenameView):
     queryset = VirtualCircuit.objects.all()
     field_name = 'cid'
-    filterset = filtersets.VirtualCircuitFilterSet
 
 
 @register_model_view(VirtualCircuit, 'bulk_delete', path='delete', detail=False)

netbox/core/api/schema.py

@@ -12,7 +12,6 @@ from drf_spectacular.utils import Direction
 
 from netbox.api.fields import ChoiceField
 from netbox.api.serializers import WritableNestedSerializer
-from netbox.api.viewsets import NetBoxModelViewSet
 
 # see netbox.api.routers.NetBoxRouter
 BULK_ACTIONS = ("bulk_destroy", "bulk_partial_update", "bulk_update")
@@ -50,11 +49,6 @@ class ChoiceFieldFix(OpenApiSerializerFieldExtension):
             )
 
 
-def viewset_handles_bulk_create(view):
-    """Check if view automatically provides list-based bulk create"""
-    return isinstance(view, NetBoxModelViewSet)
-
-
 class NetBoxAutoSchema(AutoSchema):
     """
     Overrides to drf_spectacular.openapi.AutoSchema to fix following issues:
@@ -134,36 +128,6 @@ class NetBoxAutoSchema(AutoSchema):
 
         return response_serializers
 
-    def _get_request_for_media_type(self, serializer, direction='request'):
-        """
-        Override to generate oneOf schema for serializers that support both
-        single object and array input (NetBoxModelViewSet POST operations).
-
-        Refs: #20638
-        """
-        # Get the standard schema first
-        schema, required = super()._get_request_for_media_type(serializer, direction)
-
-        # If this serializer supports arrays (marked in get_request_serializer),
-        # wrap the schema in oneOf to allow single object OR array
-        if (
-            direction == 'request' and
-            schema is not None and
-            getattr(self.view, 'action', None) == 'create' and
-            viewset_handles_bulk_create(self.view)
-        ):
-            return {
-                'oneOf': [
-                    schema,  # Single object
-                    {
-                        'type': 'array',
-                        'items': schema,  # Array of objects
-                    }
-                ]
-            }, required
-
-        return schema, required
-
     def _get_serializer_name(self, serializer, direction, bypass_extensions=False) -> str:
         name = super()._get_serializer_name(serializer, direction, bypass_extensions)
 
@@ -318,18 +282,18 @@ class FixSerializedPKRelatedField(OpenApiSerializerFieldExtension):
 
 class FixIntegerRangeSerializerSchema(OpenApiSerializerExtension):
     target_class = 'netbox.api.fields.IntegerRangeSerializer'
-    match_subclasses = True
 
     def map_serializer(self, auto_schema: 'AutoSchema', direction: Direction) -> _SchemaType:
-        # One range = two integers; many=True will wrap this in an outer array
         return {
             'type': 'array',
             'items': {
-                'type': 'integer',
+                'type': 'array',
+                'items': {
+                    'type': 'integer',
+                },
+                'minItems': 2,
+                'maxItems': 2,
             },
-            'minItems': 2,
-            'maxItems': 2,
-            'example': [10, 20],
         }
 
 

netbox/core/api/serializers_/jobs.py

@@ -1,13 +1,8 @@
-from drf_spectacular.utils import extend_schema_field
-from rest_framework import serializers
-
 from core.choices import *
 from core.models import Job
-from netbox.api.exceptions import SerializerNotFound
 from netbox.api.fields import ChoiceField, ContentTypeField
 from netbox.api.serializers import BaseModelSerializer
 from users.api.serializers_.users import UserSerializer
-from utilities.api import get_serializer_for_model
 
 __all__ = (
     'JobSerializer',
@@ -23,28 +18,11 @@ class JobSerializer(BaseModelSerializer):
     object_type = ContentTypeField(
         read_only=True
     )
-    object = serializers.SerializerMethodField(
-        read_only=True
-    )
 
     class Meta:
         model = Job
         fields = [
-            'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'object', 'name', 'status', 'created',
-            'scheduled', 'interval', 'started', 'completed', 'user', 'data', 'error', 'job_id', 'log_entries',
+            'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'name', 'status', 'created', 'scheduled',
+            'interval', 'started', 'completed', 'user', 'data', 'error', 'job_id', 'log_entries',
         ]
         brief_fields = ('url', 'created', 'completed', 'user', 'status')
-
-    @extend_schema_field(serializers.JSONField(allow_null=True))
-    def get_object(self, obj):
-        """
-        Serialize a nested representation of the object.
-        """
-        if obj.object is None:
-            return None
-        try:
-            serializer = get_serializer_for_model(obj.object)
-        except SerializerNotFound:
-            return obj.object_repr
-        context = {'request': self.context['request']}
-        return serializer(obj.object, nested=True, context=context).data

netbox/core/api/serializers_/tasks.py

@@ -13,7 +13,7 @@ class BackgroundTaskSerializer(serializers.Serializer):
     url = serializers.HyperlinkedIdentityField(
         view_name='core-api:rqtask-detail',
         lookup_field='id',
-        lookup_url_kwarg='id'
+        lookup_url_kwarg='pk'
     )
     description = serializers.CharField()
     origin = serializers.CharField()

netbox/core/api/views.py

@@ -5,11 +5,10 @@ from django_rq.queues import get_redis_connection
 from django_rq.settings import QUEUES_LIST
 from django_rq.utils import get_statistics
 from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import OpenApiParameter, extend_schema
+from drf_spectacular.utils import extend_schema
 from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
-from rest_framework.permissions import IsAdminUser
 from rest_framework.response import Response
 from rest_framework.routers import APIRootView
 from rest_framework.viewsets import ReadOnlyModelViewSet
@@ -24,7 +23,7 @@ from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
 from netbox.api.metadata import ContentTypeMetadata
 from netbox.api.pagination import LimitOffsetListPagination
 from netbox.api.viewsets import NetBoxModelViewSet, NetBoxReadOnlyModelViewSet
-
+from utilities.api import IsSuperuser
 from . import serializers
 
 
@@ -100,7 +99,7 @@ class BaseRQViewSet(viewsets.ViewSet):
     """
     Base class for RQ view sets. Provides a list() method. Subclasses must implement get_data().
     """
-    permission_classes = [IsAdminUser]
+    permission_classes = [IsSuperuser]
     serializer_class = None
 
     def get_data(self):
@@ -118,49 +117,29 @@ class BaseRQViewSet(viewsets.ViewSet):
     def get_serializer(self, *args, **kwargs):
         """
         Return the serializer instance that should be used for validating and
-        deserializing input and for serializing output.
+        deserializing input, and for serializing output.
         """
         serializer_class = self.get_serializer_class()
         kwargs['context'] = self.get_serializer_context()
         return serializer_class(*args, **kwargs)
 
-    def get_serializer_class(self):
-        """
-        Return the class to use for the serializer.
-        """
-        return self.serializer_class
-
-    def get_serializer_context(self):
-        """
-        Extra context provided to the serializer class.
-        """
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self,
-        }
-
 
 class BackgroundQueueViewSet(BaseRQViewSet):
     """
     Retrieve a list of RQ Queues.
-    Note: Queue names are not URL safe, so not returning a detail view.
+    Note: Queue names are not URL safe so not returning a detail view.
     """
     serializer_class = serializers.BackgroundQueueSerializer
     lookup_field = 'name'
     lookup_value_regex = r'[\w.@+-]+'
 
     def get_view_name(self):
-        return 'Background Queues'
+        return "Background Queues"
 
     def get_data(self):
-        return get_statistics(run_maintenance_tasks=True)['queues']
+        return get_statistics(run_maintenance_tasks=True)["queues"]
 
-    @extend_schema(
-        operation_id='core_background_queues_retrieve_by_name',
-        parameters=[OpenApiParameter(name='name', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)],
-        responses={200: OpenApiTypes.OBJECT},
-    )
+    @extend_schema(responses={200: OpenApiTypes.OBJECT})
     def retrieve(self, request, name):
         data = self.get_data()
         if not data:
@@ -182,17 +161,12 @@ class BackgroundWorkerViewSet(BaseRQViewSet):
     lookup_field = 'name'
 
     def get_view_name(self):
-        return 'Background Workers'
+        return "Background Workers"
 
     def get_data(self):
         config = QUEUES_LIST[0]
         return Worker.all(get_redis_connection(config['connection_config']))
 
-    @extend_schema(
-        operation_id='core_background_workers_retrieve_by_name',
-        parameters=[OpenApiParameter(name='name', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)],
-        responses={200: OpenApiTypes.OBJECT},
-    )
     def retrieve(self, request, name):
         # all the RQ queues should use the same connection
         config = QUEUES_LIST[0]
@@ -210,10 +184,9 @@ class BackgroundTaskViewSet(BaseRQViewSet):
     Retrieve a list of RQ Tasks.
     """
     serializer_class = serializers.BackgroundTaskSerializer
-    lookup_field = 'id'
 
     def get_view_name(self):
-        return 'Background Tasks'
+        return "Background Tasks"
 
     def get_data(self):
         return get_rq_jobs()
@@ -226,53 +199,45 @@ class BackgroundTaskViewSet(BaseRQViewSet):
 
         return task
 
-    @extend_schema(
-        operation_id='core_background_tasks_retrieve_by_id',
-        parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)],
-        responses={200: OpenApiTypes.OBJECT},
-    )
-    def retrieve(self, request, id):
+    @extend_schema(responses={200: OpenApiTypes.OBJECT})
+    def retrieve(self, request, pk):
         """
         Retrieve the details of the specified RQ Task.
         """
-        task = self.get_task_from_id(id)
+        task = self.get_task_from_id(pk)
         serializer = self.serializer_class(task, context={'request': request})
         return Response(serializer.data)
 
-    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
-    @action(methods=['POST'], detail=True)
-    def delete(self, request, id):
+    @action(methods=["POST"], detail=True)
+    def delete(self, request, pk):
         """
         Delete the specified RQ Task.
         """
-        delete_rq_job(id)
+        delete_rq_job(pk)
         return HttpResponse(status=200)
 
-    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
-    @action(methods=['POST'], detail=True)
-    def requeue(self, request, id):
+    @action(methods=["POST"], detail=True)
+    def requeue(self, request, pk):
         """
         Requeues the specified RQ Task.
         """
-        requeue_rq_job(id)
+        requeue_rq_job(pk)
         return HttpResponse(status=200)
 
-    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
-    @action(methods=['POST'], detail=True)
-    def enqueue(self, request, id):
+    @action(methods=["POST"], detail=True)
+    def enqueue(self, request, pk):
         """
         Enqueues the specified RQ Task.
         """
-        enqueue_rq_job(id)
+        enqueue_rq_job(pk)
         return HttpResponse(status=200)
 
-    @extend_schema(parameters=[OpenApiParameter(name='id', type=OpenApiTypes.STR, location=OpenApiParameter.PATH)])
-    @action(methods=['POST'], detail=True)
-    def stop(self, request, id):
+    @action(methods=["POST"], detail=True)
+    def stop(self, request, pk):
         """
         Stops the specified RQ Task.
         """
-        stopped_jobs = stop_rq_job(id)
+        stopped_jobs = stop_rq_job(pk)
         if len(stopped_jobs) == 1:
             return HttpResponse(status=200)
         else:

netbox/core/filtersets.py

@@ -80,11 +80,6 @@ class JobFilterSet(BaseFilterSet):
         method='search',
         label=_('Search'),
     )
-    object_type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ObjectType.objects.with_feature('jobs'),
-        field_name='object_type_id',
-    )
-    object_type = ContentTypeFilter()
     created = django_filters.DateTimeFilter()
     created__before = django_filters.DateTimeFilter(
         field_name='created',
@@ -128,7 +123,7 @@ class JobFilterSet(BaseFilterSet):
 
     class Meta:
         model = Job
-        fields = ('id', 'object_type', 'object_type_id', 'object_id', 'name', 'interval', 'status', 'user', 'job_id')
+        fields = ('id', 'object_type', 'object_id', 'name', 'interval', 'status', 'user', 'job_id')
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -174,7 +169,6 @@ class ObjectChangeFilterSet(BaseFilterSet):
     changed_object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ContentType.objects.all()
     )
-    related_object_type = ContentTypeFilter()
     user_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
         label=_('User (ID)'),

netbox/core/forms/filtersets.py

@@ -70,13 +70,13 @@ class JobFilterForm(SavedFiltersMixin, FilterForm):
     model = Job
     fieldsets = (
         FieldSet('q', 'filter_id'),
-        FieldSet('object_type_id', 'status', name=_('Attributes')),
+        FieldSet('object_type', 'status', name=_('Attributes')),
         FieldSet(
             'created__before', 'created__after', 'scheduled__before', 'scheduled__after', 'started__before',
             'started__after', 'completed__before', 'completed__after', 'user', name=_('Creation')
         ),
     )
-    object_type_id = ContentTypeChoiceField(
+    object_type = ContentTypeChoiceField(
         label=_('Object Type'),
         queryset=ObjectType.objects.with_feature('jobs'),
         required=False,

netbox/core/forms/model_forms.py

@@ -166,8 +166,8 @@ class ConfigRevisionForm(forms.ModelForm, metaclass=ConfigFormMetaclass):
         FieldSet('CUSTOM_VALIDATORS', 'PROTECTION_RULES', name=_('Validation')),
         FieldSet('DEFAULT_USER_PREFERENCES', name=_('User Preferences')),
         FieldSet(
-            'MAINTENANCE_MODE', 'COPILOT_ENABLED', 'GRAPHQL_ENABLED', 'CHANGELOG_RETENTION', 'JOB_RETENTION',
-            'MAPS_URL', name=_('Miscellaneous'),
+            'MAINTENANCE_MODE', 'GRAPHQL_ENABLED', 'CHANGELOG_RETENTION', 'JOB_RETENTION', 'MAPS_URL',
+            name=_('Miscellaneous')
         ),
         FieldSet('comment', name=_('Config Revision'))
     )

netbox/core/graphql/mixins.py

@@ -3,12 +3,12 @@ from typing import Annotated, List, TYPE_CHECKING
 import strawberry
 import strawberry_django
 from django.contrib.contenttypes.models import ContentType
-from strawberry.types import Info
 
 from core.models import ObjectChange
 
 if TYPE_CHECKING:
-    from core.graphql.types import DataFileType, DataSourceType, ObjectChangeType
+    from core.graphql.types import DataFileType, DataSourceType
+    from netbox.core.graphql.types import ObjectChangeType
 
 __all__ = (
     'ChangelogMixin',
@@ -20,7 +20,7 @@ __all__ = (
 class ChangelogMixin:
 
     @strawberry_django.field
-    def changelog(self, info: Info) -> List[Annotated['ObjectChangeType', strawberry.lazy('.types')]]:  # noqa: F821
+    def changelog(self, info) -> List[Annotated["ObjectChangeType", strawberry.lazy('.types')]]:  # noqa: F821
         content_type = ContentType.objects.get_for_model(self)
         object_changes = ObjectChange.objects.filter(
             changed_object_type=content_type,
@@ -31,5 +31,5 @@ class ChangelogMixin:
 
 @strawberry.type
 class SyncedDataMixin:
-    data_source: Annotated['DataSourceType', strawberry.lazy('core.graphql.types')] | None
-    data_file: Annotated['DataFileType', strawberry.lazy('core.graphql.types')] | None
+    data_source: Annotated["DataSourceType", strawberry.lazy('core.graphql.types')] | None
+    data_file: Annotated["DataFileType", strawberry.lazy('core.graphql.types')] | None

netbox/core/migrations/0019_configrevision_active.py

@@ -1,48 +0,0 @@
-# Generated by Django 5.2.5 on 2025-09-09 16:48
-
-from django.db import migrations, models
-
-
-def get_active(apps, schema_editor):
-    from django.core.cache import cache
-    ConfigRevision = apps.get_model('core', 'ConfigRevision')
-    version = None
-    revision = None
-
-    # Try and get the latest version from cache
-    try:
-        version = cache.get('config_version')
-    except Exception:
-        pass
-
-    # If there is a version in cache, attempt to set revision to the current version from cache
-    # If the version in cache does not exist or there is no version, try the lastest revision in the database
-    if not version or (version and not (revision := ConfigRevision.objects.filter(pk=version).first())):
-        revision = ConfigRevision.objects.order_by('-created').first()
-
-    # If there is a revision set, set the active revision
-    if revision:
-        revision.active = True
-        revision.save()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0018_concrete_objecttype'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='configrevision',
-            name='active',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.RunPython(code=get_active, reverse_code=migrations.RunPython.noop),
-        migrations.AddConstraint(
-            model_name='configrevision',
-            constraint=models.UniqueConstraint(
-                condition=models.Q(('active', True)), fields=('active',), name='unique_active_config_revision'
-            ),
-        ),
-    ]

netbox/core/models/config.py

@@ -14,9 +14,6 @@ class ConfigRevision(models.Model):
     """
     An atomic revision of NetBox's configuration.
     """
-    active = models.BooleanField(
-        default=False
-    )
     created = models.DateTimeField(
         verbose_name=_('created'),
         auto_now_add=True
@@ -38,13 +35,6 @@ class ConfigRevision(models.Model):
         ordering = ['-created']
         verbose_name = _('config revision')
         verbose_name_plural = _('config revisions')
-        constraints = [
-            models.UniqueConstraint(
-                fields=('active',),
-                condition=models.Q(active=True),
-                name='unique_active_config_revision',
-            )
-        ]
 
     def __str__(self):
         if not self.pk:
@@ -63,23 +53,14 @@ class ConfigRevision(models.Model):
             return reverse('core:config')  # Default config view
         return reverse('core:configrevision', args=[self.pk])
 
-    def activate(self, update_db=True):
+    def activate(self):
         """
         Cache the configuration data.
-
-        Parameters:
-            update_db: Mark the ConfigRevision as active in the database (default: True)
         """
         cache.set('config', self.data, None)
         cache.set('config_version', self.pk, None)
-
-        if update_db:
-            # Set all instances of ConfigRevision to false and set this instance to true
-            ConfigRevision.objects.all().update(active=False)
-            ConfigRevision.objects.filter(pk=self.pk).update(active=True)
-
     activate.alters_data = True
 
     @property
     def is_active(self):
-        return self.active
+        return cache.get('config_version') == self.pk

netbox/core/models/contenttypes.py

@@ -1,3 +0,0 @@
-# TODO: Remove this module in NetBox v4.5
-# Provided for backward compatibility
-from .object_types import *

netbox/core/models/files.py

@@ -6,6 +6,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.core.files.storage import storages
+from django.urls import reverse
 from django.utils.translation import gettext as _
 
 from ..choices import ManagedFileRootPathChoices
@@ -63,6 +64,9 @@ class ManagedFile(SyncedDataMixin, models.Model):
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse('core:managedfile', args=[self.pk])
+
     @property
     def name(self):
         return self.file_path

netbox/core/models/object_types.py

@@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import ArrayField
 from django.contrib.postgres.indexes import GinIndex
 from django.core.exceptions import ObjectDoesNotExist
-from django.db import connection, models
+from django.db import models
 from django.db.models import Q
 from django.utils.translation import gettext as _
 
@@ -66,14 +66,6 @@ class ObjectTypeManager(models.Manager):
         """
         from netbox.models.features import get_model_features, model_is_public
 
-        # TODO: Remove this in NetBox v5.0
-        # If the ObjectType table has not yet been provisioned (e.g. because we're in a pre-v4.4 migration),
-        # fall back to ContentType.
-        if 'core_objecttype' not in connection.introspection.table_names():
-            ct = ContentType.objects.get_for_model(model, for_concrete_model=for_concrete_model)
-            ct.features = get_model_features(ct.model_class())
-            return ct
-
         if not inspect.isclass(model):
             model = model.__class__
         opts = self._get_opts(model, for_concrete_model)

netbox/core/object_actions.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from netbox.object_actions import ObjectAction
 

netbox/core/plugins.py

@@ -1,5 +1,6 @@
 import datetime
 import importlib
+import importlib.util
 from dataclasses import dataclass, field
 from typing import Optional
 

netbox/core/signals.py

@@ -3,7 +3,6 @@ from threading import local
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.db.models import CASCADE, RESTRICT
 from django.db.models.fields.reverse_related import ManyToManyRel, ManyToOneRel
 from django.db.models.signals import m2m_changed, post_migrate, post_save, pre_delete
 from django.dispatch import receiver, Signal
@@ -221,8 +220,14 @@ def handle_deleted_object(sender, instance, **kwargs):
             obj.snapshot()  # Ensure the change record includes the "before" state
             if type(relation) is ManyToManyRel:
                 getattr(obj, related_field_name).remove(instance)
-            elif type(relation) is ManyToOneRel and relation.null and relation.on_delete not in (CASCADE, RESTRICT):
+            elif type(relation) is ManyToOneRel and relation.field.null is True:
                 setattr(obj, related_field_name, None)
+                # make sure the object hasn't been deleted - in case of
+                # deletion chaining of related objects
+                try:
+                    obj.refresh_from_db()
+                except DoesNotExist:
+                    continue
                 obj.save()
 
     # Enqueue the object for event processing

netbox/core/tables/data.py

@@ -4,7 +4,6 @@ import django_tables2 as tables
 from core.models import *
 from netbox.tables import NetBoxTable, columns
 from .columns import BackendTypeColumn
-from .template_code import DATA_SOURCE_SYNC_BUTTON
 
 __all__ = (
     'DataFileTable',
@@ -38,9 +37,6 @@ class DataSourceTable(NetBoxTable):
     tags = columns.TagColumn(
         url_name='core:datasource_list',
     )
-    actions = columns.ActionsColumn(
-        extra_buttons=DATA_SOURCE_SYNC_BUTTON,
-    )
 
     class Meta(NetBoxTable.Meta):
         model = DataSource

netbox/core/tables/plugins.py

@@ -1,8 +1,10 @@
 import django_tables2 as tables
+from django.urls import reverse
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
 from netbox.tables import BaseTable, columns
-from .template_code import PLUGIN_IS_INSTALLED, PLUGIN_NAME_TEMPLATE
+from .template_code import PLUGIN_IS_INSTALLED
 
 __all__ = (
     'CatalogPluginTable',
@@ -10,6 +12,12 @@ __all__ = (
 )
 
 
+PLUGIN_NAME_TEMPLATE = """
+<img class="plugin-icon" src="{{ record.icon_url }}">
+<a href="{% url 'core:plugin' record.config_name %}">{{ record.title_long }}</a>
+"""
+
+
 class PluginVersionTable(BaseTable):
     version = tables.Column(
         verbose_name=_('Version')
@@ -53,7 +61,6 @@ class CatalogPluginTable(BaseTable):
         verbose_name=_('Local')
     )
     is_installed = columns.TemplateColumn(
-        accessor=tables.A('is_loaded'),
         verbose_name=_('Active'),
         template_code=PLUGIN_IS_INSTALLED
     )
@@ -86,4 +93,10 @@ class CatalogPluginTable(BaseTable):
         )
         # List installed plugins first, then certified plugins, then
         # everything else (with each tranche ordered alphabetically)
-        order_by = ('-is_installed', '-is_certified', 'title_long')
+        order_by = ('-is_installed', '-is_certified', 'name')
+
+    def render_title_long(self, value, record):
+        if record.static:
+            return value
+        url = reverse('core:plugin', args=[record.config_name])
+        return mark_safe(f"<a href='{url}'>{value}</a>")

netbox/core/tables/template_code.py

@@ -26,29 +26,3 @@ PLUGIN_IS_INSTALLED = """
     <span class="text-muted">&mdash;</span>
 {% endif %}
 """
-
-PLUGIN_NAME_TEMPLATE = """
-{% load static %}
-{% if record.icon_url %}
-    <img class="plugin-icon" src="{{ record.icon_url }}">
-{% else %}
-    <img class="plugin-icon" src="{% static 'plugin-default.svg' %}">
-{% endif %}
-<a href="{% url 'core:plugin' record.config_name %}">{{ record.title_long }}</a>
-"""
-
-DATA_SOURCE_SYNC_BUTTON = """
-{% load helpers %}
-{% load i18n %}
-{% if perms.core.sync_datasource %}
-    {% if record.ready_for_sync %}
-        <button class="btn btn-primary btn-sm" type="submit" formaction="{% url 'core:datasource_sync' pk=record.pk %}?return_url={{ request.get_full_path|urlencode }}" formmethod="post">
-            <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync" %}
-        </button>
-    {% else %}
-        <button class="btn btn-primary btn-sm" disabled>
-            <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync" %}
-        </button>
-    {% endif %}
-{% endif %}
-"""

netbox/core/tests/test_api.py

@@ -107,14 +107,14 @@ class ObjectTypeTest(APITestCase):
     def test_list_objects(self):
         object_type_count = ObjectType.objects.count()
 
-        response = self.client.get(reverse('extras-api:objecttype-list'), **self.header)
+        response = self.client.get(reverse('core-api:objecttype-list'), **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], object_type_count)
 
     def test_get_object(self):
         object_type = ObjectType.objects.first()
 
-        url = reverse('extras-api:objecttype-detail', kwargs={'pk': object_type.pk})
+        url = reverse('core-api:objecttype-detail', kwargs={'pk': object_type.pk})
         self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_200_OK)
 
 
@@ -134,10 +134,7 @@ class BackgroundTaskTestCase(TestCase):
         Create a user and token for API calls.
         """
         # Create the test user and assign permissions
-        self.user = User.objects.create_user(username='testuser')
-        self.user.is_staff = True
-        self.user.is_active = True
-        self.user.save()
+        self.user = User.objects.create_user(username='testuser', is_active=True)
         self.token = Token.objects.create(user=self.user)
         self.header = {'HTTP_AUTHORIZATION': f'Token {self.token.key}'}
 
@@ -150,13 +147,11 @@ class BackgroundTaskTestCase(TestCase):
         url = reverse('core-api:rqqueue-list')
 
         # Attempt to load view without permission
-        self.user.is_staff = False
-        self.user.save()
         response = self.client.get(url, **self.header)
         self.assertEqual(response.status_code, 403)
 
         # Load view with permission
-        self.user.is_staff = True
+        self.user.is_superuser = True
         self.user.save()
         response = self.client.get(url, **self.header)
         self.assertEqual(response.status_code, 200)
@@ -165,7 +160,16 @@ class BackgroundTaskTestCase(TestCase):
         self.assertIn('low', str(response.content))
 
     def test_background_queue(self):
-        response = self.client.get(reverse('core-api:rqqueue-detail', args=['default']), **self.header)
+        url = reverse('core-api:rqqueue-detail', args=['default'])
+
+        # Attempt to load view without permission
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Load view with permission
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertIn('default', str(response.content))
         self.assertIn('oldest_job_timestamp', str(response.content))
@@ -174,8 +178,16 @@ class BackgroundTaskTestCase(TestCase):
     def test_background_task_list(self):
         queue = get_queue('default')
         queue.enqueue(self.dummy_job_default)
+        url = reverse('core-api:rqtask-list')
 
-        response = self.client.get(reverse('core-api:rqtask-list'), **self.header)
+        # Attempt to load view without permission
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Load view with permission
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertIn('origin', str(response.content))
         self.assertIn('core.tests.test_api.BackgroundTaskTestCase.dummy_job_default()', str(response.content))
@@ -183,8 +195,16 @@ class BackgroundTaskTestCase(TestCase):
     def test_background_task(self):
         queue = get_queue('default')
         job = queue.enqueue(self.dummy_job_default)
+        url = reverse('core-api:rqtask-detail', args=[job.id])
 
-        response = self.client.get(reverse('core-api:rqtask-detail', args=[job.id]), **self.header)
+        # Attempt to load view without permission
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Load view with permission
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertIn(str(job.id), str(response.content))
         self.assertIn('origin', str(response.content))
@@ -194,45 +214,65 @@ class BackgroundTaskTestCase(TestCase):
     def test_background_task_delete(self):
         queue = get_queue('default')
         job = queue.enqueue(self.dummy_job_default)
+        url = reverse('core-api:rqtask-delete', args=[job.id])
 
-        response = self.client.post(reverse('core-api:rqtask-delete', args=[job.id]), **self.header)
+        # Attempt to load view without permission
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Load view with permission
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.post(url, **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertFalse(RQ_Job.exists(job.id, connection=queue.connection))
         queue = get_queue('default')
         self.assertNotIn(job.id, queue.job_ids)
 
     def test_background_task_requeue(self):
-        queue = get_queue('default')
-
         # Enqueue & run a job that will fail
+        queue = get_queue('default')
         job = queue.enqueue(self.dummy_job_failing)
         worker = get_worker('default')
         with disable_logging():
             worker.work(burst=True)
         self.assertTrue(job.is_failed)
+        url = reverse('core-api:rqtask-requeue', args=[job.id])
+
+        # Attempt to requeue the job without permission
+        response = self.client.post(url, **self.header)
+        self.assertEqual(response.status_code, 403)
 
         # Re-enqueue the failed job and check that its status has been reset
-        response = self.client.post(reverse('core-api:rqtask-requeue', args=[job.id]), **self.header)
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.post(url, **self.header)
         self.assertEqual(response.status_code, 200)
         job = RQ_Job.fetch(job.id, queue.connection)
         self.assertFalse(job.is_failed)
 
     def test_background_task_enqueue(self):
-        queue = get_queue('default')
-
         # Enqueue some jobs that each depends on its predecessor
+        queue = get_queue('default')
         job = previous_job = None
         for _ in range(0, 3):
             job = queue.enqueue(self.dummy_job_default, depends_on=previous_job)
             previous_job = job
+        url = reverse('core-api:rqtask-enqueue', args=[job.id])
 
         # Check that the last job to be enqueued has a status of deferred
         self.assertIsNotNone(job)
         self.assertEqual(job.get_status(), JobStatus.DEFERRED)
         self.assertIsNone(job.enqueued_at)
 
+        # Attempt to force-enqueue the job without permission
+        response = self.client.post(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
         # Force-enqueue the deferred job
-        response = self.client.post(reverse('core-api:rqtask-enqueue', args=[job.id]), **self.header)
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.post(url, **self.header)
         self.assertEqual(response.status_code, 200)
 
         # Check that job's status is updated correctly
@@ -242,19 +282,27 @@ class BackgroundTaskTestCase(TestCase):
 
     def test_background_task_stop(self):
         queue = get_queue('default')
-
         worker = get_worker('default')
         job = queue.enqueue(self.dummy_job_default)
         worker.prepare_job_execution(job)
-
+        url = reverse('core-api:rqtask-stop', args=[job.id])
         self.assertEqual(job.get_status(), JobStatus.STARTED)
-        response = self.client.post(reverse('core-api:rqtask-stop', args=[job.id]), **self.header)
+
+        # Attempt to stop the task without permission
+        response = self.client.post(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Stop the task
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.post(url, **self.header)
         self.assertEqual(response.status_code, 200)
         with disable_logging():
             worker.monitor_work_horse(job, queue)  # Sets the job as Failed and removes from Started
         started_job_registry = StartedJobRegistry(queue.name, connection=queue.connection)
         self.assertEqual(len(started_job_registry), 0)
 
+        # Verify that the task was cancelled
         canceled_job_registry = FailedJobRegistry(queue.name, connection=queue.connection)
         self.assertEqual(len(canceled_job_registry), 1)
         self.assertIn(job.id, canceled_job_registry)
@@ -262,19 +310,34 @@ class BackgroundTaskTestCase(TestCase):
     def test_worker_list(self):
         worker1 = get_worker('default', name=uuid.uuid4().hex)
         worker1.register_birth()
-
         worker2 = get_worker('high')
         worker2.register_birth()
+        url = reverse('core-api:rqworker-list')
 
-        response = self.client.get(reverse('core-api:rqworker-list'), **self.header)
+        # Attempt to fetch the worker list without permission
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Fetch the worker list
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertIn(str(worker1.name), str(response.content))
 
     def test_worker(self):
         worker1 = get_worker('default', name=uuid.uuid4().hex)
         worker1.register_birth()
+        url = reverse('core-api:rqworker-detail', args=[worker1.name])
 
-        response = self.client.get(reverse('core-api:rqworker-detail', args=[worker1.name]), **self.header)
+        # Attempt to fetch a worker without permission
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Fetch the worker
+        self.user.is_superuser = True
+        self.user.save()
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertIn(str(worker1.name), str(response.content))
         self.assertIn('birth_date', str(response.content))

netbox/core/tests/test_changelog.py

@@ -5,16 +5,14 @@ from rest_framework import status
 
 from core.choices import ObjectChangeActionChoices
 from core.models import ObjectChange, ObjectType
-from dcim.choices import InterfaceTypeChoices, ModuleStatusChoices, SiteStatusChoices
-from dcim.models import (
-    Cable, CableTermination, Device, DeviceRole, DeviceType, Manufacturer, Module, ModuleBay, ModuleType, Interface,
-    Site,
-)
+from dcim.choices import SiteStatusChoices
+from dcim.models import Site, CableTermination, Device, DeviceType, DeviceRole, Interface, Cable
 from extras.choices import *
 from extras.models import CustomField, CustomFieldChoiceSet, Tag
 from utilities.testing import APITestCase
-from utilities.testing.utils import create_tags, create_test_device, post_data
+from utilities.testing.utils import create_tags, post_data
 from utilities.testing.views import ModelViewTestCase
+from dcim.models import Manufacturer
 
 
 class ChangeLogViewTest(ModelViewTestCase):
@@ -624,64 +622,3 @@ class ChangeLogAPITest(APITestCase):
         self.assertEqual(objectchange.prechange_data['name'], 'Site 1')
         self.assertEqual(objectchange.prechange_data['slug'], 'site-1')
         self.assertEqual(objectchange.postchange_data, None)
-
-    def test_deletion_ordering(self):
-        """
-        Check that the cascading deletion of dependent objects is recorded in the correct order.
-        """
-        device = create_test_device('device1')
-        module_bay = ModuleBay.objects.create(device=device, name='Module Bay 1')
-        module_type = ModuleType.objects.create(manufacturer=Manufacturer.objects.first(), model='Module Type 1')
-        self.add_permissions('dcim.add_module', 'dcim.add_interface', 'dcim.delete_module')
-        self.assertEqual(ObjectChange.objects.count(), 0)  # Sanity check
-
-        # Create a new Module
-        data = {
-            'device': device.pk,
-            'module_bay': module_bay.pk,
-            'module_type': module_type.pk,
-            'status': ModuleStatusChoices.STATUS_ACTIVE,
-        }
-        url = reverse('dcim-api:module-list')
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        module = device.modules.first()
-
-        # Create an Interface on the Module
-        data = {
-            'device': device.pk,
-            'module': module.pk,
-            'name': 'Interface 1',
-            'type': InterfaceTypeChoices.TYPE_1GE_FIXED,
-        }
-        url = reverse('dcim-api:interface-list')
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        interface = device.interfaces.first()
-
-        # Delete the Module
-        url = reverse('dcim-api:module-detail', kwargs={'pk': module.pk})
-        response = self.client.delete(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertEqual(Module.objects.count(), 0)
-        self.assertEqual(Interface.objects.count(), 0)
-
-        # Verify the creation of the expected ObjectChange records. We should see four total records, in this order:
-        #  1. Module created
-        #  2. Interface created
-        #  3. Interface deleted
-        #  4. Module deleted
-        changes = ObjectChange.objects.order_by('time')
-        self.assertEqual(len(changes), 4)
-        self.assertEqual(changes[0].changed_object_type, ContentType.objects.get_for_model(Module))
-        self.assertEqual(changes[0].changed_object_id, module.pk)
-        self.assertEqual(changes[0].action, ObjectChangeActionChoices.ACTION_CREATE)
-        self.assertEqual(changes[1].changed_object_type, ContentType.objects.get_for_model(Interface))
-        self.assertEqual(changes[1].changed_object_id, interface.pk)
-        self.assertEqual(changes[1].action, ObjectChangeActionChoices.ACTION_CREATE)
-        self.assertEqual(changes[2].changed_object_type, ContentType.objects.get_for_model(Interface))
-        self.assertEqual(changes[2].changed_object_id, interface.pk)
-        self.assertEqual(changes[2].action, ObjectChangeActionChoices.ACTION_DELETE)
-        self.assertEqual(changes[3].changed_object_type, ContentType.objects.get_for_model(Module))
-        self.assertEqual(changes[3].changed_object_id, module.pk)
-        self.assertEqual(changes[3].action, ObjectChangeActionChoices.ACTION_DELETE)

netbox/core/tests/test_openapi_schema.py

@@ -1,108 +0,0 @@
-"""
-Unit tests for OpenAPI schema generation.
-
-Refs: #20638
-"""
-import json
-from django.test import TestCase
-
-
-class OpenAPISchemaTestCase(TestCase):
-    """Tests for OpenAPI schema generation."""
-
-    def setUp(self):
-        """Fetch schema via API endpoint."""
-        response = self.client.get('/api/schema/', {'format': 'json'})
-        self.assertEqual(response.status_code, 200)
-        self.schema = json.loads(response.content)
-
-    def test_post_operation_documents_single_or_array(self):
-        """
-        POST operations on NetBoxModelViewSet endpoints should document
-        support for both single objects and arrays via oneOf.
-
-        Refs: #20638
-        """
-        # Test representative endpoints across different apps
-        test_paths = [
-            '/api/core/data-sources/',
-            '/api/dcim/sites/',
-            '/api/users/users/',
-            '/api/ipam/ip-addresses/',
-        ]
-
-        for path in test_paths:
-            with self.subTest(path=path):
-                operation = self.schema['paths'][path]['post']
-
-                # Get the request body schema
-                request_schema = operation['requestBody']['content']['application/json']['schema']
-
-                # Should have oneOf with two options
-                self.assertIn('oneOf', request_schema, f"POST {path} should have oneOf schema")
-                self.assertEqual(
-                    len(request_schema['oneOf']), 2,
-                    f"POST {path} oneOf should have exactly 2 options"
-                )
-
-                # First option: single object (has $ref or properties)
-                single_schema = request_schema['oneOf'][0]
-                self.assertTrue(
-                    '$ref' in single_schema or 'properties' in single_schema,
-                    f"POST {path} first oneOf option should be single object"
-                )
-
-                # Second option: array of objects
-                array_schema = request_schema['oneOf'][1]
-                self.assertEqual(
-                    array_schema['type'], 'array',
-                    f"POST {path} second oneOf option should be array"
-                )
-                self.assertIn('items', array_schema, f"POST {path} array should have items")
-
-    def test_bulk_update_operations_require_array_only(self):
-        """
-        Bulk update/patch operations should require arrays only, not oneOf.
-        They don't support single object input.
-
-        Refs: #20638
-        """
-        test_paths = [
-            '/api/dcim/sites/',
-            '/api/users/users/',
-        ]
-
-        for path in test_paths:
-            for method in ['put', 'patch']:
-                with self.subTest(path=path, method=method):
-                    operation = self.schema['paths'][path][method]
-                    request_schema = operation['requestBody']['content']['application/json']['schema']
-
-                    # Should be array-only, not oneOf
-                    self.assertNotIn(
-                        'oneOf', request_schema,
-                        f"{method.upper()} {path} should NOT have oneOf (array-only)"
-                    )
-                    self.assertEqual(
-                        request_schema['type'], 'array',
-                        f"{method.upper()} {path} should require array"
-                    )
-                    self.assertIn(
-                        'items', request_schema,
-                        f"{method.upper()} {path} array should have items"
-                    )
-
-    def test_bulk_delete_requires_array(self):
-        """
-        Bulk delete operations should require arrays.
-
-        Refs: #20638
-        """
-        path = '/api/dcim/sites/'
-        operation = self.schema['paths'][path]['delete']
-        request_schema = operation['requestBody']['content']['application/json']['schema']
-
-        # Should be array-only
-        self.assertNotIn('oneOf', request_schema, "DELETE should NOT have oneOf")
-        self.assertEqual(request_schema['type'], 'array', "DELETE should require array")
-        self.assertIn('items', request_schema, "DELETE array should have items")

netbox/core/tests/test_views.py

@@ -158,7 +158,7 @@ class BackgroundTaskTestCase(TestCase):
 
     def setUp(self):
         super().setUp()
-        self.user.is_staff = True
+        self.user.is_superuser = True
         self.user.is_active = True
         self.user.save()
 
@@ -171,13 +171,13 @@ class BackgroundTaskTestCase(TestCase):
         url = reverse('core:background_queue_list')
 
         # Attempt to load view without permission
-        self.user.is_staff = False
+        self.user.is_superuser = False
         self.user.save()
         response = self.client.get(url)
         self.assertEqual(response.status_code, 403)
 
         # Load view with permission
-        self.user.is_staff = True
+        self.user.is_superuser = True
         self.user.save()
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -356,7 +356,7 @@ class SystemTestCase(TestCase):
     def setUp(self):
         super().setUp()
 
-        self.user.is_staff = True
+        self.user.is_superuser = True
         self.user.save()
 
     def test_system_view_default(self):

netbox/core/views.py

@@ -33,13 +33,7 @@ from utilities.forms import ConfirmationForm
 from utilities.htmx import htmx_partial
 from utilities.json import ConfigJSONEncoder
 from utilities.query import count_related
-from utilities.views import (
-    ContentTypePermissionRequiredMixin,
-    GetRelatedModelsMixin,
-    GetReturnURLMixin,
-    ViewTab,
-    register_model_view,
-)
+from utilities.views import ContentTypePermissionRequiredMixin, GetRelatedModelsMixin, ViewTab, register_model_view
 from . import filtersets, forms, tables
 from .jobs import SyncDataSourceJob
 from .models import *
@@ -72,7 +66,7 @@ class DataSourceView(GetRelatedModelsMixin, generic.ObjectView):
 
 
 @register_model_view(DataSource, 'sync')
-class DataSourceSyncView(GetReturnURLMixin, BaseObjectView):
+class DataSourceSyncView(BaseObjectView):
     queryset = DataSource.objects.all()
 
     def get_required_permission(self):
@@ -91,7 +85,7 @@ class DataSourceSyncView(GetReturnURLMixin, BaseObjectView):
             request,
             _("Queued job #{id} to sync {datasource}").format(id=job.pk, datasource=datasource)
         )
-        return redirect(self.get_return_url(request, datasource))
+        return redirect(datasource.get_absolute_url())
 
 
 @register_model_view(DataSource, 'add', detail=False)
@@ -125,7 +119,6 @@ class DataSourceBulkEditView(generic.BulkEditView):
 @register_model_view(DataSource, 'bulk_rename', path='rename', detail=False)
 class DataSourceBulkRenameView(generic.BulkRenameView):
     queryset = DataSource.objects.all()
-    filterset = filtersets.DataSourceFilterSet
 
 
 @register_model_view(DataSource, 'bulk_delete', path='delete', detail=False)
@@ -373,7 +366,7 @@ class ConfigRevisionRestoreView(ContentTypePermissionRequiredMixin, View):
 class BaseRQView(UserPassesTestMixin, View):
 
     def test_func(self):
-        return self.request.user.is_staff
+        return self.request.user.is_superuser
 
 
 class BackgroundQueueListView(TableMixin, BaseRQView):
@@ -556,7 +549,7 @@ class WorkerView(BaseRQView):
 class SystemView(UserPassesTestMixin, View):
 
     def test_func(self):
-        return self.request.user.is_staff
+        return self.request.user.is_superuser
 
     def get(self, request):
 
@@ -639,7 +632,7 @@ class BasePluginView(UserPassesTestMixin, View):
     CACHE_KEY_CATALOG_ERROR = 'plugins-catalog-error'
 
     def test_func(self):
-        return self.request.user.is_staff
+        return self.request.user.is_superuser
 
     def get_cached_plugins(self, request):
         catalog_plugins = {}

netbox/dcim/api/serializers_/device_components.py

@@ -350,14 +350,14 @@ class ModuleBaySerializer(NetBoxModelSerializer):
     device = DeviceSerializer(nested=True)
     module = ModuleSerializer(
         nested=True,
-        fields=('id', 'url', 'display', 'device', 'module_bay'),
+        fields=('id', 'url', 'display'),
         required=False,
         allow_null=True,
         default=None
     )
     installed_module = ModuleSerializer(
         nested=True,
-        fields=('id', 'url', 'display', 'device', 'module_bay', 'serial', 'description'),
+        fields=('id', 'url', 'display', 'serial', 'description'),
         required=False,
         allow_null=True
     )

netbox/dcim/api/serializers_/manufacturers.py

@@ -20,4 +20,4 @@ class ManufacturerSerializer(NetBoxModelSerializer):
             'id', 'url', 'display_url', 'display', 'name', 'slug', 'description', 'tags', 'custom_fields',
             'created', 'last_updated', 'devicetype_count', 'inventoryitem_count', 'platform_count',
         ]
-        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description')
+        brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'devicetype_count')

netbox/dcim/choices.py

@@ -461,7 +461,6 @@ class PowerPortTypeChoices(ChoiceSet):
     # Molex
     TYPE_MOLEX_MICRO_FIT_1X2 = 'molex-micro-fit-1x2'
     TYPE_MOLEX_MICRO_FIT_2X2 = 'molex-micro-fit-2x2'
-    TYPE_MOLEX_MICRO_FIT_2X3 = 'molex-micro-fit-2x3'
     TYPE_MOLEX_MICRO_FIT_2X4 = 'molex-micro-fit-2x4'
     # Direct current (DC)
     TYPE_DC = 'dc-terminal'
@@ -589,7 +588,6 @@ class PowerPortTypeChoices(ChoiceSet):
         ('Molex', (
             (TYPE_MOLEX_MICRO_FIT_1X2, 'Molex Micro-Fit 1x2'),
             (TYPE_MOLEX_MICRO_FIT_2X2, 'Molex Micro-Fit 2x2'),
-            (TYPE_MOLEX_MICRO_FIT_2X3, 'Molex Micro-Fit 2x3'),
             (TYPE_MOLEX_MICRO_FIT_2X4, 'Molex Micro-Fit 2x4'),
         )),
         ('DC', (
@@ -712,7 +710,6 @@ class PowerOutletTypeChoices(ChoiceSet):
     # Molex
     TYPE_MOLEX_MICRO_FIT_1X2 = 'molex-micro-fit-1x2'
     TYPE_MOLEX_MICRO_FIT_2X2 = 'molex-micro-fit-2x2'
-    TYPE_MOLEX_MICRO_FIT_2X3 = 'molex-micro-fit-2x3'
     TYPE_MOLEX_MICRO_FIT_2X4 = 'molex-micro-fit-2x4'
     # Direct current (DC)
     TYPE_DC = 'dc-terminal'
@@ -834,7 +831,6 @@ class PowerOutletTypeChoices(ChoiceSet):
         ('Molex', (
             (TYPE_MOLEX_MICRO_FIT_1X2, 'Molex Micro-Fit 1x2'),
             (TYPE_MOLEX_MICRO_FIT_2X2, 'Molex Micro-Fit 2x2'),
-            (TYPE_MOLEX_MICRO_FIT_2X3, 'Molex Micro-Fit 2x3'),
             (TYPE_MOLEX_MICRO_FIT_2X4, 'Molex Micro-Fit 2x4'),
         )),
         ('DC', (
@@ -893,118 +889,22 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_BRIDGE = 'bridge'
     TYPE_LAG = 'lag'
 
-    # FastEthernet
+    # Ethernet
     TYPE_100ME_FX = '100base-fx'
     TYPE_100ME_LFX = '100base-lfx'
-    TYPE_100ME_FIXED = '100base-tx'  # TODO: Rename to _TX
+    TYPE_100ME_FIXED = '100base-tx'
     TYPE_100ME_T1 = '100base-t1'
-
-    # GigabitEthernet
-    TYPE_1GE_BX10_D = '1000base-bx10-d'
-    TYPE_1GE_BX10_U = '1000base-bx10-u'
-    TYPE_1GE_CWDM = '1000base-cwdm'
-    TYPE_1GE_CX = '1000base-cx'
-    TYPE_1GE_DWDM = '1000base-dwdm'
-    TYPE_1GE_EX = '1000base-ex'
-    TYPE_1GE_SX_FIXED = '1000base-sx'  # TODO: Drop _FIXED suffix
-    TYPE_1GE_LSX = '1000base-lsx'
-    TYPE_1GE_LX_FIXED = '1000base-lx'  # TODO: Drop _FIXED suffix
-    TYPE_1GE_LX10 = '1000base-lx10'
-    TYPE_1GE_FIXED = '1000base-t'  # TODO: Rename to _T
-    TYPE_1GE_TX_FIXED = '1000base-tx'  # TODO: Drop _FIXED suffix
-    TYPE_1GE_ZX = '1000base-zx'
-
-    # 2.5/5 Gbps Ethernet
-    TYPE_2GE_FIXED = '2.5gbase-t'  # TODO: Rename to _T
-    TYPE_5GE_FIXED = '5gbase-t'  # TODO: Rename to _T
-
-    # 10 Gbps Ethernet
-    TYPE_10GE_BR_D = '10gbase-br-d'
-    TYPE_10GE_BR_U = '10gbase-br-u'
-    TYPE_10GE_CX4 = '10gbase-cx4'
-    TYPE_10GE_ER = '10gbase-er'
-    TYPE_10GE_LR = '10gbase-lr'
-    TYPE_10GE_LRM = '10gbase-lrm'
-    TYPE_10GE_LX4 = '10gbase-lx4'
-    TYPE_10GE_SR = '10gbase-sr'
-    TYPE_10GE_FIXED = '10gbase-t'
-    TYPE_10GE_ZR = '10gbase-zr'
-
-    # 25 Gbps Ethernet
-    TYPE_25GE_CR = '25gbase-cr'
-    TYPE_25GE_ER = '25gbase-er'
-    TYPE_25GE_LR = '25gbase-lr'
-    TYPE_25GE_SR = '25gbase-sr'
-    TYPE_25GE_T = '25gbase-t'
-
-    # 40 Gbps Ethernet
-    TYPE_40GE_CR4 = '40gbase-cr4'
-    TYPE_40GE_ER4 = '40gbase-er4'
-    TYPE_40GE_FR4 = '40gbase-fr4'
-    TYPE_40GE_LR4 = '40gbase-lr4'
-    TYPE_40GE_SR4 = '40gbase-sr4'
-
-    # 50 Gbps Ethernet
-    TYPE_50GE_CR = '50gbase-cr'
-    TYPE_50GE_ER = '50gbase-er'
-    TYPE_50GE_FR = '50gbase-fr'
-    TYPE_50GE_LR = '50gbase-lr'
-    TYPE_50GE_SR = '50gbase-sr'
-
-    # 100 Gbps Ethernet
-    TYPE_100GE_CR1 = '100gbase-cr1'
-    TYPE_100GE_CR2 = '100gbase-cr2'
-    TYPE_100GE_CR4 = '100gbase-cr4'
-    TYPE_100GE_CR10 = '100gbase-cr10'
-    TYPE_100GE_CWDM4 = '100gbase-cwdm4'
-    TYPE_100GE_DR = '100gbase-dr'
-    TYPE_100GE_FR1 = '100gbase-fr1'
-    TYPE_100GE_ER4 = '100gbase-er4'
-    TYPE_100GE_LR1 = '100gbase-lr1'
-    TYPE_100GE_LR4 = '100gbase-lr4'
-    TYPE_100GE_SR1 = '100gbase-sr1'
-    TYPE_100GE_SR1_2 = '100gbase-sr1.2'
-    TYPE_100GE_SR2 = '100gbase-sr2'
-    TYPE_100GE_SR4 = '100gbase-sr4'
-    TYPE_100GE_SR10 = '100gbase-sr10'
-    TYPE_100GE_ZR = '100gbase-zr'
-
-    # 200 Gbps Ethernet
-    TYPE_200GE_CR2 = '200gbase-cr2'
-    TYPE_200GE_CR4 = '200gbase-cr4'
-    TYPE_200GE_SR2 = '200gbase-sr2'
-    TYPE_200GE_SR4 = '200gbase-sr4'
-    TYPE_200GE_DR4 = '200gbase-dr4'
-    TYPE_200GE_FR4 = '200gbase-fr4'
-    TYPE_200GE_LR4 = '200gbase-lr4'
-    TYPE_200GE_ER4 = '200gbase-er4'
-    TYPE_200GE_VR2 = '200gbase-vr2'
-
-    # 400 Gbps Ethernet
-    TYPE_400GE_CR4 = '400gbase-cr4'
-    TYPE_400GE_DR4 = '400gbase-dr4'
-    TYPE_400GE_ER8 = '400gbase-er8'
-    TYPE_400GE_FR4 = '400gbase-fr4'
-    TYPE_400GE_FR8 = '400gbase-fr8'
-    TYPE_400GE_LR4 = '400gbase-lr4'
-    TYPE_400GE_LR8 = '400gbase-lr8'
-    TYPE_400GE_SR4 = '400gbase-sr4'
-    TYPE_400GE_SR4_2 = '400gbase-sr4_2'
-    TYPE_400GE_SR8 = '400gbase-sr8'
-    TYPE_400GE_SR16 = '400gbase-sr16'
-    TYPE_400GE_VR4 = '400gbase-vr4'
-    TYPE_400GE_ZR = '400gbase-zr'
-
-    # 800 Gbps Ethernet
-    TYPE_800GE_CR8 = '800gbase-cr8'
-    TYPE_800GE_DR8 = '800gbase-dr8'
-    TYPE_800GE_SR8 = '800gbase-sr8'
-    TYPE_800GE_VR8 = '800gbase-vr8'
-
-    # Ethernet (modular)
     TYPE_100ME_SFP = '100base-x-sfp'
+    TYPE_1GE_FIXED = '1000base-t'
+    TYPE_1GE_SX_FIXED = '1000base-sx'
+    TYPE_1GE_LX_FIXED = '1000base-lx'
+    TYPE_1GE_TX_FIXED = '1000base-tx'
     TYPE_1GE_GBIC = '1000base-x-gbic'
     TYPE_1GE_SFP = '1000base-x-sfp'
+    TYPE_2GE_FIXED = '2.5gbase-t'
+    TYPE_5GE_FIXED = '5gbase-t'
+    TYPE_10GE_FIXED = '10gbase-t'
+    TYPE_10GE_CX4 = '10gbase-cx4'
     TYPE_10GE_SFP_PLUS = '10gbase-x-sfpp'
     TYPE_10GE_XFP = '10gbase-x-xfp'
     TYPE_10GE_XENPAK = '10gbase-x-xenpak'
@@ -1035,7 +935,7 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_800GE_QSFP_DD = '800gbase-x-qsfpdd'
     TYPE_800GE_OSFP = '800gbase-x-osfp'
 
-    # Backplane Ethernet
+    # Ethernet Backplane
     TYPE_1GE_KX = '1000base-kx'
     TYPE_2GE_KX = '2.5gbase-kx'
     TYPE_5GE_KR = '5gbase-kr'
@@ -1154,185 +1054,61 @@ class InterfaceTypeChoices(ChoiceSet):
             ),
         ),
         (
-            _('FastEthernet (100 Mbps)'),
+            _('Ethernet (fixed)'),
             (
-                (TYPE_100ME_FX, '100BASE-FX (10/100ME)'),
-                (TYPE_100ME_LFX, '100BASE-LFX (10/100ME)'),
+                (TYPE_100ME_FX, '100BASE-FX (10/100ME FIBER)'),
+                (TYPE_100ME_LFX, '100BASE-LFX (10/100ME FIBER)'),
                 (TYPE_100ME_FIXED, '100BASE-TX (10/100ME)'),
-                (TYPE_100ME_T1, '100BASE-T1 (10/100ME)'),
-            ),
-        ),
-        (
-            _('GigabitEthernet (1 Gbps)'),
-            (
-                (TYPE_1GE_BX10_D, '1000BASE-BX10-D (1GE BiDi Down)'),
-                (TYPE_1GE_BX10_U, '1000BASE-BX10-U (1GE BiDi Up)'),
-                (TYPE_1GE_CWDM, '1000BASE-CWDM (1GE)'),
-                (TYPE_1GE_CX, '1000BASE-CX (1GE DAC)'),
-                (TYPE_1GE_DWDM, '1000BASE-DWDM (1GE)'),
-                (TYPE_1GE_EX, '1000BASE-EX (1GE)'),
-                (TYPE_1GE_LSX, '1000BASE-LSX (1GE)'),
-                (TYPE_1GE_LX_FIXED, '1000BASE-LX (1GE)'),
-                (TYPE_1GE_LX10, '1000BASE-LX10/LH (1GE)'),
-                (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE)'),
+                (TYPE_100ME_T1, '100BASE-T1 (10/100ME Single Pair)'),
                 (TYPE_1GE_FIXED, '1000BASE-T (1GE)'),
+                (TYPE_1GE_SX_FIXED, '1000BASE-SX (1GE)'),
+                (TYPE_1GE_LX_FIXED, '1000BASE-LX (1GE)'),
                 (TYPE_1GE_TX_FIXED, '1000BASE-TX (1GE)'),
-                (TYPE_1GE_ZX, '1000BASE-ZX (1GE)'),
-            ),
-        ),
-        (
-            _('2.5/5 Gbps Ethernet'),
-            (
                 (TYPE_2GE_FIXED, '2.5GBASE-T (2.5GE)'),
                 (TYPE_5GE_FIXED, '5GBASE-T (5GE)'),
-            ),
-        ),
-        (
-            _('10 Gbps Ethernet'),
-            (
-                (TYPE_10GE_BR_D, '10GBASE-BR-D (10GE BiDi Down)'),
-                (TYPE_10GE_BR_U, '10GBASE-BR-U (10GE BiDi Up)'),
-                (TYPE_10GE_CX4, '10GBASE-CX4 (10GE DAC)'),
-                (TYPE_10GE_ER, '10GBASE-ER (10GE)'),
-                (TYPE_10GE_LR, '10GBASE-LR (10GE)'),
-                (TYPE_10GE_LRM, '10GBASE-LRM (10GE)'),
-                (TYPE_10GE_LX4, '10GBASE-LX4 (10GE)'),
-                (TYPE_10GE_SR, '10GBASE-SR (10GE)'),
                 (TYPE_10GE_FIXED, '10GBASE-T (10GE)'),
-                (TYPE_10GE_ZR, '10GBASE-ZR (10GE)'),
+                (TYPE_10GE_CX4, '10GBASE-CX4 (10GE)'),
             )
         ),
         (
-            _('25 Gbps Ethernet'),
-            (
-                (TYPE_25GE_CR, '25GBASE-CR (25GE DAC)'),
-                (TYPE_25GE_ER, '25GBASE-ER (25GE)'),
-                (TYPE_25GE_LR, '25GBASE-LR (25GE)'),
-                (TYPE_25GE_SR, '25GBASE-SR (25GE)'),
-                (TYPE_25GE_T, '25GBASE-T (25GE)'),
-            )
-        ),
-        (
-            _('40 Gbps Ethernet'),
-            (
-                (TYPE_40GE_CR4, '40GBASE-CR4 (40GE DAC)'),
-                (TYPE_40GE_ER4, '40GBASE-ER4 (40GE)'),
-                (TYPE_40GE_FR4, '40GBASE-FR4 (40GE)'),
-                (TYPE_40GE_LR4, '40GBASE-LR4 (40GE)'),
-                (TYPE_40GE_SR4, '40GBASE-SR4 (40GE)'),
-            )
-        ),
-        (
-            _('50 Gbps Ethernet'),
-            (
-                (TYPE_50GE_CR, '50GBASE-CR (50GE DAC)'),
-                (TYPE_50GE_ER, '50GBASE-ER (50GE)'),
-                (TYPE_50GE_FR, '50GBASE-FR (50GE)'),
-                (TYPE_50GE_LR, '50GBASE-LR (50GE)'),
-                (TYPE_50GE_SR, '50GBASE-SR (50GE)'),
-            )
-        ),
-        (
-            _('100 Gbps Ethernet'),
-            (
-                (TYPE_100GE_CR1, '100GBASE-CR1 (100GE DAC)'),
-                (TYPE_100GE_CR2, '100GBASE-CR2 (100GE DAC)'),
-                (TYPE_100GE_CR4, '100GBASE-CR4 (100GE DAC)'),
-                (TYPE_100GE_CR10, '100GBASE-CR10 (100GE DAC)'),
-                (TYPE_100GE_CWDM4, '100GBASE-CWDM4 (100GE)'),
-                (TYPE_100GE_DR, '100GBASE-DR (100GE)'),
-                (TYPE_100GE_ER4, '100GBASE-ER4 (100GE)'),
-                (TYPE_100GE_FR1, '100GBASE-FR1 (100GE)'),
-                (TYPE_100GE_LR1, '100GBASE-LR1 (100GE)'),
-                (TYPE_100GE_LR4, '100GBASE-LR4 (100GE)'),
-                (TYPE_100GE_SR1, '100GBASE-SR1 (100GE)'),
-                (TYPE_100GE_SR1_2, '100GBASE-SR1.2 (100GE BiDi)'),
-                (TYPE_100GE_SR2, '100GBASE-SR2 (100GE)'),
-                (TYPE_100GE_SR4, '100GBASE-SR4 (100GE)'),
-                (TYPE_100GE_SR10, '100GBASE-SR10 (100GE)'),
-                (TYPE_100GE_ZR, '100GBASE-ZR (100GE)'),
-            )
-        ),
-        (
-            _('200 Gbps Ethernet'),
-            (
-                (TYPE_200GE_CR2, '200GBASE-CR2 (200GE)'),
-                (TYPE_200GE_CR4, '200GBASE-CR4 (200GE)'),
-                (TYPE_200GE_DR4, '200GBASE-DR4 (200GE)'),
-                (TYPE_200GE_ER4, '200GBASE-ER4 (200GE)'),
-                (TYPE_200GE_FR4, '200GBASE-FR4 (200GE)'),
-                (TYPE_200GE_LR4, '200GBASE-LR4 (200GE)'),
-                (TYPE_200GE_SR2, '200GBASE-SR2 (200GE)'),
-                (TYPE_200GE_SR4, '200GBASE-SR4 (200GE)'),
-                (TYPE_200GE_VR2, '200GBASE-VR2 (200GE)'),
-            )
-        ),
-        (
-            _('400 Gbps Ethernet'),
-            (
-                (TYPE_400GE_CR4, '400GBASE-CR4 (400GE)'),
-                (TYPE_400GE_DR4, '400GBASE-DR4 (400GE)'),
-                (TYPE_400GE_ER8, '400GBASE-ER8 (400GE)'),
-                (TYPE_400GE_FR4, '400GBASE-FR4 (400GE)'),
-                (TYPE_400GE_FR8, '400GBASE-FR8 (400GE)'),
-                (TYPE_400GE_LR4, '400GBASE-LR4 (400GE)'),
-                (TYPE_400GE_LR8, '400GBASE-LR8 (400GE)'),
-                (TYPE_400GE_SR4, '400GBASE-SR4 (400GE)'),
-                (TYPE_400GE_SR4_2, '400GBASE-SR4.2 (400GE BiDi)'),
-                (TYPE_400GE_SR8, '400GBASE-SR8 (400GE)'),
-                (TYPE_400GE_SR16, '400GBASE-SR16 (400GE)'),
-                (TYPE_400GE_VR4, '400GBASE-VR4 (400GE)'),
-                (TYPE_400GE_ZR, '400GBASE-ZR (400GE)'),
-            )
-        ),
-        (
-            _('800 Gbps Ethernet'),
-            (
-                (TYPE_800GE_CR8, '800GBASE-CR8 (800GE)'),
-                (TYPE_800GE_DR8, '800GBASE-DR8 (800GE)'),
-                (TYPE_800GE_SR8, '800GBASE-SR8 (800GE)'),
-                (TYPE_800GE_VR8, '800GBASE-VR8 (800GE)'),
-            )
-        ),
-        (
-            _('Pluggable transceivers'),
+            _('Ethernet (modular)'),
             (
                 (TYPE_100ME_SFP, 'SFP (100ME)'),
                 (TYPE_1GE_GBIC, 'GBIC (1GE)'),
                 (TYPE_1GE_SFP, 'SFP (1GE)'),
                 (TYPE_10GE_SFP_PLUS, 'SFP+ (10GE)'),
-                (TYPE_10GE_XENPAK, 'XENPAK (10GE)'),
                 (TYPE_10GE_XFP, 'XFP (10GE)'),
+                (TYPE_10GE_XENPAK, 'XENPAK (10GE)'),
                 (TYPE_10GE_X2, 'X2 (10GE)'),
                 (TYPE_25GE_SFP28, 'SFP28 (25GE)'),
+                (TYPE_50GE_SFP56, 'SFP56 (50GE)'),
                 (TYPE_40GE_QSFP_PLUS, 'QSFP+ (40GE)'),
                 (TYPE_50GE_QSFP28, 'QSFP28 (50GE)'),
-                (TYPE_50GE_SFP56, 'SFP56 (50GE)'),
                 (TYPE_100GE_CFP, 'CFP (100GE)'),
                 (TYPE_100GE_CFP2, 'CFP2 (100GE)'),
+                (TYPE_200GE_CFP2, 'CFP2 (200GE)'),
+                (TYPE_400GE_CFP2, 'CFP2 (400GE)'),
                 (TYPE_100GE_CFP4, 'CFP4 (100GE)'),
                 (TYPE_100GE_CXP, 'CXP (100GE)'),
                 (TYPE_100GE_CPAK, 'Cisco CPAK (100GE)'),
                 (TYPE_100GE_DSFP, 'DSFP (100GE)'),
+                (TYPE_100GE_SFP_DD, 'SFP-DD (100GE)'),
                 (TYPE_100GE_QSFP28, 'QSFP28 (100GE)'),
                 (TYPE_100GE_QSFP_DD, 'QSFP-DD (100GE)'),
-                (TYPE_100GE_SFP_DD, 'SFP-DD (100GE)'),
-                (TYPE_200GE_CFP2, 'CFP2 (200GE)'),
                 (TYPE_200GE_QSFP56, 'QSFP56 (200GE)'),
                 (TYPE_200GE_QSFP_DD, 'QSFP-DD (200GE)'),
                 (TYPE_400GE_QSFP112, 'QSFP112 (400GE)'),
                 (TYPE_400GE_QSFP_DD, 'QSFP-DD (400GE)'),
-                (TYPE_400GE_CDFP, 'CDFP (400GE)'),
-                (TYPE_400GE_CFP2, 'CFP2 (400GE)'),
-                (TYPE_400GE_CFP8, 'CPF8 (400GE)'),
                 (TYPE_400GE_OSFP, 'OSFP (400GE)'),
                 (TYPE_400GE_OSFP_RHS, 'OSFP-RHS (400GE)'),
-                (TYPE_800GE_OSFP, 'OSFP (800GE)'),
+                (TYPE_400GE_CDFP, 'CDFP (400GE)'),
+                (TYPE_400GE_CFP8, 'CPF8 (400GE)'),
                 (TYPE_800GE_QSFP_DD, 'QSFP-DD (800GE)'),
+                (TYPE_800GE_OSFP, 'OSFP (800GE)'),
             )
         ),
         (
-            _('Backplane Ethernet'),
+            _('Ethernet (backplane)'),
             (
                 (TYPE_1GE_KX, '1000BASE-KX (1GE)'),
                 (TYPE_2GE_KX, '2.5GBASE-KX (2.5GE)'),
@@ -1352,12 +1128,12 @@ class InterfaceTypeChoices(ChoiceSet):
             (
                 (TYPE_80211A, 'IEEE 802.11a'),
                 (TYPE_80211G, 'IEEE 802.11b/g'),
-                (TYPE_80211N, 'IEEE 802.11n (Wi-Fi 4)'),
-                (TYPE_80211AC, 'IEEE 802.11ac (Wi-Fi 5)'),
-                (TYPE_80211AD, 'IEEE 802.11ad (WiGig)'),
-                (TYPE_80211AX, 'IEEE 802.11ax (Wi-Fi 6)'),
-                (TYPE_80211AY, 'IEEE 802.11ay (WiGig)'),
-                (TYPE_80211BE, 'IEEE 802.11be (Wi-Fi 7)'),
+                (TYPE_80211N, 'IEEE 802.11n'),
+                (TYPE_80211AC, 'IEEE 802.11ac'),
+                (TYPE_80211AD, 'IEEE 802.11ad'),
+                (TYPE_80211AX, 'IEEE 802.11ax'),
+                (TYPE_80211AY, 'IEEE 802.11ay'),
+                (TYPE_80211BE, 'IEEE 802.11be'),
                 (TYPE_802151, 'IEEE 802.15.1 (Bluetooth)'),
                 (TYPE_802154, 'IEEE 802.15.4 (LR-WPAN)'),
                 (TYPE_OTHER_WIRELESS, 'Other (Wireless)'),
@@ -1721,9 +1497,8 @@ class PortTypeChoices(ChoiceSet):
 # Cables/links
 #
 
-
 class CableTypeChoices(ChoiceSet):
-    # Copper - Twisted Pair (UTP/STP)
+
     TYPE_CAT3 = 'cat3'
     TYPE_CAT5 = 'cat5'
     TYPE_CAT5E = 'cat5e'
@@ -1732,50 +1507,26 @@ class CableTypeChoices(ChoiceSet):
     TYPE_CAT7 = 'cat7'
     TYPE_CAT7A = 'cat7a'
     TYPE_CAT8 = 'cat8'
-    TYPE_MRJ21_TRUNK = 'mrj21-trunk'
-
-    # Copper - Twinax (DAC)
     TYPE_DAC_ACTIVE = 'dac-active'
     TYPE_DAC_PASSIVE = 'dac-passive'
-
-    # Copper - Coaxial
+    TYPE_MRJ21_TRUNK = 'mrj21-trunk'
     TYPE_COAXIAL = 'coaxial'
-    TYPE_RG_6 = 'rg-6'
-    TYPE_RG_8 = 'rg-8'
-    TYPE_RG_11 = 'rg-11'
-    TYPE_RG_59 = 'rg-59'
-    TYPE_RG_62 = 'rg-62'
-    TYPE_RG_213 = 'rg-213'
-    TYPE_LMR_100 = 'lmr-100'
-    TYPE_LMR_200 = 'lmr-200'
-    TYPE_LMR_400 = 'lmr-400'
-
-    # Fiber Optic - Multimode
     TYPE_MMF = 'mmf'
     TYPE_MMF_OM1 = 'mmf-om1'
     TYPE_MMF_OM2 = 'mmf-om2'
     TYPE_MMF_OM3 = 'mmf-om3'
     TYPE_MMF_OM4 = 'mmf-om4'
     TYPE_MMF_OM5 = 'mmf-om5'
-
-    # Fiber Optic - Single-mode
     TYPE_SMF = 'smf'
     TYPE_SMF_OS1 = 'smf-os1'
     TYPE_SMF_OS2 = 'smf-os2'
-
-    # Fiber Optic - Other
     TYPE_AOC = 'aoc'
-
-    # Power
     TYPE_POWER = 'power'
-
-    # USB
     TYPE_USB = 'usb'
 
     CHOICES = (
         (
-            _('Copper - Twisted Pair (UTP/STP)'),
-            (
+            _('Copper'), (
                 (TYPE_CAT3, 'CAT3'),
                 (TYPE_CAT5, 'CAT5'),
                 (TYPE_CAT5E, 'CAT5e'),
@@ -1784,66 +1535,28 @@ class CableTypeChoices(ChoiceSet):
                 (TYPE_CAT7, 'CAT7'),
                 (TYPE_CAT7A, 'CAT7a'),
                 (TYPE_CAT8, 'CAT8'),
-                (TYPE_MRJ21_TRUNK, 'MRJ21 Trunk'),
-            ),
-        ),
-        (
-            _('Copper - Twinax (DAC)'),
-            (
                 (TYPE_DAC_ACTIVE, 'Direct Attach Copper (Active)'),
                 (TYPE_DAC_PASSIVE, 'Direct Attach Copper (Passive)'),
-            ),
-        ),
-        (
-            _('Copper - Coaxial'),
-            (
+                (TYPE_MRJ21_TRUNK, 'MRJ21 Trunk'),
                 (TYPE_COAXIAL, 'Coaxial'),
-                (TYPE_RG_6, 'RG-6'),
-                (TYPE_RG_8, 'RG-8'),
-                (TYPE_RG_11, 'RG-11'),
-                (TYPE_RG_59, 'RG-59'),
-                (TYPE_RG_62, 'RG-62'),
-                (TYPE_RG_213, 'RG-213'),
-                (TYPE_LMR_100, 'LMR-100'),
-                (TYPE_LMR_200, 'LMR-200'),
-                (TYPE_LMR_400, 'LMR-400'),
             ),
         ),
         (
-            _('Fiber - Multimode'),
-            (
+            _('Fiber'), (
                 (TYPE_MMF, 'Multimode Fiber'),
                 (TYPE_MMF_OM1, 'Multimode Fiber (OM1)'),
                 (TYPE_MMF_OM2, 'Multimode Fiber (OM2)'),
                 (TYPE_MMF_OM3, 'Multimode Fiber (OM3)'),
                 (TYPE_MMF_OM4, 'Multimode Fiber (OM4)'),
                 (TYPE_MMF_OM5, 'Multimode Fiber (OM5)'),
+                (TYPE_SMF, 'Singlemode Fiber'),
+                (TYPE_SMF_OS1, 'Singlemode Fiber (OS1)'),
+                (TYPE_SMF_OS2, 'Singlemode Fiber (OS2)'),
+                (TYPE_AOC, 'Active Optical Cabling (AOC)'),
             ),
         ),
-        (
-            _('Fiber - Single-mode'),
-            (
-                (TYPE_SMF, 'Single-mode Fiber'),
-                (TYPE_SMF_OS1, 'Single-mode Fiber (OS1)'),
-                (TYPE_SMF_OS2, 'Single-mode Fiber (OS2)'),
-            ),
-        ),
-        (
-            _('Fiber - Other'),
-            ((TYPE_AOC, 'Active Optical Cabling (AOC)'),),
-        ),
-        (
-            _('Power'),
-            (
-                (TYPE_POWER, 'Power'),
-            ),
-        ),
-        (
-            _('USB'),
-            (
-                (TYPE_USB, 'USB'),
-            ),
-        ),
+        (TYPE_USB, _('USB')),
+        (TYPE_POWER, _('Power')),
     )
 
 

netbox/dcim/fields.py

@@ -26,7 +26,7 @@ class eui64_unix_expanded_uppercase(eui64_unix_expanded):
 #
 
 class MACAddressField(models.Field):
-    description = 'PostgreSQL MAC Address field'
+    description = "PostgreSQL MAC Address field"
 
     def python_type(self):
         return EUI
@@ -34,9 +34,6 @@ class MACAddressField(models.Field):
     def from_db_value(self, value, expression, connection):
         return self.to_python(value)
 
-    def get_internal_type(self):
-        return 'CharField'
-
     def to_python(self, value):
         if value is None:
             return value
@@ -57,7 +54,7 @@ class MACAddressField(models.Field):
 
 
 class WWNField(models.Field):
-    description = 'World Wide Name field'
+    description = "World Wide Name field"
 
     def python_type(self):
         return EUI
@@ -65,9 +62,6 @@ class WWNField(models.Field):
     def from_db_value(self, value, expression, connection):
         return self.to_python(value)
 
-    def get_internal_type(self):
-        return 'CharField'
-
     def to_python(self, value):
         if value is None:
             return value

netbox/dcim/filtersets.py

@@ -14,16 +14,16 @@ from netbox.filtersets import (
     AttributeFiltersMixin, BaseFilterSet, ChangeLoggedModelFilterSet, NestedGroupModelFilterSet, NetBoxModelFilterSet,
     OrganizationalModelFilterSet,
 )
-from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
+from tenancy.filtersets import TenancyFilterSet, ContactModelFilterSet
 from tenancy.models import *
 from users.models import User
 from utilities.filters import (
     ContentTypeFilter, MultiValueCharFilter, MultiValueMACAddressFilter, MultiValueNumberFilter, MultiValueWWNFilter,
     NumericArrayFilter, TreeNodeMultipleChoiceFilter,
 )
-from virtualization.models import Cluster, ClusterGroup, VirtualMachine, VMInterface
+from virtualization.models import Cluster, ClusterGroup, VMInterface, VirtualMachine
 from vpn.models import L2VPN
-from wireless.choices import WirelessChannelChoices, WirelessRoleChoices
+from wireless.choices import WirelessRoleChoices, WirelessChannelChoices
 from wireless.models import WirelessLAN, WirelessLink
 from .choices import *
 from .constants import *
@@ -875,7 +875,7 @@ class FrontPortTemplateFilterSet(ChangeLoggedModelFilterSet, ModularDeviceTypeCo
         null_value=None
     )
     rear_port_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RearPortTemplate.objects.all()
+        queryset=RearPort.objects.all()
     )
 
     class Meta:
@@ -1288,6 +1288,7 @@ class DeviceFilterSet(
             Q(name__icontains=value) |
             Q(virtual_chassis__name__icontains=value) |
             Q(serial__icontains=value.strip()) |
+            Q(inventoryitems__serial__icontains=value.strip()) |
             Q(asset_tag__icontains=value.strip()) |
             Q(description__icontains=value.strip()) |
             Q(comments__icontains=value) |
@@ -1626,17 +1627,6 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
         choices=DeviceStatusChoices,
         field_name='device__status',
     )
-    tenant_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='device__tenant',
-        queryset=Tenant.objects.all(),
-        label=_('Tenant (ID)'),
-    )
-    tenant = django_filters.ModelMultipleChoiceFilter(
-        field_name='device__tenant__slug',
-        queryset=Tenant.objects.all(),
-        to_field_name='slug',
-        label=_('Tenant (slug)'),
-    )
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -1774,7 +1764,6 @@ class PowerOutletFilterSet(
 
 class MACAddressFilterSet(NetBoxModelFilterSet):
     mac_address = MultiValueMACAddressFilter()
-    assigned_object_type = ContentTypeFilter()
     device = MultiValueCharFilter(
         method='filter_device',
         field_name='name',
@@ -1817,14 +1806,6 @@ class MACAddressFilterSet(NetBoxModelFilterSet):
         queryset=VMInterface.objects.all(),
         label=_('VM interface (ID)'),
     )
-    assigned = django_filters.BooleanFilter(
-        method='filter_assigned',
-        label=_('Is assigned'),
-    )
-    primary = django_filters.BooleanFilter(
-        method='filter_primary',
-        label=_('Is primary'),
-    )
 
     class Meta:
         model = MACAddress
@@ -1861,29 +1842,6 @@ class MACAddressFilterSet(NetBoxModelFilterSet):
             vminterface__in=interface_ids
         )
 
-    def filter_assigned(self, queryset, name, value):
-        params = {
-            'assigned_object_type__isnull': True,
-            'assigned_object_id__isnull': True,
-        }
-        if value:
-            return queryset.exclude(**params)
-        else:
-            return queryset.filter(**params)
-
-    def filter_primary(self, queryset, name, value):
-        interface_mac_ids = Interface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        vminterface_mac_ids = VMInterface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        query = Q(pk__in=interface_mac_ids) | Q(pk__in=vminterface_mac_ids)
-        if value:
-            return queryset.filter(query)
-        else:
-            return queryset.exclude(query)
-
 
 class CommonInterfaceFilterSet(django_filters.FilterSet):
     mode = django_filters.MultipleChoiceFilter(

netbox/dcim/forms/bulk_edit.py

@@ -133,11 +133,6 @@ class SiteBulkEditForm(NetBoxModelBulkEditForm):
         queryset=Tenant.objects.all(),
         required=False
     )
-    facility = forms.CharField(
-        label=_('Facility'),
-        max_length=50,
-        required=False
-    )
     asns = DynamicModelMultipleChoiceField(
         queryset=ASN.objects.all(),
         label=_('ASNs'),
@@ -171,10 +166,10 @@ class SiteBulkEditForm(NetBoxModelBulkEditForm):
 
     model = Site
     fieldsets = (
-        FieldSet('status', 'region', 'group', 'tenant', 'facility', 'asns', 'time_zone', 'description'),
+        FieldSet('status', 'region', 'group', 'tenant', 'asns', 'time_zone', 'description'),
     )
     nullable_fields = (
-        'region', 'group', 'tenant', 'facility', 'asns', 'time_zone', 'description', 'comments',
+        'region', 'group', 'tenant', 'asns', 'time_zone', 'description', 'comments',
     )
 
 
@@ -203,11 +198,6 @@ class LocationBulkEditForm(NetBoxModelBulkEditForm):
         queryset=Tenant.objects.all(),
         required=False
     )
-    facility = forms.CharField(
-        label=_('Facility'),
-        max_length=50,
-        required=False
-    )
     description = forms.CharField(
         label=_('Description'),
         max_length=200,
@@ -217,9 +207,9 @@ class LocationBulkEditForm(NetBoxModelBulkEditForm):
 
     model = Location
     fieldsets = (
-        FieldSet('site', 'parent', 'status', 'tenant', 'facility', 'description'),
+        FieldSet('site', 'parent', 'status', 'tenant', 'description'),
     )
-    nullable_fields = ('parent', 'tenant', 'facility', 'description', 'comments')
+    nullable_fields = ('parent', 'tenant', 'description', 'comments')
 
 
 class RackRoleBulkEditForm(NetBoxModelBulkEditForm):

netbox/dcim/forms/bulk_import.py

@@ -9,8 +9,7 @@ from dcim.choices import *
 from dcim.constants import *
 from dcim.models import *
 from extras.models import ConfigTemplate
-from ipam.choices import VLANQinQRoleChoices
-from ipam.models import VLAN, VRF, IPAddress, VLANGroup
+from ipam.models import VRF, IPAddress
 from netbox.choices import *
 from netbox.forms import NetBoxModelImportForm
 from tenancy.models import Tenant
@@ -18,7 +17,7 @@ from utilities.forms.fields import (
     CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVModelMultipleChoiceField, CSVTypedChoiceField,
     SlugField,
 )
-from virtualization.models import Cluster, VirtualMachine, VMInterface
+from virtualization.models import Cluster, VMInterface, VirtualMachine
 from wireless.choices import WirelessRoleChoices
 from .common import ModuleCommonForm
 
@@ -472,30 +471,14 @@ class ModuleTypeImportForm(NetBoxModelImportForm):
         required=False,
         help_text=_('Unit for module weight')
     )
-    attribute_data = forms.JSONField(
-        label=_('Attributes'),
-        required=False,
-        help_text=_('Attribute values for the assigned profile, passed as a dictionary')
-    )
 
     class Meta:
         model = ModuleType
         fields = [
             'manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit', 'profile',
-            'attribute_data', 'comments', 'tags',
+            'comments', 'tags'
         ]
 
-    def clean(self):
-        super().clean()
-
-        # Attribute data may be included only if a profile is specified
-        if self.cleaned_data.get('attribute_data') and not self.cleaned_data.get('profile'):
-            raise forms.ValidationError(_("Profile must be specified if attribute data is provided."))
-
-        # Default attribute_data to an empty dictionary if a profile is specified (to enforce schema validation)
-        if self.cleaned_data.get('profile') and not self.cleaned_data.get('attribute_data'):
-            self.cleaned_data['attribute_data'] = {}
-
 
 class DeviceRoleImportForm(NetBoxModelImportForm):
     parent = CSVModelChoiceField(
@@ -955,7 +938,7 @@ class InterfaceImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name='name',
         help_text=mark_safe(
-            _('VDC names separated by commas, encased with double quotes. Example:') + ' <code>"vdc1,vdc2,vdc3"</code>'
+            _('VDC names separated by commas, encased with double quotes. Example:') + ' <code>vdc1,vdc2,vdc3</code>'
         )
     )
     type = CSVChoiceField(
@@ -984,41 +967,7 @@ class InterfaceImportForm(NetBoxModelImportForm):
         label=_('Mode'),
         choices=InterfaceModeChoices,
         required=False,
-        help_text=_('IEEE 802.1Q operational mode (for L2 interfaces)'),
-    )
-    vlan_group = CSVModelChoiceField(
-        label=_('VLAN group'),
-        queryset=VLANGroup.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text=_('Filter VLANs available for assignment by group'),
-    )
-    untagged_vlan = CSVModelChoiceField(
-        label=_('Untagged VLAN'),
-        queryset=VLAN.objects.all(),
-        required=False,
-        to_field_name='vid',
-        help_text=_('Assigned untagged VLAN ID (filtered by VLAN group)'),
-    )
-    tagged_vlans = CSVModelMultipleChoiceField(
-        label=_('Tagged VLANs'),
-        queryset=VLAN.objects.all(),
-        required=False,
-        to_field_name='vid',
-        help_text=mark_safe(
-            _(
-                'Assigned tagged VLAN IDs separated by commas, encased with double quotes '
-                '(filtered by VLAN group). Example:'
-            )
-            + ' <code>"100,200,300"</code>'
-        ),
-    )
-    qinq_svlan = CSVModelChoiceField(
-        label=_('Q-in-Q Service VLAN'),
-        queryset=VLAN.objects.filter(qinq_role=VLANQinQRoleChoices.ROLE_SERVICE),
-        required=False,
-        to_field_name='vid',
-        help_text=_('Assigned Q-in-Q Service VLAN ID (filtered by VLAN group)'),
+        help_text=_('IEEE 802.1Q operational mode (for L2 interfaces)')
     )
     vrf = CSVModelChoiceField(
         label=_('VRF'),
@@ -1039,8 +988,7 @@ class InterfaceImportForm(NetBoxModelImportForm):
         fields = (
             'device', 'name', 'label', 'parent', 'bridge', 'lag', 'type', 'speed', 'duplex', 'enabled',
             'mark_connected', 'wwn', 'vdcs', 'mtu', 'mgmt_only', 'description', 'poe_mode', 'poe_type', 'mode',
-            'vlan_group', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vrf', 'rf_role', 'rf_channel',
-            'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'tags'
+            'vrf', 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'tags'
         )
 
     def __init__(self, data=None, *args, **kwargs):
@@ -1057,13 +1005,6 @@ class InterfaceImportForm(NetBoxModelImportForm):
                 self.fields['lag'].queryset = self.fields['lag'].queryset.filter(**params)
                 self.fields['vdcs'].queryset = self.fields['vdcs'].queryset.filter(**params)
 
-            # Limit choices for VLANs to the assigned VLAN group
-            if vlan_group := data.get('vlan_group'):
-                params = {f"group__{self.fields['vlan_group'].to_field_name}": vlan_group}
-                self.fields['untagged_vlan'].queryset = self.fields['untagged_vlan'].queryset.filter(**params)
-                self.fields['tagged_vlans'].queryset = self.fields['tagged_vlans'].queryset.filter(**params)
-                self.fields['qinq_svlan'].queryset = self.fields['qinq_svlan'].queryset.filter(**params)
-
     def clean_enabled(self):
         # Make sure enabled is True when it's not included in the uploaded data
         if 'enabled' not in self.data:
@@ -1240,7 +1181,7 @@ class InventoryItemImportForm(NetBoxModelImportForm):
         help_text=_('Component Type')
     )
     component_name = forms.CharField(
-        label=_('Component name'),
+        label=_('Compnent name'),
         required=False,
         help_text=_('Component Name')
     )

netbox/dcim/forms/filtersets.py

@@ -10,7 +10,6 @@ from ipam.models import ASN, VRF, VLANTranslationPolicy
 from netbox.choices import *
 from netbox.forms import NetBoxModelFilterSetForm
 from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
-from tenancy.models import Tenant
 from users.models import User
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
 from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField
@@ -121,11 +120,6 @@ class DeviceComponentFilterForm(NetBoxModelFilterSetForm):
         required=False,
         label=_('Device role')
     )
-    tenant_id = DynamicModelMultipleChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-        label=_('Tenant')
-    )
     device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
@@ -134,8 +128,7 @@ class DeviceComponentFilterForm(NetBoxModelFilterSetForm):
             'location_id': '$location_id',
             'virtual_chassis_id': '$virtual_chassis_id',
             'device_type_id': '$device_type_id',
-            'role_id': '$role_id',
-            'tenant_id': '$tenant_id'
+            'role_id': '$role_id'
         },
         label=_('Device')
     )
@@ -285,6 +278,11 @@ class RackBaseFilterForm(NetBoxModelFilterSetForm):
             choices=BOOLEAN_WITH_BLANK_CHOICES
         )
     )
+    airflow = forms.MultipleChoiceField(
+        label=_('Airflow'),
+        choices=add_blank_choice(RackAirflowChoices),
+        required=False
+    )
     weight = forms.DecimalField(
         label=_('Weight'),
         required=False,
@@ -383,11 +381,6 @@ class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, RackBaseFilterFo
         },
         label=_('Rack type')
     )
-    airflow = forms.MultipleChoiceField(
-        label=_('Airflow'),
-        choices=add_blank_choice(RackAirflowChoices),
-        required=False
-    )
     serial = forms.CharField(
         label=_('Serial'),
         required=False
@@ -1324,8 +1317,7 @@ class ConsolePortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
         FieldSet('name', 'label', 'type', 'speed', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
-            name=_('Device')
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id', name=_('Device')
         ),
         FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
     )
@@ -1349,7 +1341,7 @@ class ConsoleServerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterF
         FieldSet('name', 'label', 'type', 'speed', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
             name=_('Device')
         ),
         FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
@@ -1374,8 +1366,7 @@ class PowerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
         FieldSet('name', 'label', 'type', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
-            name=_('Device')
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id', name=_('Device')
         ),
         FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
     )
@@ -1394,7 +1385,7 @@ class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
         FieldSet('name', 'label', 'type', 'color', 'status', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
             name=_('Device')
         ),
         FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
@@ -1427,8 +1418,7 @@ class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
         FieldSet('rf_role', 'rf_channel', 'rf_channel_width', 'tx_power', name=_('Wireless')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
-            'vdc_id',
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id', 'vdc_id',
             name=_('Device')
         ),
         FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
@@ -1549,8 +1539,7 @@ class FrontPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
         FieldSet('name', 'label', 'type', 'color', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
-            name=_('Device')
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id', name=_('Device')
         ),
         FieldSet('cabled', 'occupied', name=_('Cable')),
     )
@@ -1574,7 +1563,7 @@ class RearPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
         FieldSet('name', 'label', 'type', 'color', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
             name=_('Device')
         ),
         FieldSet('cabled', 'occupied', name=_('Cable')),
@@ -1598,7 +1587,7 @@ class ModuleBayFilterForm(DeviceComponentFilterForm):
         FieldSet('name', 'label', 'position', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
             name=_('Device')
         ),
     )
@@ -1616,7 +1605,7 @@ class DeviceBayFilterForm(DeviceComponentFilterForm):
         FieldSet('name', 'label', name=_('Attributes')),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
             name=_('Device')
         ),
     )
@@ -1633,7 +1622,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
         ),
         FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
         FieldSet(
-            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
+            'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
             name=_('Device')
         ),
     )
@@ -1687,16 +1676,12 @@ class MACAddressFilterForm(NetBoxModelFilterSetForm):
     model = MACAddress
     fieldsets = (
         FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('mac_address', name=_('Attributes')),
-        FieldSet(
-            'device_id', 'virtual_machine_id', 'assigned', 'primary',
-            name=_('Assignments'),
-        ),
+        FieldSet('mac_address', 'device_id', 'virtual_machine_id', name=_('MAC address')),
     )
     selector_fields = ('filter_id', 'q', 'device_id', 'virtual_machine_id')
     mac_address = forms.CharField(
         required=False,
-        label=_('MAC address'),
+        label=_('MAC address')
     )
     device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
@@ -1708,20 +1693,6 @@ class MACAddressFilterForm(NetBoxModelFilterSetForm):
         required=False,
         label=_('Assigned VM'),
     )
-    assigned = forms.NullBooleanField(
-        required=False,
-        label=_('Assigned to an interface'),
-        widget=forms.Select(
-            choices=BOOLEAN_WITH_BLANK_CHOICES
-        ),
-    )
-    primary = forms.NullBooleanField(
-        required=False,
-        label=_('Primary MAC of an interface'),
-        widget=forms.Select(
-            choices=BOOLEAN_WITH_BLANK_CHOICES
-        ),
-    )
     tag = TagFilterField(model)
 
 

netbox/dcim/forms/mixins.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
 
 from dcim.constants import LOCATION_SCOPE_TYPES
@@ -48,17 +48,8 @@ class ScopedForm(forms.Form):
     def clean(self):
         super().clean()
 
-        scope = self.cleaned_data.get('scope')
-        scope_type = self.cleaned_data.get('scope_type')
-        if scope_type and not scope:
-            raise ValidationError({
-                'scope': _(
-                    "Please select a {scope_type}."
-                ).format(scope_type=scope_type.model_class()._meta.model_name)
-            })
-
         # Assign the selected scope (if any)
-        self.instance.scope = scope
+        self.instance.scope = self.cleaned_data.get('scope')
 
     def _set_scoped_values(self):
         if scope_type_id := get_field_value(self, 'scope_type'):
@@ -116,15 +107,3 @@ class ScopedImportForm(forms.Form):
         required=False,
         label=_('Scope type (app & model)')
     )
-
-    def clean(self):
-        super().clean()
-
-        scope_id = self.cleaned_data.get('scope_id')
-        scope_type = self.cleaned_data.get('scope_type')
-        if scope_type and not scope_id:
-            raise ValidationError({
-                'scope_id': _(
-                    "Please select a {scope_type}."
-                ).format(scope_type=scope_type.model_class()._meta.model_name)
-            })

netbox/dcim/forms/model_forms.py

@@ -269,8 +269,7 @@ class RackForm(TenancyForm, NetBoxModelForm):
         label=_('Rack Type'),
         queryset=RackType.objects.all(),
         required=False,
-        selector=True,
-        help_text=_("Select a pre-defined rack type, or set physical characteristics below."),
+        help_text=_("Select a pre-defined rack type, or set physical characteristics below.")
     )
     comments = CommentField()
 
@@ -756,10 +755,7 @@ class ModuleForm(ModuleCommonForm, NetBoxModelForm):
         queryset=ModuleBay.objects.all(),
         query_params={
             'device_id': '$device'
-        },
-        context={
-            'disabled': 'installed_module',
-        },
+        }
     )
     module_type = DynamicModelChoiceField(
         label=_('Module type'),

netbox/dcim/forms/object_create.py

@@ -453,7 +453,6 @@ class VirtualChassisCreateForm(NetBoxModelForm):
         if instance.pk and self.cleaned_data['members']:
             initial_position = self.cleaned_data.get('initial_position', 1)
             for i, member in enumerate(self.cleaned_data['members'], start=initial_position):
-                member.snapshot()
                 member.virtual_chassis = instance
                 member.vc_position = i
                 member.save()

netbox/dcim/graphql/enums.py

@@ -12,7 +12,6 @@ __all__ = (
     'DeviceFaceEnum',
     'DeviceStatusEnum',
     'InterfaceDuplexEnum',
-    'InterfaceKindEnum',
     'InterfaceModeEnum',
     'InterfacePoEModeEnum',
     'InterfacePoETypeEnum',
@@ -49,7 +48,6 @@ DeviceAirflowEnum = strawberry.enum(DeviceAirflowChoices.as_enum(prefix='airflow
 DeviceFaceEnum = strawberry.enum(DeviceFaceChoices.as_enum(prefix='face'))
 DeviceStatusEnum = strawberry.enum(DeviceStatusChoices.as_enum(prefix='status'))
 InterfaceDuplexEnum = strawberry.enum(InterfaceDuplexChoices.as_enum(prefix='duplex'))
-InterfaceKindEnum = strawberry.enum(InterfaceKindChoices.as_enum(prefix='kind'))
 InterfaceModeEnum = strawberry.enum(InterfaceModeChoices.as_enum(prefix='mode'))
 InterfacePoEModeEnum = strawberry.enum(InterfacePoEModeChoices.as_enum(prefix='mode'))
 InterfacePoETypeEnum = strawberry.enum(InterfacePoETypeChoices.as_enum())

netbox/dcim/graphql/filters.py

@@ -1,6 +1,5 @@
 from typing import Annotated, TYPE_CHECKING
 
-from django.db.models import Q
 import strawberry
 import strawberry_django
 from strawberry.scalars import ID
@@ -8,8 +7,6 @@ from strawberry_django import FilterLookup
 
 from core.graphql.filter_mixins import ChangeLogFilterMixin
 from dcim import models
-from dcim.constants import *
-from dcim.graphql.enums import InterfaceKindEnum
 from extras.graphql.filter_mixins import ConfigContextFilterMixin
 from netbox.graphql.filter_mixins import (
     PrimaryModelFilterMixin,
@@ -18,9 +15,7 @@ from netbox.graphql.filter_mixins import (
     ImageAttachmentFilterMixin,
     WeightFilterMixin,
 )
-from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin
-from virtualization.models import VMInterface
-
+from tenancy.graphql.filter_mixins import TenancyFilterMixin, ContactFilterMixin
 from .filter_mixins import (
     CabledObjectModelFilterMixin,
     ComponentModelFilterMixin,
@@ -421,24 +416,6 @@ class MACAddressFilter(PrimaryModelFilterMixin):
     )
     assigned_object_id: ID | None = strawberry_django.filter_field()
 
-    @strawberry_django.filter_field()
-    def assigned(self, value: bool, prefix) -> Q:
-        return Q(**{f'{prefix}assigned_object_id__isnull': (not value)})
-
-    @strawberry_django.filter_field()
-    def primary(self, value: bool, prefix) -> Q:
-        interface_mac_ids = models.Interface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        vminterface_mac_ids = VMInterface.objects.filter(primary_mac_address_id__isnull=False).values_list(
-            'primary_mac_address_id', flat=True
-        )
-        query = Q(**{f'{prefix}pk__in': interface_mac_ids}) | Q(**{f'{prefix}pk__in': vminterface_mac_ids})
-        if value:
-            return Q(query)
-        else:
-            return ~Q(query)
-
 
 @strawberry_django.filter_type(models.Interface, lookups=True)
 class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin, CabledObjectModelFilterMixin):
@@ -508,27 +485,6 @@ class InterfaceFilter(ModularComponentModelFilterMixin, InterfaceBaseFilterMixin
         strawberry_django.filter_field()
     )
 
-    @strawberry_django.filter_field
-    def connected(self, queryset, value: bool, prefix: str):
-        if value is True:
-            return queryset, Q(**{f"{prefix}_path__is_active": True})
-        else:
-            return queryset, Q(**{f"{prefix}_path__isnull": True}) | Q(**{f"{prefix}_path__is_active": False})
-
-    @strawberry_django.filter_field
-    def kind(
-        self,
-        queryset,
-        value: Annotated['InterfaceKindEnum', strawberry.lazy('dcim.graphql.enums')],
-        prefix: str
-    ):
-        if value == InterfaceKindEnum.KIND_PHYSICAL:
-            return queryset, ~Q(**{f"{prefix}type__in": NONCONNECTABLE_IFACE_TYPES})
-        elif value == InterfaceKindEnum.KIND_VIRTUAL:
-            return queryset, Q(**{f"{prefix}type__in": VIRTUAL_IFACE_TYPES})
-        elif value == InterfaceKindEnum.KIND_WIRELESS:
-            return queryset, Q(**{f"{prefix}type__in": WIRELESS_IFACE_TYPES})
-
 
 @strawberry_django.filter_type(models.InterfaceTemplate, lookups=True)
 class InterfaceTemplateFilter(ModularComponentTemplateFilterMixin):

netbox/dcim/graphql/gfk_mixins.py

@@ -1,5 +1,3 @@
-from strawberry.types import Info
-
 from circuits.graphql.types import CircuitTerminationType, ProviderNetworkType
 from circuits.models import CircuitTermination, ProviderNetwork
 from dcim.graphql.types import (
@@ -51,7 +49,7 @@ class InventoryItemTemplateComponentType:
         )
 
     @classmethod
-    def resolve_type(cls, instance, info: Info):
+    def resolve_type(cls, instance, info):
         if type(instance) is ConsolePortTemplate:
             return ConsolePortTemplateType
         if type(instance) is ConsoleServerPortTemplate:
@@ -81,7 +79,7 @@ class InventoryItemComponentType:
         )
 
     @classmethod
-    def resolve_type(cls, instance, info: Info):
+    def resolve_type(cls, instance, info):
         if type(instance) is ConsolePort:
             return ConsolePortType
         if type(instance) is ConsoleServerPort:
@@ -114,7 +112,7 @@ class ConnectedEndpointType:
         )
 
     @classmethod
-    def resolve_type(cls, instance, info: Info):
+    def resolve_type(cls, instance, info):
         if type(instance) is CircuitTermination:
             return CircuitTerminationType
         if type(instance) is ConsolePortType:

netbox/dcim/migrations/0188_racktype.py

@@ -3,7 +3,9 @@ import django.db.models.deletion
 import taggit.managers
 from django.db import migrations, models
 
+import utilities.fields
 import utilities.json
+import utilities.ordering
 
 
 class Migration(migrations.Migration):

netbox/dcim/migrations/0216_latitude_longitude_validators.py

@@ -1,69 +0,0 @@
-import decimal
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('dcim', '0215_rackreservation_status'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='device',
-            name='latitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=8,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(decimal.Decimal('-90.0')),
-                    django.core.validators.MaxValueValidator(decimal.Decimal('90.0'))
-                ],
-            ),
-        ),
-        migrations.AlterField(
-            model_name='device',
-            name='longitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=9,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(decimal.Decimal('-180.0')),
-                    django.core.validators.MaxValueValidator(decimal.Decimal('180.0'))
-                ],
-            ),
-        ),
-        migrations.AlterField(
-            model_name='site',
-            name='latitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=8,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(decimal.Decimal('-90.0')),
-                    django.core.validators.MaxValueValidator(decimal.Decimal('90.0'))
-                ],
-            ),
-        ),
-        migrations.AlterField(
-            model_name='site',
-            name='longitude',
-            field=models.DecimalField(
-                blank=True,
-                decimal_places=6,
-                max_digits=9,
-                null=True,
-                validators=[
-                    django.core.validators.MinValueValidator(decimal.Decimal('-180.0')),
-                    django.core.validators.MaxValueValidator(decimal.Decimal('180.0'))
-                ],
-            ),
-        ),
-    ]

netbox/dcim/models/cables.py

@@ -10,7 +10,6 @@ from django.utils.translation import gettext_lazy as _
 from core.models import ObjectType
 from dcim.choices import *
 from dcim.constants import *
-from dcim.exceptions import UnsupportedCablePath
 from dcim.fields import PathField
 from dcim.utils import decompile_path_node, object_to_path_node
 from netbox.choices import ColorChoices
@@ -19,7 +18,6 @@ from utilities.conversion import to_meters
 from utilities.exceptions import AbortRequest
 from utilities.fields import ColorField, GenericArrayForeignKey
 from utilities.querysets import RestrictedQuerySet
-from utilities.serialization import deserialize_object, serialize_object
 from wireless.models import WirelessLink
 from .device_components import FrontPort, RearPort, PathEndpoint
 
@@ -29,6 +27,8 @@ __all__ = (
     'CableTermination',
 )
 
+from ..exceptions import UnsupportedCablePath
+
 trace_paths = Signal()
 
 
@@ -119,61 +119,43 @@ class Cable(PrimaryModel):
         pk = self.pk or self._pk
         return self.label or f'#{pk}'
 
-    def get_status_color(self):
-        return LinkStatusChoices.colors.get(self.status)
-
-    def _get_x_terminations(self, side):
-        """
-        Return the terminating objects for the given cable end (A or B).
-        """
-        if side not in (CableEndChoices.SIDE_A, CableEndChoices.SIDE_B):
-            raise ValueError(f"Unknown cable side: {side}")
-        attr = f'_{side.lower()}_terminations'
-
-        if hasattr(self, attr):
-            return getattr(self, attr)
-        if not self.pk:
-            return []
-        return [
-            # Query self.terminations.all() to leverage cached results
-            ct.termination for ct in self.terminations.all() if ct.cable_end == side
-        ]
-
-    def _set_x_terminations(self, side, value):
-        """
-        Set the terminating objects for the given cable end (A or B).
-        """
-        if side not in (CableEndChoices.SIDE_A, CableEndChoices.SIDE_B):
-            raise ValueError(f"Unknown cable side: {side}")
-        _attr = f'_{side.lower()}_terminations'
-
-        # If the provided value is a list of CableTermination IDs, resolve them
-        # to their corresponding termination objects.
-        if all(isinstance(item, int) for item in value):
-            value = [
-                ct.termination for ct in CableTermination.objects.filter(pk__in=value).prefetch_related('termination')
-            ]
-
-        if not self.pk or getattr(self, _attr, []) != list(value):
-            self._terminations_modified = True
-
-        setattr(self, _attr, value)
-
     @property
     def a_terminations(self):
-        return self._get_x_terminations(CableEndChoices.SIDE_A)
+        if hasattr(self, '_a_terminations'):
+            return self._a_terminations
+
+        if not self.pk:
+            return []
+
+        # Query self.terminations.all() to leverage cached results
+        return [
+            ct.termination for ct in self.terminations.all() if ct.cable_end == CableEndChoices.SIDE_A
+        ]
 
     @a_terminations.setter
     def a_terminations(self, value):
-        self._set_x_terminations(CableEndChoices.SIDE_A, value)
+        if not self.pk or self.a_terminations != list(value):
+            self._terminations_modified = True
+        self._a_terminations = value
 
     @property
     def b_terminations(self):
-        return self._get_x_terminations(CableEndChoices.SIDE_B)
+        if hasattr(self, '_b_terminations'):
+            return self._b_terminations
+
+        if not self.pk:
+            return []
+
+        # Query self.terminations.all() to leverage cached results
+        return [
+            ct.termination for ct in self.terminations.all() if ct.cable_end == CableEndChoices.SIDE_B
+        ]
 
     @b_terminations.setter
     def b_terminations(self, value):
-        self._set_x_terminations(CableEndChoices.SIDE_B, value)
+        if not self.pk or self.b_terminations != list(value):
+            self._terminations_modified = True
+        self._b_terminations = value
 
     @property
     def color_name(self):
@@ -226,7 +208,7 @@ class Cable(PrimaryModel):
             for termination in self.b_terminations:
                 CableTermination(cable=self, cable_end='B', termination=termination).clean()
 
-    def save(self, *args, force_insert=False, force_update=False, using=None, update_fields=None):
+    def save(self, *args, **kwargs):
         _created = self.pk is None
 
         # Store the given length (if any) in meters for use in database ordering
@@ -239,87 +221,39 @@ class Cable(PrimaryModel):
         if self.length is None:
             self.length_unit = None
 
-        # If this is a new Cable, save it before attempting to create its CableTerminations
-        if self._state.adding:
-            super().save(*args, force_insert=True, using=using, update_fields=update_fields)
-            # Update the private PK used in __str__()
-            self._pk = self.pk
+        super().save(*args, **kwargs)
 
+        # Update the private pk used in __str__ in case this is a new object (i.e. just got its pk)
+        self._pk = self.pk
+
+        # Retrieve existing A/B terminations for the Cable
+        a_terminations = {ct.termination: ct for ct in self.terminations.filter(cable_end='A')}
+        b_terminations = {ct.termination: ct for ct in self.terminations.filter(cable_end='B')}
+
+        # Delete stale CableTerminations
         if self._terminations_modified:
-            self.update_terminations()
-
-        super().save(*args, force_update=True, using=using, update_fields=update_fields)
+            for termination, ct in a_terminations.items():
+                if termination.pk and termination not in self.a_terminations:
+                    ct.delete()
+            for termination, ct in b_terminations.items():
+                if termination.pk and termination not in self.b_terminations:
+                    ct.delete()
 
+        # Save new CableTerminations (if any)
+        if self._terminations_modified:
+            for termination in self.a_terminations:
+                if not termination.pk or termination not in a_terminations:
+                    CableTermination(cable=self, cable_end='A', termination=termination).save()
+            for termination in self.b_terminations:
+                if not termination.pk or termination not in b_terminations:
+                    CableTermination(cable=self, cable_end='B', termination=termination).save()
         try:
             trace_paths.send(Cable, instance=self, created=_created)
         except UnsupportedCablePath as e:
             raise AbortRequest(e)
 
-    def serialize_object(self, exclude=None):
-        data = serialize_object(self, exclude=exclude or [])
-
-        # Add A & B terminations to the serialized data
-        a_terminations, b_terminations = self.get_terminations()
-        data['a_terminations'] = sorted([ct.pk for ct in a_terminations.values()])
-        data['b_terminations'] = sorted([ct.pk for ct in b_terminations.values()])
-
-        return data
-
-    @classmethod
-    def deserialize_object(cls, data, pk=None):
-        a_terminations = data.pop('a_terminations', [])
-        b_terminations = data.pop('b_terminations', [])
-
-        instance = deserialize_object(cls, data, pk=pk)
-
-        # Assign A & B termination objects to the Cable instance
-        queryset = CableTermination.objects.prefetch_related('termination')
-        instance.a_terminations = [
-            ct.termination for ct in queryset.filter(pk__in=a_terminations)
-        ]
-        instance.b_terminations = [
-            ct.termination for ct in queryset.filter(pk__in=b_terminations)
-        ]
-
-        return instance
-
-    def get_terminations(self):
-        """
-        Return two dictionaries mapping A & B side terminating objects to their corresponding CableTerminations
-        for this Cable.
-        """
-        a_terminations = {}
-        b_terminations = {}
-
-        for ct in CableTermination.objects.filter(cable=self).prefetch_related('termination'):
-            if ct.cable_end == CableEndChoices.SIDE_A:
-                a_terminations[ct.termination] = ct
-            else:
-                b_terminations[ct.termination] = ct
-
-        return a_terminations, b_terminations
-
-    def update_terminations(self):
-        """
-        Create/delete CableTerminations for this Cable to reflect its current state.
-        """
-        a_terminations, b_terminations = self.get_terminations()
-
-        # Delete any stale CableTerminations
-        for termination, ct in a_terminations.items():
-            if termination.pk and termination not in self.a_terminations:
-                ct.delete()
-        for termination, ct in b_terminations.items():
-            if termination.pk and termination not in self.b_terminations:
-                ct.delete()
-
-        # Save any new CableTerminations
-        for termination in self.a_terminations:
-            if not termination.pk or termination not in a_terminations:
-                CableTermination(cable=self, cable_end='A', termination=termination).save()
-        for termination in self.b_terminations:
-            if not termination.pk or termination not in b_terminations:
-                CableTermination(cable=self, cable_end='B', termination=termination).save()
+    def get_status_color(self):
+        return LinkStatusChoices.colors.get(self.status)
 
 
 class CableTermination(ChangeLoggedModel):
@@ -392,17 +326,6 @@ class CableTermination(ChangeLoggedModel):
     def clean(self):
         super().clean()
 
-        # Disallow connecting a cable to any termination object that is
-        # explicitly flagged as "mark connected".
-        termination = getattr(self, 'termination', None)
-        if termination is not None and getattr(termination, "mark_connected", False):
-            raise ValidationError(
-                _("Cannot connect a cable to {obj_parent} > {obj} because it is marked as connected.").format(
-                    obj_parent=termination.parent_object,
-                    obj=termination,
-                )
-            )
-
         # Check for existing termination
         qs = CableTermination.objects.filter(
             termination_type=self.termination_type,
@@ -414,14 +337,14 @@ class CableTermination(ChangeLoggedModel):
         existing_termination = qs.first()
         if existing_termination is not None:
             raise ValidationError(
-                _("Duplicate termination found for {app_label}.{model} {termination_id}: cable {cable_pk}").format(
+                _("Duplicate termination found for {app_label}.{model} {termination_id}: cable {cable_pk}".format(
                     app_label=self.termination_type.app_label,
                     model=self.termination_type.model,
                     termination_id=self.termination_id,
                     cable_pk=existing_termination.cable.pk
-                )
+                ))
             )
-        # Validate the interface type (if applicable)
+        # Validate interface type (if applicable)
         if self.termination_type.model == 'interface' and self.termination.type in NONCONNECTABLE_IFACE_TYPES:
             raise ValidationError(
                 _("Cables cannot be terminated to {type_display} interfaces").format(
@@ -614,7 +537,7 @@ class CablePath(models.Model):
         Cable or WirelessLink connects (interfaces, console ports, circuit termination, etc.). All terminations must be
         of the same type and must belong to the same parent object.
         """
-        from circuits.models import CircuitTermination, Circuit
+        from circuits.models import CircuitTermination
 
         if not terminations:
             return None
@@ -636,11 +559,8 @@ class CablePath(models.Model):
                 raise UnsupportedCablePath(_("All mid-span terminations must have the same termination type"))
 
             # All mid-span terminations must all be attached to the same device
-            if (
-                not isinstance(terminations[0], PathEndpoint) and
-                not isinstance(terminations[0].parent_object, Circuit) and
-                not all(t.parent_object == terminations[0].parent_object for t in terminations[1:])
-            ):
+            if (not isinstance(terminations[0], PathEndpoint) and not
+                    all(t.parent_object == terminations[0].parent_object for t in terminations[1:])):
                 raise UnsupportedCablePath(_("All mid-span terminations must have the same parent object"))
 
             # Check for a split path (e.g. rear port fanning out to multiple front ports with
@@ -784,39 +704,32 @@ class CablePath(models.Model):
 
             elif isinstance(remote_terminations[0], CircuitTermination):
                 # Follow a CircuitTermination to its corresponding CircuitTermination (A to Z or vice versa)
-                qs = Q()
-                for remote_termination in remote_terminations:
-                    qs |= Q(
-                        circuit=remote_termination.circuit,
-                        term_side='Z' if remote_termination.term_side == 'A' else 'A'
-                    )
-
-                # Get all circuit terminations
-                circuit_terminations = CircuitTermination.objects.filter(qs)
-
-                if not circuit_terminations.exists():
+                if len(remote_terminations) > 1:
+                    is_split = True
                     break
-                elif all([ct._provider_network for ct in circuit_terminations]):
+                circuit_termination = CircuitTermination.objects.filter(
+                    circuit=remote_terminations[0].circuit,
+                    term_side='Z' if remote_terminations[0].term_side == 'A' else 'A'
+                ).first()
+                if circuit_termination is None:
+                    break
+                elif circuit_termination._provider_network:
                     # Circuit terminates to a ProviderNetwork
                     path.extend([
-                        [object_to_path_node(ct) for ct in circuit_terminations],
-                        [object_to_path_node(ct._provider_network) for ct in circuit_terminations],
+                        [object_to_path_node(circuit_termination)],
+                        [object_to_path_node(circuit_termination._provider_network)],
                     ])
                     is_complete = True
                     break
-                elif all([ct.termination and not ct.cable for ct in circuit_terminations]):
+                elif circuit_termination.termination and not circuit_termination.cable:
                     # Circuit terminates to a Region/Site/etc.
                     path.extend([
-                        [object_to_path_node(ct) for ct in circuit_terminations],
-                        [object_to_path_node(ct.termination) for ct in circuit_terminations],
+                        [object_to_path_node(circuit_termination)],
+                        [object_to_path_node(circuit_termination.termination)],
                     ])
                     break
-                elif any([ct.cable in links for ct in circuit_terminations]):
-                    # No valid path
-                    is_split = True
-                    break
 
-                terminations = circuit_terminations
+                terminations = [circuit_termination]
 
             else:
                 # Check for non-symmetric path

netbox/dcim/models/device_component_templates.py

@@ -7,7 +7,6 @@ from mptt.models import MPTTModel, TreeForeignKey
 
 from dcim.choices import *
 from dcim.constants import *
-from dcim.models.mixins import InterfaceValidationMixin
 from netbox.models import ChangeLoggedModel
 from utilities.fields import ColorField, NaturalOrderingField
 from utilities.mptt import TreeManager
@@ -406,7 +405,7 @@ class PowerOutletTemplate(ModularComponentTemplateModel):
         }
 
 
-class InterfaceTemplate(InterfaceValidationMixin, ModularComponentTemplateModel):
+class InterfaceTemplate(ModularComponentTemplateModel):
     """
     A template for a physical data interface on a new Device.
     """
@@ -470,6 +469,8 @@ class InterfaceTemplate(InterfaceValidationMixin, ModularComponentTemplateModel)
         super().clean()
 
         if self.bridge:
+            if self.pk and self.bridge_id == self.pk:
+                raise ValidationError({'bridge': _("An interface cannot be bridged to itself.")})
             if self.device_type and self.device_type != self.bridge.device_type:
                 raise ValidationError({
                     'bridge': _(
@@ -483,6 +484,11 @@ class InterfaceTemplate(InterfaceValidationMixin, ModularComponentTemplateModel)
                     ).format(bridge=self.bridge)
                 })
 
+        if self.rf_role and self.type not in WIRELESS_IFACE_TYPES:
+            raise ValidationError({
+                'rf_role': "Wireless role may be set only on wireless interfaces."
+            })
+
     def instantiate(self, **kwargs):
         return self.component_model(
             name=self.resolve_name(kwargs.get('module')),
@@ -681,8 +687,8 @@ class ModuleBayTemplate(ModularComponentTemplateModel):
 
     def instantiate(self, **kwargs):
         return self.component_model(
-            name=self.resolve_name(kwargs.get('module')),
-            label=self.resolve_label(kwargs.get('module')),
+            name=self.name,
+            label=self.label,
             position=self.position,
             **kwargs
         )

netbox/dcim/models/device_components.py

@@ -11,7 +11,6 @@ from mptt.models import MPTTModel, TreeForeignKey
 from dcim.choices import *
 from dcim.constants import *
 from dcim.fields import WWNField
-from dcim.models.mixins import InterfaceValidationMixin
 from netbox.choices import ColorChoices
 from netbox.models import OrganizationalModel, NetBoxModel
 from utilities.fields import ColorField, NaturalOrderingField
@@ -633,17 +632,10 @@ class BaseInterface(models.Model):
             })
 
         # Check that the primary MAC address (if any) is assigned to this interface
-        if (
-                self.primary_mac_address and
-                self.primary_mac_address.assigned_object is not None and
-                self.primary_mac_address.assigned_object != self
-        ):
+        if self.primary_mac_address and self.primary_mac_address.assigned_object != self:
             raise ValidationError({
-                'primary_mac_address': _(
-                    "MAC address {mac_address} is assigned to a different interface ({interface})."
-                ).format(
-                    mac_address=self.primary_mac_address,
-                    interface=self.primary_mac_address.assigned_object,
+                'primary_mac_address': _("MAC address {mac_address} is not assigned to this interface.").format(
+                    mac_address=self.primary_mac_address
                 )
             })
 
@@ -677,14 +669,7 @@ class BaseInterface(models.Model):
             return self.primary_mac_address.mac_address
 
 
-class Interface(
-    InterfaceValidationMixin,
-    ModularComponentModel,
-    BaseInterface,
-    CabledObjectModel,
-    PathEndpoint,
-    TrackingModelMixin,
-):
+class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEndpoint, TrackingModelMixin):
     """
     A network interface within a Device. A physical Interface can connect to exactly one other Interface.
     """
@@ -887,21 +872,25 @@ class Interface(
                         "The selected parent interface ({interface}) belongs to a different device ({device})"
                     ).format(interface=self.parent, device=self.parent.device)
                 })
-            elif self.parent.device.virtual_chassis != self.device.virtual_chassis:
+            elif self.parent.device.virtual_chassis != self.parent.virtual_chassis:
                 raise ValidationError({
                     'parent': _(
                         "The selected parent interface ({interface}) belongs to {device}, which is not part of "
                         "virtual chassis {virtual_chassis}."
                     ).format(
                         interface=self.parent,
-                        device=self.parent.device,
+                        device=self.parent_device,
                         virtual_chassis=self.device.virtual_chassis
                     )
                 })
 
         # Bridge validation
 
-        # A bridged interface belongs to the same device or virtual chassis
+        # An interface cannot be bridged to itself
+        if self.pk and self.bridge_id == self.pk:
+            raise ValidationError({'bridge': _("An interface cannot be bridged to itself.")})
+
+        # A bridged interface belong to the same device or virtual chassis
         if self.bridge and self.bridge.device != self.device:
             if self.device.virtual_chassis is None:
                 raise ValidationError({
@@ -946,9 +935,29 @@ class Interface(
                     )
                 })
 
+        # PoE validation
+
+        # Only physical interfaces may have a PoE mode/type assigned
+        if self.poe_mode and self.is_virtual:
+            raise ValidationError({
+                'poe_mode': _("Virtual interfaces cannot have a PoE mode.")
+            })
+        if self.poe_type and self.is_virtual:
+            raise ValidationError({
+                'poe_type': _("Virtual interfaces cannot have a PoE type.")
+            })
+
+        # An interface with a PoE type set must also specify a mode
+        if self.poe_type and not self.poe_mode:
+            raise ValidationError({
+                'poe_type': _("Must specify PoE mode when designating a PoE type.")
+            })
+
         # Wireless validation
 
-        # RF channel may only be set for wireless interfaces
+        # RF role & channel may only be set for wireless interfaces
+        if self.rf_role and not self.is_wireless:
+            raise ValidationError({'rf_role': _("Wireless role may be set only on wireless interfaces.")})
         if self.rf_channel and not self.is_wireless:
             raise ValidationError({'rf_channel': _("Channel may be set only on wireless interfaces.")})
 
@@ -1222,8 +1231,6 @@ class ModuleBay(ModularComponentModel, TrackingModelMixin, MPTTModel):
     def save(self, *args, **kwargs):
         if self.module:
             self.parent = self.module.module_bay
-        else:
-            self.parent = None
         super().save(*args, **kwargs)
 
 

netbox/dcim/models/devices.py

@@ -646,10 +646,6 @@ class Device(
         decimal_places=6,
         blank=True,
         null=True,
-        validators=[
-            MinValueValidator(decimal.Decimal('-90.0')),
-            MaxValueValidator(decimal.Decimal('90.0'))
-        ],
         help_text=_("GPS coordinate in decimal format (xx.yyyyyy)")
     )
     longitude = models.DecimalField(
@@ -658,10 +654,6 @@ class Device(
         decimal_places=6,
         blank=True,
         null=True,
-        validators=[
-            MinValueValidator(decimal.Decimal('-180.0')),
-            MaxValueValidator(decimal.Decimal('180.0'))
-        ],
         help_text=_("GPS coordinate in decimal format (xx.yyyyyy)")
     )
     services = GenericRelation(
@@ -957,11 +949,6 @@ class Device(
             if cf_defaults := CustomField.objects.get_defaults_for_model(model):
                 for component in components:
                     component.custom_field_data = cf_defaults
-            # Set denormalized references
-            for component in components:
-                component._site = self.site
-                component._location = self.location
-                component._rack = self.rack
             components = model.objects.bulk_create(components)
             # Prefetch related objects to minimize queries needed during post_save
             prefetch_fields = get_prefetchable_fields(model)
@@ -1167,6 +1154,7 @@ class VirtualChassis(PrimaryModel):
             })
 
     def delete(self, *args, **kwargs):
+
         # Check for LAG interfaces split across member chassis
         interfaces = Interface.objects.filter(
             device__in=self.members.all(),
@@ -1180,13 +1168,6 @@ class VirtualChassis(PrimaryModel):
                 "interfaces."
             ).format(self=self, interfaces=InterfaceSpeedChoices))
 
-        # Clear vc_position and vc_priority on member devices BEFORE calling super().delete()
-        # This must be done here because on_delete=SET_NULL executes before pre_delete signal
-        for device in self.members.all():
-            device.vc_position = None
-            device.vc_priority = None
-            device.save()
-
         return super().delete(*args, **kwargs)
 
 

netbox/dcim/models/mixins.py

@@ -4,11 +4,8 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from dcim.constants import VIRTUAL_IFACE_TYPES, WIRELESS_IFACE_TYPES
-
 __all__ = (
     'CachedScopeMixin',
-    'InterfaceValidationMixin',
     'RenderConfigMixin',
 )
 
@@ -90,9 +87,11 @@ class CachedScopeMixin(models.Model):
     def clean(self):
         if self.scope_type and not (self.scope or self.scope_id):
             scope_type = self.scope_type.model_class()
-            raise ValidationError(
-                _("Please select a {scope_type}.").format(scope_type=scope_type._meta.model_name)
-            )
+            raise ValidationError({
+                'scope': _(
+                    "Please select a {scope_type}."
+                ).format(scope_type=scope_type._meta.model_name)
+            })
         super().clean()
 
     def save(self, *args, **kwargs):
@@ -119,33 +118,3 @@ class CachedScopeMixin(models.Model):
                 self._site = self.scope.site
                 self._location = self.scope
     cache_related_objects.alters_data = True
-
-
-class InterfaceValidationMixin:
-
-    def clean(self):
-        super().clean()
-
-        # An interface cannot be bridged to itself
-        if self.pk and self.bridge_id == self.pk:
-            raise ValidationError({'bridge': _("An interface cannot be bridged to itself.")})
-
-        # Only physical interfaces may have a PoE mode/type assigned
-        if self.poe_mode and self.type in VIRTUAL_IFACE_TYPES:
-            raise ValidationError({
-                'poe_mode': _("Virtual interfaces cannot have a PoE mode.")
-            })
-        if self.poe_type and self.type in VIRTUAL_IFACE_TYPES:
-            raise ValidationError({
-                'poe_type': _("Virtual interfaces cannot have a PoE type.")
-            })
-
-        # An interface with a PoE type set must also specify a mode
-        if self.poe_type and not self.poe_mode:
-            raise ValidationError({
-                'poe_type': _("Must specify PoE mode when designating a PoE type.")
-            })
-
-        # RF role may be set only for wireless interfaces
-        if self.rf_role and self.type not in WIRELESS_IFACE_TYPES:
-            raise ValidationError({'rf_role': _("Wireless role may be set only on wireless interfaces.")})