netbox-interface-name-rules 1.2.2__tar.gz → 1.2.3__tar.gz

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-interface-name-rules
-Version: 1.2.2
+Version: 1.2.3
 Summary: NetBox plugin for automatic interface renaming when modules are installed
 Author: Marcin Zieba
 License-Expression: Apache-2.0
@@ -23,10 +23,6 @@ Dynamic: license-file
 
 # NetBox Interface Name Rules Plugin
 
-<p align="center">
-  <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/icon.svg" alt="NetBox Interface Name Rules" width="80"/>
-</p>
-
 [![PyPI](https://img.shields.io/pypi/v/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![CI](https://img.shields.io/github/actions/workflow/status/marcinpsk/netbox-InterfaceNameRules-plugin/test.yaml?branch=main&label=tests)](https://github.com/marcinpsk/netbox-InterfaceNameRules-plugin/actions/workflows/test.yaml)
@@ -35,6 +31,7 @@ Dynamic: license-file
 [![Python](https://img.shields.io/pypi/pyversions/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![NetBox](https://img.shields.io/badge/NetBox-%E2%89%A54.2.0-blue)](https://github.com/netbox-community/netbox)
 [![Contributors](https://img.shields.io/github/contributors/marcinpsk/netbox-InterfaceNameRules-plugin)](https://github.com/marcinpsk/netbox-InterfaceNameRules-plugin/graphs/contributors)
+[![REUSE status](https://api.reuse.software/badge/github.com/marcinpsk/netbox-InterfaceNameRules-plugin)](https://api.reuse.software/info/github.com/marcinpsk/netbox-InterfaceNameRules-plugin)
 
 Automatic interface renaming when modules are installed into NetBox device bays.
 
@@ -83,6 +80,9 @@ Rules are managed through the NetBox UI under **Plugins → Interface Name Rules
 See the [full configuration guide](https://marcinpsk.github.io/netbox-InterfaceNameRules-plugin/configuration/) for all rule fields, priority scoring, and template variable reference.
 
 ## Screenshots
+<p align="center">
+  <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/icon.svg" alt="NetBox Interface Name Rules" width="30"/>
+</p>
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/screenshots/01-rule-list.png" alt="Rule list" width="700"/>

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/README.md

@@ -1,9 +1,5 @@
 # NetBox Interface Name Rules Plugin
 
-<p align="center">
-  <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/icon.svg" alt="NetBox Interface Name Rules" width="80"/>
-</p>
-
 [![PyPI](https://img.shields.io/pypi/v/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![CI](https://img.shields.io/github/actions/workflow/status/marcinpsk/netbox-InterfaceNameRules-plugin/test.yaml?branch=main&label=tests)](https://github.com/marcinpsk/netbox-InterfaceNameRules-plugin/actions/workflows/test.yaml)
@@ -12,6 +8,7 @@
 [![Python](https://img.shields.io/pypi/pyversions/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![NetBox](https://img.shields.io/badge/NetBox-%E2%89%A54.2.0-blue)](https://github.com/netbox-community/netbox)
 [![Contributors](https://img.shields.io/github/contributors/marcinpsk/netbox-InterfaceNameRules-plugin)](https://github.com/marcinpsk/netbox-InterfaceNameRules-plugin/graphs/contributors)
+[![REUSE status](https://api.reuse.software/badge/github.com/marcinpsk/netbox-InterfaceNameRules-plugin)](https://api.reuse.software/info/github.com/marcinpsk/netbox-InterfaceNameRules-plugin)
 
 Automatic interface renaming when modules are installed into NetBox device bays.
 
@@ -60,6 +57,9 @@ Rules are managed through the NetBox UI under **Plugins → Interface Name Rules
 See the [full configuration guide](https://marcinpsk.github.io/netbox-InterfaceNameRules-plugin/configuration/) for all rule fields, priority scoring, and template variable reference.
 
 ## Screenshots
+<p align="center">
+  <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/icon.svg" alt="NetBox Interface Name Rules" width="30"/>
+</p>
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/screenshots/01-rule-list.png" alt="Rule list" width="700"/>
@@ -86,4 +86,4 @@ Apache 2.0
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for how to submit code or interface name rules.
 
-Community-contributed rules for various vendors are in the [`contrib/`](contrib/) directory.
+Community-contributed rules for various vendors are in the [`contrib/`](contrib/) directory.

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/__init__.py

@@ -2,7 +2,7 @@
 # Copyright (C) 2025 Marcin Zieba <marcinpsk@gmail.com>
 from netbox.plugins import PluginConfig
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 
 
 class InterfaceNameRulesConfig(PluginConfig):

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/engine.py

@@ -10,7 +10,8 @@ import ast
 import logging
 import re
 
-from django.db import transaction
+from django.core.exceptions import ValidationError
+from django.db import IntegrityError, transaction
 from django.db.models.functions import Length
 
 logger = logging.getLogger(__name__)
@@ -128,7 +129,7 @@ def _try_rename_device_interface(rule, iface, vc_position, device, renamed_pks):
 
     try:
         new_name = evaluate_name_template(rule.name_template, variables)
-    except Exception:
+    except (ValueError, TypeError, re.error):
         logger.exception(
             "Failed to evaluate template %r for interface %s (rule %s)",
             rule.name_template,
@@ -144,7 +145,7 @@ def _try_rename_device_interface(rule, iface, vc_position, device, renamed_pks):
     iface.name = new_name
     try:
         iface.full_clean()
-    except Exception:
+    except ValidationError:
         logger.exception(
             "Validation failed for device interface %s → %s (rule %s, device %s)",
             old_name,
@@ -156,7 +157,7 @@ def _try_rename_device_interface(rule, iface, vc_position, device, renamed_pks):
         return False
     try:
         iface.save()
-    except Exception:
+    except (IntegrityError, ValidationError):
         logger.exception(
             "DB save failed for device interface %s → %s (rule %s, device %s)",
             old_name,
@@ -401,7 +402,7 @@ def _resolve_bay_position(module_bay):
         digits = _extract_trailing_digits(module_bay.name)
         bay_position = digits if digits else "0"
     digits = _extract_trailing_digits(bay_position)
-    bay_position_num = digits if digits else bay_position
+    bay_position_num = digits if digits else "0"
     return bay_position, bay_position_num
 
 
@@ -524,6 +525,8 @@ def _find_channel_base(rule, ifaces, variables):
     _apply_rule_to_interface exactly ONCE per module for channel rules, preventing
     duplicate-name IntegrityErrors when channels already exist.
     """
+    if not ifaces:
+        return None
     for iface in ifaces:
         vars_copy = dict(variables)
         vars_copy["base"] = iface.name
@@ -568,7 +571,7 @@ def has_applicable_interfaces(rule) -> bool:
     try:
         results, _ = find_interfaces_for_rule(rule, limit=1)
         return len(results) > 0
-    except Exception:
+    except (ValueError, re.error):
         return False
 
 
@@ -608,6 +611,8 @@ def _evaluate_plain_interface(rule, module, iface, variables) -> dict | None:
 def _channel_rule_entry(rule, module, ifaces, variables) -> dict | None:
     """Return a result dict if the channel rule would change any name for this module, else None."""
     base_iface = _find_channel_base(rule, ifaces, variables)
+    if base_iface is None:
+        return None
     vars_copy = {**variables, "base": base_iface.name}
     expected_names = []
     try:
@@ -680,6 +685,8 @@ def find_interfaces_for_rule(rule, limit=None):
     If *limit* is set the list is truncated after that many changed entries, but
     *total_checked* always reflects the full count of interfaces examined.
     """
+    from collections import defaultdict
+
     from dcim.models import Interface
 
     module_qs = _build_module_qs(rule).select_related(
@@ -693,13 +700,18 @@ def find_interfaces_for_rule(rule, limit=None):
     )
     process_fn = _process_channel_module if rule.channel_count > 0 else _process_plain_module
 
-    processed_pks = []
+    # Batch-load all interfaces for matching modules to avoid N+1 queries.
+    ifaces_by_module = defaultdict(list)
+    for iface in Interface.objects.filter(module__in=module_qs).order_by("module_id", "name"):
+        ifaces_by_module[iface.module_id].append(iface)
+
+    processed_pks = set()
     results = []
     total_checked = 0
     for module in module_qs:
-        processed_pks.append(module.pk)
+        processed_pks.add(module.pk)
         variables = build_variables(module.module_bay, device=module.device)
-        ifaces = list(Interface.objects.filter(module=module).order_by("name"))
+        ifaces = ifaces_by_module.get(module.pk, [])
         checked, stop = process_fn(rule, module, ifaces, variables, limit, results, module_qs, processed_pks)
         total_checked += checked
         if stop:
@@ -726,6 +738,8 @@ def apply_rule_to_existing(rule, limit=None, interface_ids=None):
 
     Returns the number of interfaces renamed/created.
     """
+    from collections import defaultdict
+
     from dcim.models import Interface
 
     id_set = frozenset(interface_ids) if interface_ids is not None else None
@@ -737,15 +751,20 @@ def apply_rule_to_existing(rule, limit=None, interface_ids=None):
 
     module_qs = _build_module_qs(rule)
 
+    # Batch-load interfaces to avoid N+1 queries in the module loop.
+    ifaces_by_module = defaultdict(list)
+    for iface in Interface.objects.filter(module__in=module_qs).order_by("module_id", "name"):
+        ifaces_by_module[iface.module_id].append(iface)
+
     count = 0
     for module in module_qs.select_related("module_bay", "module_type", "device", "device__virtual_chassis"):
         variables = build_variables(module.module_bay, device=module.device)
+        ifaces = ifaces_by_module.get(module.pk, [])
 
         if rule.channel_count > 0:
             # Channel rule: process module ONCE using the best base interface.
             # Calling _apply_rule_to_interface for each existing interface would
             # attempt to create the same channel names multiple times.
-            ifaces = list(Interface.objects.filter(module=module).order_by("name"))
             if not ifaces:
                 continue
             base_iface = _find_channel_base(rule, ifaces, variables)
@@ -755,7 +774,7 @@ def apply_rule_to_existing(rule, limit=None, interface_ids=None):
             vars_copy["base"] = base_iface.name
             try:
                 count += _apply_rule_to_interface(rule, base_iface, vars_copy, module)
-            except Exception:
+            except (ValueError, ValidationError, IntegrityError):
                 logger.exception(
                     "Failed to apply channel rule '%s' to module '%s' (id=%s); skipping.",
                     rule,
@@ -763,14 +782,14 @@ def apply_rule_to_existing(rule, limit=None, interface_ids=None):
                     module.pk,
                 )
         else:
-            for iface in list(Interface.objects.filter(module=module).order_by("name")):
+            for iface in ifaces:
                 if id_set is not None and iface.pk not in id_set:
                     continue
                 vars_copy = dict(variables)
                 vars_copy["base"] = iface.name
                 try:
                     count += _apply_rule_to_interface(rule, iface, vars_copy, module)
-                except Exception:
+                except (ValueError, ValidationError, IntegrityError):
                     logger.exception(
                         "Failed to apply rule '%s' to interface '%s' (id=%s); skipping.",
                         rule,

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/filters.py

@@ -53,7 +53,7 @@ class InterfaceNameRuleFilterSet(NetBoxModelFilterSet):
 
     def search(self, queryset, name, value):
         """Filter by pattern, template, description, or module type model name."""
-        return queryset.filter(
+        return queryset.select_related("module_type").filter(
             Q(module_type_pattern__icontains=value)
             | Q(name_template__icontains=value)
             | Q(description__icontains=value)

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/signals.py

@@ -37,6 +37,7 @@ def on_module_pre_save(sender, instance, **kwargs):
         old = sender.objects.filter(pk=instance.pk).values("module_type_id").first()
         instance._prev_module_type_id = old["module_type_id"] if old else None
     except Exception:
+        logger.warning("Failed to capture previous module_type_id for Module pk=%s", instance.pk, exc_info=True)
         instance._prev_module_type_id = None
 
 
@@ -141,6 +142,7 @@ def on_device_pre_save(sender, instance, **kwargs):
         instance._prev_virtual_chassis_id = old["virtual_chassis_id"] if old else None
         instance._prev_vc_position = old["vc_position"] if old else None
     except Exception:
+        logger.warning("Failed to capture previous VC state for Device pk=%s", instance.pk, exc_info=True)
         instance._prev_virtual_chassis_id = None
         instance._prev_vc_position = None
 

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/tests/test_api.py

@@ -116,6 +116,20 @@ class InterfaceNameRuleAPITest(APITestCase):
         response = self.client.post(url, data, format="json", **self.header)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
+    def test_create_with_both_module_type_and_pattern_fails(self):
+        """POST with both module_type FK and module_type_pattern set is rejected."""
+        url = self._get_list_url()
+        data = {
+            "module_type": self.module_type.pk,
+            "module_type_is_regex": True,
+            "module_type_pattern": "QSFP-.*",
+            "name_template": "port{bay_position}",
+            "channel_count": 0,
+            "channel_start": 0,
+        }
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
     def test_update_rule_to_regex(self):
         """PATCH a rule to switch it to regex mode."""
         rule = InterfaceNameRule.objects.create(

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/tests/test_device_rules.py

@@ -283,3 +283,49 @@ class ApplyDeviceInterfaceRulesModuleTypeTest(TestCase):
         self.assertEqual(result, 1)
         iface.refresh_from_db()
         self.assertEqual(iface.name, "Gi2/3")
+
+
+class DeviceInterfaceEdgeCaseNamesTest(TestCase):
+    """Test _try_rename_device_interface with edge-case interface names."""
+
+    @classmethod
+    def setUpTestData(cls):
+        mfg = Manufacturer.objects.create(name="EdgeMfg", slug="edgemfg")
+        cls.device_type = DeviceType.objects.create(manufacturer=mfg, model="Edge-Dev", slug="edge-dev")
+        role = DeviceRole.objects.create(name="EdgeRole", slug="edgerole")
+        site = Site.objects.create(name="EdgeSite", slug="edgesite")
+        vc = VirtualChassis.objects.create(name="edge-vc")
+        cls.device = Device.objects.create(
+            name="edge-sw1",
+            device_type=cls.device_type,
+            role=role,
+            site=site,
+            virtual_chassis=vc,
+            vc_position=1,
+        )
+
+    def test_name_with_multiple_slashes(self):
+        """Interface name like FortyGigE1/2/3/4 extracts port='4'."""
+        InterfaceNameRule.objects.create(
+            applies_to_device_interfaces=True,
+            name_template="Fo{vc_position}/2/3/{port}",
+        )
+        iface = Interface.objects.create(
+            device=self.device, name="FortyGigE1/2/3/4", type="40gbase-x-qsfpp", module=None
+        )
+        result = apply_device_interface_rules(self.device)
+        self.assertEqual(result, 1)
+        iface.refresh_from_db()
+        self.assertEqual(iface.name, "Fo1/2/3/4")
+
+    def test_name_without_slash(self):
+        """Interface name without / uses full name as port."""
+        InterfaceNameRule.objects.create(
+            applies_to_device_interfaces=True,
+            name_template="eth{vc_position}-{port}",
+        )
+        iface = Interface.objects.create(device=self.device, name="eth0", type="1000base-t", module=None)
+        result = apply_device_interface_rules(self.device)
+        self.assertEqual(result, 1)
+        iface.refresh_from_db()
+        self.assertEqual(iface.name, "eth1-eth0")

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/tests/test_engine.py

@@ -101,3 +101,15 @@ class EvaluateNameTemplateTest(TestCase):
             {},
         )
         self.assertEqual(result, "port4")
+
+    def test_bay_position_num_non_numeric_uses_zero(self):
+        """When bay_position has no trailing digits, bay_position_num falls back to '0'."""
+        from netbox_interface_name_rules.engine import _resolve_bay_position
+
+        class FakeBay:
+            position = "abc"
+            name = "Bay abc"
+
+        bay_position, bay_position_num = _resolve_bay_position(FakeBay())
+        self.assertEqual(bay_position, "abc")
+        self.assertEqual(bay_position_num, "0")

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/tests/test_engine_advanced.py

@@ -19,7 +19,6 @@ from dcim.models import (
     Site,
     VirtualChassis,
 )
-from django.db import DatabaseError
 from django.test import TestCase
 
 from netbox_interface_name_rules.engine import (
@@ -265,9 +264,12 @@ class ApplyRuleToExistingTest(EngineAdvancedFixtures):
             enabled=False,
         )
         module = Module.objects.create(device=self.device, module_bay=self.bay0, module_type=self.module_type)
-        Interface.objects.create(device=self.device, module=module, name="0", type="10gbase-x-sfpp")
+        iface = Interface.objects.create(device=self.device, module=module, name="0", type="10gbase-x-sfpp")
         result = apply_rule_to_existing(rule)
         self.assertEqual(result, 0)
+        # Verify interface name is unchanged
+        iface.refresh_from_db()
+        self.assertEqual(iface.name, "0")
 
     def test_renames_matching_interface(self):
         """apply_rule_to_existing renames interfaces matching the rule."""
@@ -781,7 +783,7 @@ class EngineHasApplicableExceptionTest(TestCase):
 
         with patch(
             "netbox_interface_name_rules.engine.find_interfaces_for_rule",
-            side_effect=RuntimeError("scan fail"),
+            side_effect=ValueError("scan fail"),
         ):
             result = has_applicable_interfaces(self.rule)
         self.assertFalse(result)
@@ -984,7 +986,9 @@ class EngineRenameDeviceInterfaceExceptionTest(TestCase):
             name_template="GigabitEthernet{vc_position}/{port}",
         )
         Interface.objects.create(device=self.device, name="Gi0/2", type="1000base-t")
-        with patch("dcim.models.Interface.full_clean", side_effect=Exception("validation fail")):
+        from django.core.exceptions import ValidationError as DjangoValidationError
+
+        with patch("dcim.models.Interface.full_clean", side_effect=DjangoValidationError("validation fail")):
             apply_device_interface_rules(self.device)
         # Even with exception, no unhandled error
         rule.delete()
@@ -1217,7 +1221,7 @@ class ApplyRuleExceptionInLoopTest(EngineAdvancedFixtures):
         def _side_effect(*args, **kwargs):
             call_count[0] += 1
             if call_count[0] >= 2:
-                raise RuntimeError("forced failure on second call")
+                raise ValueError("forced failure on second call")
             return _real_fn(*args, **kwargs)
 
         with patch("netbox_interface_name_rules.engine._apply_rule_to_interface", side_effect=_side_effect):
@@ -1249,7 +1253,7 @@ class ApplyRuleExceptionInLoopTest(EngineAdvancedFixtures):
         def _side_effect(*args, **kwargs):
             call_count[0] += 1
             if call_count[0] >= 2:
-                raise RuntimeError("forced channel failure")
+                raise ValueError("forced channel failure")
             return _real_fn(*args, **kwargs)
 
         with patch("netbox_interface_name_rules.engine._apply_rule_to_interface", side_effect=_side_effect):
@@ -1400,7 +1404,9 @@ class DeviceInterfaceSaveExceptionTest(TestCase):
         )
         iface = Interface.objects.create(device=self.device, name="Gi0/1", type="1000base-t")
 
-        with patch.object(Interface, "save", side_effect=DatabaseError("disk full")):
+        from django.db import IntegrityError
+
+        with patch.object(Interface, "save", side_effect=IntegrityError("disk full")):
             result = _try_rename_device_interface(rule, iface, "1", self.device, set())
 
         self.assertFalse(result)
@@ -1508,3 +1514,110 @@ class RegexTiebreakerTest(TestCase):
         self.assertLess(rule_short.pk, rule_long.pk)
         matched = find_matching_rule(module_type_specific, None, None)
         self.assertEqual(matched, rule_long)
+
+
+# ---------------------------------------------------------------------------
+# engine.py — _find_channel_base with empty interface list
+# ---------------------------------------------------------------------------
+
+
+class FindChannelBaseEmptyIfacesTest(TestCase):
+    """Test _find_channel_base handles empty interface list gracefully."""
+
+    def test_empty_ifaces_returns_none(self):
+        """_find_channel_base returns None when ifaces is empty."""
+        rule = MagicMock()
+        rule.name_template = "port{bay_position}:{channel}"
+        rule.channel_start = 0
+        variables = {"bay_position": "0", "bay_position_num": "0", "slot": "0"}
+        result = _find_channel_base(rule, [], variables)
+        self.assertIsNone(result)
+
+
+# ---------------------------------------------------------------------------
+# engine.py — find_interfaces_for_rule uses set for processed_pks
+# ---------------------------------------------------------------------------
+
+
+class FindInterfacesProcessedPksTest(EngineAdvancedFixtures):
+    """Test find_interfaces_for_rule correctness with multiple modules."""
+
+    def test_multiple_modules_all_counted(self):
+        """find_interfaces_for_rule processes all matching modules without duplication."""
+        rule = InterfaceNameRule.objects.create(
+            module_type=self.module_type,
+            name_template="et-0/0/{bay_position}",
+        )
+        module0 = Module.objects.create(device=self.device, module_bay=self.bay0, module_type=self.module_type)
+        module1 = Module.objects.create(device=self.device, module_bay=self.bay1, module_type=self.module_type)
+        Interface.objects.create(device=self.device, module=module0, name="0", type="10gbase-x-sfpp")
+        Interface.objects.create(device=self.device, module=module1, name="1", type="10gbase-x-sfpp")
+
+        results, total = find_interfaces_for_rule(rule)
+        self.assertEqual(total, 2)
+        self.assertEqual(len(results), 2)
+        result_module_ids = {r["module"].pk for r in results}
+        self.assertEqual(result_module_ids, {module0.pk, module1.pk})
+
+
+# ---------------------------------------------------------------------------
+# engine.py — breakout transaction rollback on mid-channel failure
+# ---------------------------------------------------------------------------
+
+
+class BreakoutTransactionRollbackTest(EngineAdvancedFixtures):
+    """Test that _apply_rule_to_interface rolls back on mid-breakout failure."""
+
+    def test_partial_breakout_rolls_back(self):
+        """If channel 2 fails validation, channels 0–1 are rolled back too."""
+        rule = InterfaceNameRule.objects.create(
+            module_type=self.module_type,
+            name_template="Hu0/0/0/{bay_position}:{channel}",
+            channel_count=4,
+            channel_start=0,
+        )
+        module = Module.objects.create(device=self.device, module_bay=self.bay0, module_type=self.module_type)
+        iface = Interface.objects.create(device=self.device, module=module, name="0", type="100gbase-x-qsfp28")
+
+        original_full_clean = Interface.full_clean
+        call_count = [0]
+
+        def failing_full_clean(self_iface, *args, **kwargs):
+            call_count[0] += 1
+            if call_count[0] == 3:  # Fail on channel 2
+                from django.core.exceptions import ValidationError
+
+                raise ValidationError("simulated failure")
+            return original_full_clean(self_iface, *args, **kwargs)
+
+        from netbox_interface_name_rules.engine import _apply_rule_to_interface
+
+        variables = build_variables(module.module_bay, device=module.device)
+        variables["base"] = iface.name
+
+        from django.core.exceptions import ValidationError
+
+        with patch.object(Interface, "full_clean", failing_full_clean):
+            with self.assertRaises(ValidationError):
+                _apply_rule_to_interface(rule, iface, variables, module)
+
+        # Transaction rolled back — only the original interface remains
+        iface_names = list(Interface.objects.filter(module=module).values_list("name", flat=True))
+        self.assertEqual(iface_names, ["0"])
+
+
+# ---------------------------------------------------------------------------
+# engine.py — _get_raw_interface_names with no templates
+# ---------------------------------------------------------------------------
+
+
+class GetRawInterfaceNamesNoTemplatesTest(EngineAdvancedFixtures):
+    """Test _get_raw_interface_names when module_type has no InterfaceTemplate entries."""
+
+    def test_no_templates_returns_empty_set(self):
+        """_get_raw_interface_names returns empty set when module_type has no templates."""
+        from netbox_interface_name_rules.engine import _get_raw_interface_names
+
+        module = Module.objects.create(device=self.device, module_bay=self.bay0, module_type=self.module_type)
+        result = _get_raw_interface_names(module)
+        self.assertEqual(result, set())

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/tests/test_rules.py

@@ -122,6 +122,30 @@ class FindMatchingRuleTest(TestCase):
         result = find_matching_rule(self.module_type, None, None)
         self.assertIsNone(result)
 
+    def test_platform_none_does_not_match_platform_scoped_rule(self):
+        """With platform=None, a platform-scoped rule is NOT matched."""
+        InterfaceNameRule.objects.create(
+            module_type=self.module_type,
+            platform=self.platform,
+            name_template="platform-only{bay_position}",
+        )
+        result = find_matching_rule(self.module_type, None, None, platform=None)
+        self.assertIsNone(result)
+
+    def test_platform_none_falls_back_to_unscoped_rule(self):
+        """With platform=None, an unscoped rule is preferred over a platform-scoped one."""
+        InterfaceNameRule.objects.create(
+            module_type=self.module_type,
+            platform=self.platform,
+            name_template="platform{bay_position}",
+        )
+        unscoped = InterfaceNameRule.objects.create(
+            module_type=self.module_type,
+            name_template="generic{bay_position}",
+        )
+        result = find_matching_rule(self.module_type, None, None, platform=None)
+        self.assertEqual(result, unscoped)
+
 
 class BuildVariablesTest(TestCase):
     """Test build_variables from module bay context."""

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/tests/test_signals.py

@@ -504,3 +504,40 @@ class ModuleDeletionCascadeTest(TestCase):
 
         # Interface was cascade-deleted with the module
         self.assertFalse(Interface.objects.filter(pk=iface_pk).exists())
+
+
+class ModulePreSaveExceptionLoggingTest(TestCase):
+    """Test on_module_pre_save logs exceptions instead of silently swallowing them."""
+
+    @classmethod
+    def setUpTestData(cls):
+        mfg = Manufacturer.objects.create(name="PreSaveLogMfg", slug="presavelogmfg")
+        cls.device_type = DeviceType.objects.create(manufacturer=mfg, model="PSL-Dev", slug="psl-dev")
+        cls.module_type = ModuleType.objects.create(manufacturer=mfg, model="PSL-SFP", part_number="PSL-SFP")
+        ModuleBayTemplate.objects.create(device_type=cls.device_type, name="Bay 0", position="0")
+        role = DeviceRole.objects.create(name="PSLRole", slug="pslrole")
+        site = Site.objects.create(name="PSLSite", slug="pslsite")
+        cls.device = Device.objects.create(name="psl-dev-01", device_type=cls.device_type, role=role, site=site)
+        cls.bay = ModuleBay.objects.get(device=cls.device, name="Bay 0")
+
+    def test_pre_save_db_error_logs_warning(self):
+        """on_module_pre_save logs a warning when DB lookup fails."""
+        from django.db import DatabaseError
+
+        module = Module.objects.create(device=self.device, module_bay=self.bay, module_type=self.module_type)
+        with patch.object(Module.objects, "filter", side_effect=DatabaseError("db error")):
+            with self.assertLogs("netbox_interface_name_rules", level="WARNING") as cm:
+                on_module_pre_save(Module, module)
+        self.assertIsNone(module._prev_module_type_id)
+        self.assertTrue(any("db error" in msg for msg in cm.output))
+
+    def test_device_pre_save_db_error_logs_warning(self):
+        """on_device_pre_save logs a warning when DB lookup fails."""
+        from django.db import DatabaseError
+
+        with patch.object(Device.objects, "filter", side_effect=DatabaseError("db error")):
+            with self.assertLogs("netbox_interface_name_rules", level="WARNING") as cm:
+                on_device_pre_save(Device, self.device)
+        self.assertIsNone(self.device._prev_virtual_chassis_id)
+        self.assertIsNone(self.device._prev_vc_position)
+        self.assertTrue(any("db error" in msg for msg in cm.output))

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/tests/test_views.py

@@ -369,6 +369,54 @@ class RuleTestViewGetWithRuleIdTest(ViewTestBase2):
         self.assertEqual(response.status_code, 200)
 
 
+class RuleTestViewPermissionTest(ViewTestBase2):
+    """Test RuleTestView permission checks for unprivileged users."""
+
+    def _url(self):
+        return reverse("plugins:netbox_interface_name_rules:interfacenamerule_test")
+
+    def test_get_no_permission_raises_403(self):
+        """GET to rule test view without add_interfacenamerule permission returns 403."""
+        User.objects.create_user(username="noperm_test_get", password=TEST_PASSWORD)
+        self.client.login(username="noperm_test_get", password=TEST_PASSWORD)
+        response = self.client.get(self._url())
+        self.assertEqual(response.status_code, 403)
+
+    def test_get_with_rule_id_no_permission_raises_403(self):
+        """GET with ?rule_id= without add_interfacenamerule permission returns 403."""
+        User.objects.create_user(username="noperm_test_get2", password=TEST_PASSWORD)
+        self.client.login(username="noperm_test_get2", password=TEST_PASSWORD)
+        response = self.client.get(self._url() + f"?rule_id={self.rule.pk}")
+        self.assertEqual(response.status_code, 403)
+
+    def test_post_no_permission_raises_403(self):
+        """POST to rule test view without add_interfacenamerule permission returns 403."""
+        User.objects.create_user(username="noperm_test_post", password=TEST_PASSWORD)
+        self.client.login(username="noperm_test_post", password=TEST_PASSWORD)
+        data = {
+            "name_template": "et-0/0/{bay_position}",
+            "channel_count": "0",
+            "channel_start": "0",
+        }
+        response = self.client.post(self._url(), data)
+        self.assertEqual(response.status_code, 403)
+
+
+class RuleApplyDetailViewGetPermissionTest(ViewTestBase2):
+    """Test RuleApplyDetailView.get() permission check for unprivileged users."""
+
+    def test_get_no_change_permission_raises_403(self):
+        """GET apply detail without dcim.change_interface permission returns 403."""
+        User.objects.create_user(username="noperm_apply_get", password=TEST_PASSWORD)
+        self.client.login(username="noperm_apply_get", password=TEST_PASSWORD)
+        url = reverse(
+            "plugins:netbox_interface_name_rules:interfacenamerule_apply_detail",
+            kwargs={"pk": self.rule.pk},
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 403)
+
+
 class RuleApplyDetailViewPostTest(ViewTestBase2):
     """Test RuleApplyDetailView.post() — foreground apply, background job, no permission."""
 

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules/views.py

@@ -10,6 +10,7 @@ from django.core.exceptions import PermissionDenied
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
+from django.utils.http import url_has_allowed_host_and_scheme
 from django.views import View
 from netbox.views import generic
 from utilities.views import ConditionalLoginRequiredMixin, register_model_view
@@ -115,7 +116,7 @@ class InterfaceNameRuleDuplicateView(ConditionalLoginRequiredMixin, View):
         """Redirect to the add view pre-populated with fields cloned from rule pk."""
         from utilities.querydict import prepare_cloned_fields
 
-        rule = get_object_or_404(InterfaceNameRule.objects.all(), pk=pk)
+        rule = get_object_or_404(InterfaceNameRule, pk=pk)
         params = prepare_cloned_fields(rule)
         url = reverse("plugins:netbox_interface_name_rules:interfacenamerule_add")
         return redirect(f"{url}?{params.urlencode()}")
@@ -126,8 +127,13 @@ class RuleTestView(ConditionalLoginRequiredMixin, View):
 
     template_name = "netbox_interface_name_rules/rule_test.html"
 
+    def _check_permission(self, request):
+        if not request.user.has_perm("netbox_interface_name_rules.add_interfacenamerule"):
+            raise PermissionDenied
+
     def get(self, request):
         """Render the test form, pre-populated from rule_id query param if given."""
+        self._check_permission(request)
         initial = {}
         loaded_rule = None
         rule_id = request.GET.get("rule_id")
@@ -153,6 +159,7 @@ class RuleTestView(ConditionalLoginRequiredMixin, View):
 
     def post(self, request):
         """Evaluate the submitted template and return a preview or redirect to save."""
+        self._check_permission(request)
         form = RuleTestForm(request.POST)
         preview_results = None
         db_preview = None
@@ -347,10 +354,15 @@ class RuleApplyDetailView(ConditionalLoginRequiredMixin, View):
 
     template_name = "netbox_interface_name_rules/rule_apply_detail.html"
 
+    def _check_permission(self, request):
+        if not request.user.has_perm("dcim.change_interface"):
+            raise PermissionDenied
+
     def get(self, request, pk):
         """Render a preview of all interfaces that would be renamed by this rule."""
         from .engine import find_interfaces_for_rule
 
+        self._check_permission(request)
         rule = get_object_or_404(InterfaceNameRule, pk=pk)
         try:
             preview, total_checked = find_interfaces_for_rule(rule, limit=APPLY_BATCH_LIMIT)
@@ -379,8 +391,7 @@ class RuleApplyDetailView(ConditionalLoginRequiredMixin, View):
         """Apply the rule (foreground batch or background job) and redirect back."""
         from .engine import apply_rule_to_existing
 
-        if not request.user.has_perm("dcim.change_interface"):
-            raise PermissionDenied
+        self._check_permission(request)
 
         rule = get_object_or_404(InterfaceNameRule, pk=pk)
         action = request.POST.get("action", "apply")
@@ -436,8 +447,6 @@ class RuleToggleView(generic.ObjectView):
             return JsonResponse({"enabled": rule.enabled, "pk": pk})
         state = "enabled" if rule.enabled else "disabled"
         messages.success(request, f"Rule '{rule}' {state}.")
-        from django.utils.http import url_has_allowed_host_and_scheme
-
         referer = request.META.get("HTTP_REFERER", "")
         if referer and url_has_allowed_host_and_scheme(
             referer, allowed_hosts={request.get_host()}, require_https=request.is_secure()

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/netbox_interface_name_rules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-interface-name-rules
-Version: 1.2.2
+Version: 1.2.3
 Summary: NetBox plugin for automatic interface renaming when modules are installed
 Author: Marcin Zieba
 License-Expression: Apache-2.0
@@ -23,10 +23,6 @@ Dynamic: license-file
 
 # NetBox Interface Name Rules Plugin
 
-<p align="center">
-  <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/icon.svg" alt="NetBox Interface Name Rules" width="80"/>
-</p>
-
 [![PyPI](https://img.shields.io/pypi/v/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![CI](https://img.shields.io/github/actions/workflow/status/marcinpsk/netbox-InterfaceNameRules-plugin/test.yaml?branch=main&label=tests)](https://github.com/marcinpsk/netbox-InterfaceNameRules-plugin/actions/workflows/test.yaml)
@@ -35,6 +31,7 @@ Dynamic: license-file
 [![Python](https://img.shields.io/pypi/pyversions/netbox-interface-name-rules)](https://pypi.org/project/netbox-interface-name-rules/)
 [![NetBox](https://img.shields.io/badge/NetBox-%E2%89%A54.2.0-blue)](https://github.com/netbox-community/netbox)
 [![Contributors](https://img.shields.io/github/contributors/marcinpsk/netbox-InterfaceNameRules-plugin)](https://github.com/marcinpsk/netbox-InterfaceNameRules-plugin/graphs/contributors)
+[![REUSE status](https://api.reuse.software/badge/github.com/marcinpsk/netbox-InterfaceNameRules-plugin)](https://api.reuse.software/info/github.com/marcinpsk/netbox-InterfaceNameRules-plugin)
 
 Automatic interface renaming when modules are installed into NetBox device bays.
 
@@ -83,6 +80,9 @@ Rules are managed through the NetBox UI under **Plugins → Interface Name Rules
 See the [full configuration guide](https://marcinpsk.github.io/netbox-InterfaceNameRules-plugin/configuration/) for all rule fields, priority scoring, and template variable reference.
 
 ## Screenshots
+<p align="center">
+  <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/icon.svg" alt="NetBox Interface Name Rules" width="30"/>
+</p>
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/marcinpsk/netbox-InterfaceNameRules-plugin/main/docs/screenshots/01-rule-list.png" alt="Rule list" width="700"/>

{netbox_interface_name_rules-1.2.2 → netbox_interface_name_rules-1.2.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-interface-name-rules"
-version = "1.2.2"
+version = "1.2.3"
 description = "NetBox plugin for automatic interface renaming when modules are installed"
 readme = "README.md"
 requires-python = ">=3.12.0"
@@ -57,7 +57,7 @@ dev = [
     "pytest-django",
     "pytest-cov>=6.0",
     "python-semantic-release",
-    "django>=5.1,<6.0",
+    "django>=5.1,<7.0",
 ]
 docs = [
     "mkdocs>=1,<2",