Merge pull request #128 from tobiasge/netbox-4.5

Compatibility with NetBox 4.5.*

Author: tobiasge

.github/workflows/linter.yml

@@ -17,19 +17,23 @@ jobs:
           # list of changed files within `super-linter`
           fetch-depth: 0
       - name: Lint Code Base
-        uses: github/super-linter@v7
+        uses: super-linter/super-linter@v8
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SUPPRESS_POSSUM: true
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_CHECKOV: false
+          VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
+          VALIDATE_GITLEAKS: false
           VALIDATE_JSCPD: false
           VALIDATE_PYTHON_BLACK: false
           VALIDATE_PYTHON_ISORT: false
           VALIDATE_PYTHON_MYPY: false
           VALIDATE_PYTHON_PYINK: false
           VALIDATE_PYTHON_PYLINT: false
+          VALIDATE_PYTHON_RUFF_FORMAT: false
+          VALIDATE_TRIVY: false
           LINTER_RULES_PATH: /
           FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE)
           YAML_CONFIG_FILE: .yamllint.yaml

pyproject.toml

@@ -12,7 +12,7 @@ readme = "README.md"
 license = "Apache-2.0"
 dynamic = ["version"]
 
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = ["ruamel-yaml>=0.18.10"]
 
 [project.urls]
@@ -27,8 +27,8 @@ build-backend = "hatchling.build"
 [tool.hatch.version]
 path = "src/netbox_initializers/version.py"
 
-[tool.uv]
-dev-dependencies = ["ruff==0.12"]
+[dependency-groups]
+dev = ["ruff==0.15.12"]
 
 [tool.ruff]
 line-length = 100

src/netbox_initializers/__init__.py

@@ -9,8 +9,8 @@ class NetBoxInitializersConfig(PluginConfig):
     description = "Load initial data into Netbox"
     version = VERSION
     base_url = "initializers"
-    min_version = "4.4.0"
-    max_version = "4.4.99"
+    min_version = "4.5.0"
+    max_version = "4.5.99"
 
 
 config = NetBoxInitializersConfig

src/netbox_initializers/initializers/base.py

@@ -100,7 +100,6 @@ def set_mac_addresses(self, entity, mac_addresses):
 
         save = False
         for mac_address in MACAddress.objects.filter(mac_address__in=mac_addresses):
-
             entity.mac_addresses.add(mac_address)
             save = True
 

src/netbox_initializers/initializers/cables.py

@@ -1,4 +1,5 @@
 from typing import Tuple
+
 from circuits.constants import CIRCUIT_TERMINATION_TERMINATION_TYPES
 from circuits.models import Circuit, CircuitTermination
 from dcim.models import (
@@ -61,8 +62,7 @@ def get_termination_object(params: dict, side: str):
             circuit_params["termination_id"] = scope_id
         else:
             raise ValueError(
-                f"⚠️ Missing required parameter: 'scope'"
-                f"for side {term_side} of circuit {circuit}"
+                f"⚠️ Missing required parameter: 'scope'for side {term_side} of circuit {circuit}"
             )
 
         termination, created = CircuitTermination.objects.get_or_create(

src/netbox_initializers/initializers/custom_fields.py

@@ -1,12 +1,12 @@
+import importlib
+
+from core.models import ObjectType
 from extras.models import CustomField, CustomFieldChoiceSet
 
 from netbox_initializers.initializers.base import BaseInitializer, register_initializer
 
 
 def get_class_for_class_path(class_path):
-    import importlib
-
-    from core.models import ObjectType
 
     module_name, class_name = class_path.rsplit(".", 1)
     module = importlib.import_module(module_name)

src/netbox_initializers/initializers/device_types.py

@@ -7,6 +7,7 @@
     DeviceBayTemplate,
     FrontPortTemplate,
     InterfaceTemplate,
+    PortTemplateMapping,
     PowerOutletTemplate,
     PowerPortTemplate,
     RearPortTemplate,
@@ -129,6 +130,18 @@ def load_data(self):
                             c_param[n_assoc] = n_model.objects.get(**n_query)
 
                 for new_param in expanded_c_params:
+                    # FrontPortTemplate: rear_port/rear_port_position moved to PortTemplateMapping
+                    port_mapping_params = {}
+                    if c_model is FrontPortTemplate:
+                        rear_port = new_param.pop("rear_port", None)
+                        if rear_port is not None:
+                            port_mapping_params = {
+                                "rear_port": rear_port,
+                                "rear_port_position": new_param.pop("rear_port_position", 1),
+                                "front_port_position": new_param.pop("front_port_position", 1),
+                                "device_type": device_type,
+                            }
+
                     new_matching_params, new_defaults = self.split_params(new_param, c_match_params)
                     new_obj, new_obj_created = c_model.objects.get_or_create(
                         **new_matching_params, defaults=new_defaults
@@ -138,5 +151,13 @@ def load_data(self):
                             f"🧷  Created {c_model._meta} {new_obj} component for device type {device_type}"
                         )
 
+                    if port_mapping_params:
+                        front_port_position = port_mapping_params.pop("front_port_position")
+                        PortTemplateMapping.objects.get_or_create(
+                            front_port=new_obj,
+                            front_port_position=front_port_position,
+                            defaults=port_mapping_params,
+                        )
+
 
 register_initializer("device_types", DeviceTypeInitializer)

src/netbox_initializers/initializers/prefixes.py

@@ -30,7 +30,9 @@ def load_data(self):
             params["prefix"] = IPNetwork(params["prefix"])
 
             if scope := params.pop("scope"):
-                params["scope_type"], params["scope_id"] = get_scope_details(scope, LOCATION_SCOPE_TYPES)
+                params["scope_type"], params["scope_id"] = get_scope_details(
+                    scope, LOCATION_SCOPE_TYPES
+                )
 
             for assoc, details in OPTIONAL_ASSOCS.items():
                 if assoc in params:

src/netbox_initializers/initializers/services.py

@@ -1,5 +1,5 @@
-from ipam.models import Service
 from django.contrib.contenttypes.models import ContentType
+from ipam.models import Service
 
 from netbox_initializers.initializers.base import BaseInitializer, register_initializer
 
@@ -19,9 +19,7 @@ def load_data(self):
             # Get model from Contenttype
             scope_type = params.pop("parent_type", None)
             if not scope_type:
-                print(
-                    f"Services '{params['name']}': parent_type is missing from Services"
-                )
+                print(f"Services '{params['name']}': parent_type is missing from Services")
             app_label, model = str(scope_type).split(".")
             parent_model = ContentType.objects.get(app_label=app_label, model=model).model_class()
             parent = parent_model.objects.get(name=params.pop("parent_name"))

src/netbox_initializers/initializers/users.py

@@ -13,14 +13,16 @@ def load_data(self):
             return
 
         for username, user_details in users.items():
-            api_token = user_details.pop("api_token", Token.generate_key())
+            token_data = user_details.pop("token", Token.generate_key())
             password = user_details.pop("password", get_random_string(length=25))
             user, created = User.objects.get_or_create(username=username, defaults=user_details)
             if created:
                 user.set_password(password)
                 user.save()
-                if api_token:
-                    Token.objects.get_or_create(user=user, key=api_token)
+                if token_data and "key" in token_data and "value" in token_data:
+                    Token.objects.create(
+                        user=user, key=token_data["key"], token=token_data["value"]
+                    )
                 print("👤 Created user", username)