Version bump to NetBox v4.6.3 (#82)

* Add support for NetBox 4.6
* Test NetBox v4.6.3 and Python 3.14

Signed-off-by: wkoot <3715211+wkoot@users.noreply.github.com>
Co-authored-by: Artem Kotik <artem.i.kotik@ringcentral.com>

.github/workflows/docker-image.yml

@@ -8,13 +8,16 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
+permissions: {}
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       with:
         fetch-depth: 0
+        persist-credentials: false
 
     - name: Build the Docker image
       run: docker compose build --no-cache
@@ -35,7 +38,6 @@ jobs:
 
     - name: Sonar scan
       if: env.SONAR_TOKEN != null
-      uses: SonarSource/sonarqube-scan-action@v4
+      uses: SonarSource/sonarqube-scan-action@713881670b6b3676cda39549040e2d88c70d582e # v8.2.0
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/markdown-lint.yml

@@ -8,13 +8,17 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
+permissions: {}
+
 jobs:
   vale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
 
-      - uses: errata-ai/vale-action@v2.1.1
+      - uses: errata-ai/vale-action@85f9f7f2c5f449ac0ae5b66662961bae3f77ca6a # v2.1.2
         with:
           fail_on_error: true
           filter_mode: nofilter

.github/workflows/python.yml

@@ -8,6 +8,8 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
+permissions: {}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -17,11 +19,14 @@ jobs:
           - python-version: 3.11
           - python-version: 3.12
           - python-version: 3.13
+          - python-version: 3.14
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/zizmor-scan.yml

@@ -0,0 +1,25 @@
+---
+name: GitHub Actions Security Analysis with zizmor
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions: {}
+
+jobs:
+  zizmor:
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+
+      - name: Run zizmor
+        uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6

CHANGELOG.md

@@ -2,11 +2,30 @@
 
 ## [Unreleased]
 
+## [1.9.0](https://github.com/ICTU/netbox_slm/releases/tag/1.9.0) - 2026-06-25
+
+### Changed
+
+* Support NetBox v4.6.3 (#76)
+* Support Python 3.14 (#76)
+
+## [1.8.3](https://github.com/ICTU/netbox_slm/releases/tag/1.8.3) - 2025-12-18
+
+### Fixed
+
+* Filters with default order by ID (#75)
+
+## [1.8.2](https://github.com/ICTU/netbox_slm/releases/tag/1.8.2) - 2025-06-02
+
+### Fixed
+
+* Permission check for adding software product installations (#70)
+
 ## [1.8.1](https://github.com/ICTU/netbox_slm/releases/tag/1.8.1) - 2025-04-11
 
 ### Fixed
 
-*  Fix filtering on foreign objects (#65)
+* Filtering on foreign objects (#65)
 
 ## [1.8.0](https://github.com/ICTU/netbox_slm/releases/tag/1.8.0) - 2025-02-25
 

MAINTENANCE.md

@@ -4,6 +4,8 @@
 ## Version upgrade workflow
 
 1. Update version spec in `netbox_slm/__init__.py` and `sonar-project.properties`
+1. Update NetBox base image versions in `ci/Dockerfile`, `ci/Dockerfile-CI` and `ci/docker-compose.yml`
+1. Ensure that the `PYTHON_VERSION` in the `Dockerfile`s is the same as the NetBox community docker base image
 1. Check for any runtime errors and warnings in the `netbox-*` container logs
 1. Create new version tag on GitHub, following semantic versioning as: `MAJOR.MINOR.PATCH`
 1. Update the `CHANGELOG.md` with new version information and move `[Unreleased]` items to new version section

ci/.vale.ini

@@ -7,3 +7,6 @@ Packages = proselint
 
 [*.md]
 BasedOnStyles = Vale, proselint
+
+[ci/styles/**]
+BasedOnStyles =

ci/Dockerfile

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.12
+ARG PYTHON_VERSION=3.14
 FROM python:${PYTHON_VERSION}-alpine AS compile-image
 # Python version build arg is not actually supported by NetBox container image, only used for maintenance convenience
 
@@ -12,7 +12,7 @@ RUN pip install -U .[build] &&\
     python -m build &&\
     pip install --no-index /build
 
-FROM netboxcommunity/netbox:v4.2.3
-ARG PYTHON_VERSION=3.12
+FROM netboxcommunity/netbox:v4.6.3
+ARG PYTHON_VERSION=3.14
 
 COPY --from=compile-image /opt/netbox/venv/lib/python${PYTHON_VERSION}/site-packages/netbox_slm /opt/netbox/venv/lib/python${PYTHON_VERSION}/site-packages/netbox_slm

ci/Dockerfile-CI

@@ -1,5 +1,5 @@
-FROM netboxcommunity/netbox:v4.2.3
-ARG PYTHON_VERSION=3.12
+FROM netboxcommunity/netbox:v4.6.3
+ARG PYTHON_VERSION=3.14
 
 COPY ../pyproject.toml /tmp/
 RUN uv pip install -r /tmp/pyproject.toml --extra ci

ci/config/configuration.py

@@ -1,18 +1,20 @@
 """
 Minimal NetBox config for NetBox SLM plugin testing, docs: https://netbox.readthedocs.io/en/stable/configuration/
-Based on https://github.com/netbox-community/netbox/blob/v4.2.3/netbox/netbox/configuration_testing.py
+Based on https://github.com/netbox-community/netbox/blob/v4.6.3/netbox/netbox/configuration_testing.py
 """
 from os import environ
 
 ALLOWED_HOSTS = ['*']
 
-DATABASE = {
-    'NAME': environ.get('DB_NAME', 'netbox'),
-    'USER': environ.get('DB_USER', ''),
-    'PASSWORD': environ.get('DB_PASSWORD', ''),
-    'HOST': environ.get('DB_HOST', 'localhost'),
-    'PORT': environ.get('DB_PORT', ''),
-    'CONN_MAX_AGE': int(environ.get('DB_CONN_MAX_AGE', '300')),
+DATABASES = {
+    'default': {
+        'NAME': environ.get('DB_NAME', 'netbox'),
+        'USER': environ.get('DB_USER', ''),
+        'PASSWORD': environ.get('DB_PASSWORD', ''),
+        'HOST': environ.get('DB_HOST', 'localhost'),
+        'PORT': environ.get('DB_PORT', ''),
+        'CONN_MAX_AGE': int(environ.get('DB_CONN_MAX_AGE', '300')),
+    }
 }
 
 DEBUG = environ.get('DEBUG', 'False').lower() == 'true'
@@ -38,3 +40,9 @@ REDIS = {
 }
 
 SECRET_KEY = 'dummydummydummydummydummydummydummydummydummydummy'
+
+DEFAULT_PERMISSIONS = {}
+
+API_TOKEN_PEPPERS = {
+    1: 'TEST-VALUE-DO-NOT-USE-TEST-VALUE-DO-NOT-USE-TEST-VALUE-DO-NOT-USE',
+}

ci/docker-compose.ci.yml

@@ -12,7 +12,7 @@ services:
     healthcheck:
       disable: true
     volumes:
-      - ./config:/etc/netbox/config:ro
+      - ./config:/etc/netbox/config:z,ro
       - ./reports:/ci/reports:rw
       - ../netbox_slm:/opt/netbox/netbox/netbox_slm:ro
   netbox-worker:
@@ -22,14 +22,8 @@ services:
     healthcheck:
       disable: true
     volumes:
-      - ./config:/etc/netbox/config:ro
+      - ./config:/etc/netbox/config:z,ro
       - ../netbox_slm:/opt/netbox/netbox/netbox_slm:ro
-  netbox-housekeeping:
-    image: netbox:slm
-    depends_on:
-      - netbox
-    healthcheck:
-      disable: true
   postgres:
     ports:
       - "5432:5432"

ci/docker-compose.yml

@@ -1,21 +1,21 @@
 ---
-# based on https://github.com/netbox-community/netbox-docker/blob/3.2.0/docker-compose.yml
+# based on https://github.com/netbox-community/netbox-docker/blob/5.0.1/docker-compose.yml
 services:
   netbox: &netbox
-    image: netboxcommunity/netbox:${VERSION-v4.2.3}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v4.6.3}
     depends_on:
       - postgres
       - redis
       - redis-cache
     env_file: env/netbox.env
-    user: "unit:root"
+    user: "netbox:root"
     healthcheck:
       test: curl -f http://localhost:8080/login/ || exit 1
       start_period: 90s
       timeout: 3s
       interval: 15s
     volumes:
-      - ./config:/etc/netbox/config:ro
+      - ./config:/etc/netbox/config:z,ro
       - netbox-media-files:/opt/netbox/netbox/media:rw
       - netbox-reports-files:/opt/netbox/netbox/reports:rw
       - netbox-scripts-files:/opt/netbox/netbox/scripts:rw
@@ -33,22 +33,10 @@ services:
       start_period: 20s
       timeout: 3s
       interval: 15s
-  netbox-housekeeping:
-    <<: *netbox
-    depends_on:
-      netbox:
-        condition: service_healthy
-    command:
-      - /opt/netbox/housekeeping.sh
-    healthcheck:
-      test: ps -aux | grep -v grep | grep -q housekeeping || exit 1
-      start_period: 20s
-      timeout: 3s
-      interval: 15s
 
   # postgres
   postgres:
-    image: postgres:17-alpine
+    image: docker.io/postgres:18-alpine
     healthcheck:
       test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER
       start_period: 20s
@@ -57,15 +45,15 @@ services:
       retries: 5
     env_file: env/postgres.env
     volumes:
-      - netbox-postgres-data:/var/lib/postgresql/data
+      - netbox-postgres:/var/lib/postgresql
 
   # redis
   redis:
-    image: valkey/valkey:8.0-alpine
+    image: docker.io/valkey/valkey:9.0-alpine
     command:
       - sh
-      - -c
-      - valkey-server --appendonly yes --requirepass $$REDIS_PASSWORD
+      - -c # this is to evaluate the $REDIS_PASSWORD from the env
+      - valkey-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
     healthcheck: &redis-healthcheck
       test: '[ $$(valkey-cli --pass "$${REDIS_PASSWORD}" ping) = ''PONG'' ]'
       start_period: 5s
@@ -76,11 +64,11 @@ services:
     volumes:
       - netbox-redis-data:/data
   redis-cache:
-    image: valkey/valkey:8.0-alpine
+    image: docker.io/valkey/valkey:9.0-alpine
     command:
       - sh
-      - -c
-      - valkey-server --requirepass $$REDIS_PASSWORD
+      - -c # this is to evaluate the $REDIS_PASSWORD from the env
+      - valkey-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
     healthcheck: *redis-healthcheck
     env_file: env/redis-cache.env
     volumes:
@@ -89,7 +77,7 @@ services:
 volumes:
   netbox-media-files:
     driver: local
-  netbox-postgres-data:
+  netbox-postgres:
     driver: local
   netbox-redis-cache-data:
     driver: local

ci/styles/config/vocabularies/Base/accept.txt

@@ -64,5 +64,3 @@ NetBox
 NetBox SLM
 Mart
 Visser
-Suchow
-Redistributions

netbox_slm/__init__.py

@@ -16,7 +16,7 @@ limitations under the License.
 
 from netbox.plugins import PluginConfig
 
-__version__ = "1.8.1"
+__version__ = "1.9.0"
 
 
 class SLMConfig(PluginConfig):

netbox_slm/api/views.py

@@ -27,24 +27,24 @@ class NetboxSLMRootView(APIRootView):
 
 
 class SoftwareProductViewSet(NetBoxModelViewSet):
-    queryset = SoftwareProduct.objects.all()
+    queryset = SoftwareProduct.objects.all().order_by("id")
     serializer_class = SoftwareProductSerializer
     filterset_class = SoftwareProductFilterSet
 
 
 class SoftwareProductVersionViewSet(NetBoxModelViewSet):
-    queryset = SoftwareProductVersion.objects.all()
+    queryset = SoftwareProductVersion.objects.all().order_by("id")
     serializer_class = SoftwareProductVersionSerializer
     filterset_class = SoftwareProductVersionFilterSet
 
 
 class SoftwareProductInstallationViewSet(NetBoxModelViewSet):
-    queryset = SoftwareProductInstallation.objects.all()
+    queryset = SoftwareProductInstallation.objects.all().order_by("id")
     serializer_class = SoftwareProductInstallationSerializer
     filterset_class = SoftwareProductInstallationFilterSet
 
 
 class SoftwareLicenseViewSet(NetBoxModelViewSet):
-    queryset = SoftwareLicense.objects.all()
+    queryset = SoftwareLicense.objects.all().order_by("id")
     serializer_class = SoftwareLicenseSerializer
     filterset_class = SoftwareLicenseFilterSet

netbox_slm/migrations/0007_softwareproductinstallation_cluster.py

@@ -24,6 +24,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='softwareproductinstallation',
-            constraint=models.CheckConstraint(check=models.Q(models.Q(('cluster__isnull', True), ('device__isnull', False), ('virtualmachine__isnull', True)), models.Q(('cluster__isnull', True), ('device__isnull', True), ('virtualmachine__isnull', False)), models.Q(('cluster__isnull', False), ('device__isnull', True), ('virtualmachine__isnull', True)), _connector='OR'), name='netbox_slm_softwareproductinstallation_platform', violation_error_message='Installation requires exactly one platform destination.'),
+            constraint=models.CheckConstraint(condition=models.Q(models.Q(('cluster__isnull', True), ('device__isnull', False), ('virtualmachine__isnull', True)), models.Q(('cluster__isnull', True), ('device__isnull', True), ('virtualmachine__isnull', False)), models.Q(('cluster__isnull', False), ('device__isnull', True), ('virtualmachine__isnull', True)), _connector='OR'), name='netbox_slm_softwareproductinstallation_platform', violation_error_message='Installation requires exactly one platform destination.'),
         ),
     ]

netbox_slm/models.py

@@ -1,7 +1,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
-from django.utils.html import format_html, urlencode
+from django.utils.html import format_html
 from license_expression import Licensing, get_spdx_licensing
 
 from netbox.models import NetBoxModel
@@ -37,10 +37,10 @@ class SoftwareProduct(NetBoxModel):
 
     def get_installation_count(self):
         count = SoftwareProductInstallation.objects.filter(software_product_id=self.pk).count()
-        query_string = urlencode(dict(software_product_id=self.pk))
-        search_target = reverse("plugins:netbox_slm:softwareproductinstallation_list")
-        # Can be composed directly with reverse(query=) in Django 5.2, see https://code.djangoproject.com/ticket/25582
-        return format_html(f"<a href='{search_target}?{query_string}'>{count}</a>") if count else "0"
+        search_target = reverse(
+            "plugins:netbox_slm:softwareproductinstallation_list", query={"software_product_id": self.pk}
+        )
+        return format_html("<a href='{}'>{}</a>", search_target, count) if count else "0"
 
 
 class SoftwareReleaseTypes(models.TextChoices):
@@ -83,10 +83,8 @@ class SoftwareProductVersion(NetBoxModel):
 
     def get_installation_count(self):
         count = SoftwareProductInstallation.objects.filter(version_id=self.pk).count()
-        query_string = urlencode(dict(version_id=self.pk))
-        search_target = reverse("plugins:netbox_slm:softwareproductinstallation_list")
-        # Can be composed directly with reverse(query=) in Django 5.2, see https://code.djangoproject.com/ticket/25582
-        return format_html(f"<a href='{search_target}?{query_string}'>{count}</a>") if count else "0"
+        search_target = reverse("plugins:netbox_slm:softwareproductinstallation_list", query={"version_id": self.pk})
+        return format_html("<a href='{}'>{}</a>", search_target, count) if count else "0"
 
 
 class SoftwareProductInstallation(NetBoxModel):
@@ -109,7 +107,7 @@ class SoftwareProductInstallation(NetBoxModel):
         constraints = [
             models.CheckConstraint(
                 name="%(app_label)s_%(class)s_platform",
-                check=(
+                condition=(
                     models.Q(device__isnull=False, virtualmachine__isnull=True, cluster__isnull=True)
                     | models.Q(device__isnull=True, virtualmachine__isnull=False, cluster__isnull=True)
                     | models.Q(device__isnull=True, virtualmachine__isnull=True, cluster__isnull=False)

netbox_slm/templates/netbox_slm/installations_card_include.html

@@ -3,7 +3,7 @@
 <div class="card">
     <h2 class="card-header">
         Installations
-{% if perms.netbox_slm.add_installation %}
+{% if perms.netbox_slm.add_softwareproductinstallation %}
         <div class="card-actions">
             <a href="{% url 'plugins:netbox_slm:softwareproductinstallation_add' %}?{{ search_obj }}={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add an installation

pyproject.toml

@@ -26,23 +26,24 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
-    "license-expression == 30.4.1",
+    "license-expression == 30.4.4",
 ]
 
 [project.optional-dependencies]
 build = [
-    "build ==  1.2.2.post1",
-    "setuptools == 75.8.0",
-    "twine == 6.1.0",
+    "build == 1.5.0",
+    "setuptools == 82.0.1",
+    "twine == 6.2.0",
 ]
 ci = [
-    "coverage == 7.6.11",
-    "ruff == 0.9.6",
+    "coverage == 7.14.3",
+    "ruff == 0.15.19",
 ]
 
 [project.urls]

sonar-project.properties

@@ -2,11 +2,13 @@
 sonar.organization=ictu
 sonar.projectKey=ICTU_netbox_slm
 sonar.projectName=netbox-slm
-sonar.projectVersion=1.8.1
+sonar.projectVersion=1.9.0
 
 # Path is relative to the sonar-project.properties file
 sonar.sources=netbox_slm
-sonar.python.version=3.11, 3.12, 3.13
+sonar.exclusions=netbox_slm/tests/**
+sonar.tests=netbox_slm/tests
+sonar.python.version=3.11, 3.12, 3.13, 3.14
 
 # Python test reports
 sonar.python.coverage.reportPaths=/ci/reports/coverage.xml