nautobot 2.4.20__py3-none-any.whl → 2.4.21__py3-none-any.whl

nautobot/extras/templates/extras/graphqlquery_retrieve.html

@@ -1,97 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Query</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Name</td>
-                <td><span>{{ object.name }}</span></td>
-            </tr>
-            <tr>
-                <td>Query</td>
-                <td><pre id="query"><code class="language-graphql">{{ object.query }}</code></pre></td>
-            </tr>
-            <tr>
-                <td>Query Variables</td>
-                <td><pre>{{ object.variables|render_json }}</pre></td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Response</strong>
-            <button class="btn btn-primary btn-xs pull-right" onclick="test_query()">Execute</button>
-        </div>
-        {% if object.variables %}
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Variables:</td>
-                    <td><textarea id="query_variables" class="form-control">{{ object.variables|render_json:False }}</textarea></td>
-                </tr>
-            </table>
-        {% endif %}
-        <div class="panel-footer">
-                <pre id="query_output">
-
-                </pre>
-        </div>
-    </div>
-{% endblock content_right_page %}
-
-{% block javascript %}
-    {{ block.super }}
-    <script>
-        function fillQueryOutput(data) {
-            const queryOutput = document.querySelector('#query_output');
-
-            [...queryOutput.childNodes].forEach(childNode => childNode.remove());
-
-            const code = document.createElement('code');
-            code.classList.add('language-json');
-            code.textContent = JSON.stringify(data, undefined, 2);
-
-            queryOutput.appendChild(code);
-
-            hljs.highlightElement(code);
-        }
-
-        function test_query() {
-            const variables = document.querySelector('#query_variables')?.value;
-
-            $.ajax({
-                url: "{% url 'graphql' %}",
-                method: "POST",
-                headers: {"X-CSRFTOKEN": "{{ csrf_token }}"},
-                dataType: "json",
-                data: {
-                    "query": `{{ object.query | escapejs }}`,
-                    "variables": variables,
-                },
-                success: function(data) {
-                    fillQueryOutput(data);
-                },
-                error: function(error) {
-                    console.log(error);
-                    fillQueryOutput(error.responseJSON);
-                }
-            });
-        };
-
-        textarea = document.querySelector("#query_variables");
-        textarea.addEventListener('input', autoResize, false);
-        textarea.style.height = 'auto';
-        textarea.style.height = textarea.scrollHeight + 'px';
-
-        function autoResize() {
-            this.style.height = 'auto';
-            this.style.height = this.scrollHeight + 'px';
-        }
-    </script>
-{% endblock javascript %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/inc/graphqlquery_execute.html

@@ -0,0 +1,71 @@
+{% load helpers %}
+
+<div class="panel-default">
+    <div class="panel-heading">
+        <strong>Response</strong>
+        <button class="btn btn-primary btn-xs pull-right" onclick="test_query()">Execute</button>
+    </div>
+    {% if object.variables %}
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Variables:</td>
+                <td><textarea id="query_variables" class="form-control">{{ object.variables|render_json:False }}</textarea></td>
+            </tr>
+        </table>
+    {% endif %}
+    <div class="panel-footer">
+                <pre id="query_output">
+
+                </pre>
+    </div>
+</div>
+
+<script>
+    function fillQueryOutput(data) {
+        const queryOutput = document.querySelector('#query_output');
+
+        [...queryOutput.childNodes].forEach(childNode => childNode.remove());
+
+        const code = document.createElement('code');
+        code.classList.add('language-json');
+        code.textContent = JSON.stringify(data, undefined, 2);
+
+        queryOutput.appendChild(code);
+
+        hljs.highlightElement(code);
+    }
+
+    function test_query() {
+        const variables = document.querySelector('#query_variables')?.value;
+
+        $.ajax({
+            url: "{% url 'graphql' %}",
+            method: "POST",
+            headers: {"X-CSRFTOKEN": "{{ csrf_token }}"},
+            dataType: "json",
+            data: {
+                "query": `{{ object.query | escapejs }}`,
+                "variables": variables,
+            },
+            success: function(data) {
+                fillQueryOutput(data);
+            },
+            error: function(error) {
+                console.log(error);
+                fillQueryOutput(error.responseJSON);
+            }
+        });
+    };
+
+    window.addEventListener("load", () => {
+        textarea = document.querySelector("#query_variables");
+        textarea.addEventListener('input', autoResize, false);
+        textarea.style.height = 'auto';
+        textarea.style.height = textarea.scrollHeight + 'px';
+    });
+
+    function autoResize() {
+        this.style.height = 'auto';
+        this.style.height = this.scrollHeight + 'px';
+    }
+</script>

nautobot/extras/templates/extras/object_dynamicgroups.html

@@ -7,8 +7,8 @@
 {% block content %}
     <div class="alert alert-warning">
         Dynamic group membership is cached for performance reasons, therefore this page may not always be up-to-date.
-        <br>You can refresh the membership of any specific group by viewing it from the list below or from the
-        <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+        <br>You can refresh the membership of any specific group by accessing it from the list below or from the
+        <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a> and clicking the "Refresh Members" button.
         <br>You can also refresh the membership of all groups by running the
         <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
     </div>

nautobot/extras/templates/extras/secretsgroup.html

@@ -1,2 +1,2 @@
-{% extends "extras/secretsgroup_retrieve.html" %}
+{% extends "generic/object_retrieve.html" %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/tag.html

@@ -1,2 +1,2 @@
-{% extends 'extras/tag_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/tests/integration/test_dynamicgroups.py

@@ -74,8 +74,12 @@ class DynamicGroupTestCase(SeleniumTestCase):
 
         # And just a cursory check to make sure that the filter worked.
         group = DynamicGroup.objects.get(name=name)
-        self.assertEqual(group.count, Device.objects.filter(status__name="Active").count())
         self.assertEqual(group.filter, {"status": ["Active"]})
+        # Because we don't auto-refresh the members on UI create/update any more:
+        # TODO: a more complete integration test could click the "Refresh Members" JobButton, wait until the job completes,
+        #       and so forth, rather than doing so programmatically here:
+        group.update_cached_members()
+        self.assertEqual(group.count, Device.objects.filter(status__name="Active").count())
 
         # Verify dynamic group shows up on device detail tab
         self.browser.visit(

nautobot/extras/tests/test_api.py

@@ -2564,6 +2564,7 @@ class UserSavedViewAssociationTest(APIViewTestCases.APIViewTestCase):
 class ScheduledJobTest(
     APIViewTestCases.GetObjectViewTestCase,
     APIViewTestCases.ListObjectsViewTestCase,
+    APIViewTestCases.DeleteObjectViewTestCase,
 ):
     model = ScheduledJob
     choices_fields = []

nautobot/extras/tests/test_changelog.py

@@ -1,3 +1,5 @@
+import uuid
+
 from django.contrib.contenttypes.models import ContentType
 from django.test import override_settings
 from django.urls import reverse
@@ -234,6 +236,32 @@ class ChangeLogViewTest(ModelViewTestCase):
             self.assertContains(resp, escape('"description": "changed description2"'))
             self.assertContains(resp, escape('"description": "changed description3"'))
 
+    def test_objectchange_skips_add_conditional_prefetch(self):
+        """
+        Test that ObjectChange.objects.all() skips prefetch_related on ContentTypes without a model class.
+        """
+        self.add_permissions("extras.view_objectchange")
+
+        ct = ContentType.objects.create(app_label="nonexistent_app", model="nonexistentmodel")
+        oc = ObjectChange.objects.create(
+            changed_object_type=ct,
+            changed_object_id=1,
+            object_repr="nonexistentobject",
+            action=ObjectChangeActionChoices.ACTION_CREATE,
+            user=self.user,
+            object_data={},
+            request_id=uuid.uuid4(),
+        )
+        url = reverse("extras:objectchange_list")
+        with self.assertLogs(level="WARNING") as cm:
+            response = self.client.get(url)
+            self.assertHttpStatus(response, 200)
+            self.assertContains(response, oc.object_repr)
+            self.assertIn(
+                ("One or more ContentType entries in the database are invalid."),
+                cm.output[0],
+            )
+
 
 class ChangeLogAPITest(APITestCase):
     def setUp(self):

nautobot/extras/tests/test_customfields.py

@@ -2009,14 +2009,22 @@ class CustomFieldFilterTest(TestCase):
         )
 
     def test_filter_multi_select(self):
-        self.assertQuerysetEqual(
+        self.assertQuerysetEqualAndNotEmpty(
             self.filterset({"cf_cf9": "Foo"}, self.queryset).qs,
             self.queryset.filter(_custom_field_data__cf9__contains="Foo"),
         )
-        self.assertQuerysetEqual(
+        self.assertQuerysetEqualAndNotEmpty(
             self.filterset({"cf_cf9": "Bar"}, self.queryset).qs,
             self.queryset.filter(_custom_field_data__cf9__contains="Bar"),
         )
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset({"cf_cf9": ["Foo"]}, self.queryset).qs,
+            self.queryset.filter(_custom_field_data__cf9__contains="Foo"),
+        )
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset({"cf_cf9": ["Bar"]}, self.queryset).qs,
+            self.queryset.filter(_custom_field_data__cf9__contains="Bar"),
+        )
         self.assertQuerysetEqualAndNotEmpty(  # https://github.com/nautobot/nautobot/issues/5009
             self.filterset({"cf_cf9": str(self.multiselect_choices[0].pk)}, self.queryset).qs,
             self.queryset.filter(_custom_field_data__cf9__contains=self.multiselect_choices[0].value),

nautobot/extras/tests/test_dynamicgroups.py

@@ -34,6 +34,7 @@ from nautobot.extras.choices import (
 from nautobot.extras.filters import DynamicGroupFilterSet, DynamicGroupMembershipFilterSet
 from nautobot.extras.models import (
     CustomField,
+    CustomFieldChoice,
     DynamicGroup,
     DynamicGroupMembership,
     Relationship,
@@ -1022,7 +1023,7 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         self.assertEqual(sorted(dg.members.values_list("name", flat=True)), expected)
 
     def test_filter_custom_fields(self):
-        """Test that relationships can be used in filters."""
+        """Test that custom fields can be used in filters."""
 
         device = self.devices[0]
 
@@ -1053,6 +1054,41 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         expected = [str(device)]
         self.assertEqual(sorted(dg.members.values_list("name", flat=True)), expected)
 
+    def test_filter_custom_field_select(self):
+        """Test that select and multiselect type custom fields can be used in filters."""
+        device = self.devices[0]
+
+        cf1 = CustomField.objects.create(
+            label="Onboarding Status",
+            type=CustomFieldTypeChoices.TYPE_SELECT,
+        )
+        cf1.content_types.add(self.device_ct)
+        CustomFieldChoice.objects.create(custom_field=cf1, value="Onboarded", weight=100)
+        CustomFieldChoice.objects.create(custom_field=cf1, value="Yet To Be", weight=200)
+
+        cf2 = CustomField.objects.create(
+            label="Features",
+            type=CustomFieldTypeChoices.TYPE_MULTISELECT,
+        )
+        cf2.content_types.add(self.device_ct)
+        CustomFieldChoice.objects.create(custom_field=cf2, value="Telnet", weight=100)
+        CustomFieldChoice.objects.create(custom_field=cf2, value="SSH", weight=200)
+        CustomFieldChoice.objects.create(custom_field=cf2, value="NETCONF", weight=300)
+
+        device._custom_field_data = {"onboarding_status": "Onboarded", "features": ["Telnet", "SSH"]}
+        device.validated_save()
+        device.refresh_from_db()
+
+        dg = DynamicGroup(
+            name="select_fields",
+            filter={"cf_onboarding_status": ["Onboarded"], "cf_features": ["Telnet"]},
+            content_type=self.device_ct,
+        )
+        dg.validated_save()
+
+        self.assertEqual(dg.count, 1)
+        self.assertIn(device, dg.members)
+
     def test_filter_search(self):
         """Test that search (`q` filter) can be used in filters."""
 

nautobot/extras/views.py

@@ -25,6 +25,7 @@ from django_tables2 import RequestConfig
 from jsonschema.validators import Draft7Validator
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
 
 from nautobot.core.choices import ButtonActionColorChoices
 from nautobot.core.constants import PAGINATE_COUNT_DEFAULT
@@ -748,12 +749,7 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
         elif self.action == "retrieve":
             model = instance.model
             table_class = get_table_for_model(model)
-            if instance.group_type != DynamicGroupTypeChoices.TYPE_STATIC:
-                # Ensure that members cache is up-to-date for this specific group
-                members = instance.update_cached_members()
-                messages.success(request, f"Refreshed cached members list for {instance}")
-            else:
-                members = instance.members
+            members = instance.members
             if table_class is not None:
                 if hasattr(members, "without_tree_fields"):
                     members = members.without_tree_fields()
@@ -808,7 +804,7 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
 
         return context
 
-    def form_save(self, form, **kwargs):
+    def form_save(self, form, commit=True, **kwargs):
         obj = form.save(commit=False)
         context = self.get_extra_context(self.request, obj)
 
@@ -827,10 +823,18 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
                         form.add_error(None, msg)
                 raise
 
-        # After filters have been set, now we save the object to the database.
-        obj.save()
-        # Save m2m fields, such as Tags https://docs.djangoproject.com/en/3.2/topics/forms/modelforms/#the-save-method
-        form.save_m2m()
+        if commit:
+            # After filters have been set, now we save the object to the database.
+            obj.save(update_cached_members=False)
+            # Save m2m fields, such as Tags https://docs.djangoproject.com/en/3.2/topics/forms/modelforms/#the-save-method
+            form.save_m2m()
+
+            if obj.group_type != DynamicGroupTypeChoices.TYPE_STATIC:
+                messages.warning(
+                    self.request,
+                    "Dynamic Group membership is not automatically recalculated after creating/editing the group, "
+                    'as it may take some time to complete. You can use the "Refresh Members" button when ready.',
+                )
 
         # Process the formsets for children
         children = context.get("children")
@@ -845,7 +849,7 @@ class DynamicGroupUIViewSet(NautobotUIViewSet):
                         added_errors.add(msg)
             raise ValidationError("invalid DynamicGroupMembershipFormSet")
 
-        if children:
+        if commit and children:
             children.save()
 
         return obj
@@ -1144,6 +1148,7 @@ class GitRepositoryUIViewSet(NautobotUIViewSet):
     filterset_class = filters.GitRepositoryFilterSet
     serializer_class = serializers.GitRepositorySerializer
     table_class = tables.GitRepositoryTable
+    view_titles = Titles(titles={"result": "{{ object.display|default:object }} - Synchronization Status"})
 
     def get_extra_context(self, request, instance=None):
         context = super().get_extra_context(request, instance)
@@ -1187,14 +1192,18 @@ class GitRepositoryUIViewSet(NautobotUIViewSet):
         job_result = instance.get_latest_sync()
 
         context = {
+            **super().get_extra_context(request, instance),
             "result": job_result or {},
-            "base_template": "extras/gitrepository.html",
+            "base_template": "extras/configcontextschema_retrieve.html",
             "object": instance,
             "active_tab": "result",
             "verbose_name": instance._meta.verbose_name,
         }
 
-        return render(request, "extras/gitrepository_result.html", context)
+        return Response(
+            context,
+            template_name="extras/gitrepository_result.html",
+        )
 
     @action(
         detail=True,
@@ -1241,6 +1250,27 @@ class GraphQLQueryUIViewSet(
     table_class = tables.GraphQLQueryTable
     action_buttons = ("add",)
 
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                label="Query",
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields=["name", "query", "variables"],
+                value_transforms={
+                    "query": [lambda val: format_html('<pre><code class="language-graphql">{}</code></pre>', val)],
+                    "variables": [lambda val: helpers.render_json(val, syntax_highlight=True, pretty_print=True)],
+                },
+            ),
+            object_detail.Panel(
+                weight=100,
+                section=object_detail.SectionChoices.RIGHT_HALF,
+                body_content_template_path="extras/inc/graphqlquery_execute.html",
+                body_wrapper_template_path="components/panel/body_wrapper_table.html",
+            ),
+        )
+    )
+
 
 #
 # Image attachments
@@ -1539,7 +1569,7 @@ class JobRunView(ObjectPermissionRequiredMixin, View):
 
 class JobView(generic.ObjectView):
     queryset = JobModel.objects.all()
-    template_name = "extras/job_detail.html"
+    template_name = "generic/object_retrieve.html"
     object_detail_content = object_detail.ObjectDetailContent(
         panels=[
             object_detail.ObjectFieldsPanel(
@@ -2362,7 +2392,7 @@ class ObjectChangeLogView(generic.GenericView):
 
         return render(
             request,
-            "extras/object_changelog.html",
+            "generic/object_changelog.html",
             {
                 "object": obj,
                 "verbose_name": obj._meta.verbose_name,
@@ -2569,7 +2599,7 @@ class ObjectNotesView(generic.GenericView):
 
         return render(
             request,
-            "extras/object_notes.html",
+            "generic/object_notes.html",
             {
                 "object": obj,
                 "verbose_name": obj._meta.verbose_name,
@@ -3063,8 +3093,8 @@ class WebhookUIViewSet(NautobotUIViewSet):
 
 
 class JobObjectChangeLogView(ObjectChangeLogView):
-    base_template = "extras/job_detail.html"
+    base_template = "generic/object_retrieve.html"
 
 
 class JobObjectNotesView(ObjectNotesView):
-    base_template = "extras/job_detail.html"
+    base_template = "generic/object_retrieve.html"

nautobot/ipam/signals.py

@@ -5,6 +5,7 @@ from django.db.models.signals import m2m_changed, pre_delete, pre_save
 from django.dispatch import receiver
 
 from nautobot.ipam.models import (
+    IPAddress,
     IPAddressToInterface,
     Prefix,
     PrefixLocationAssignment,
@@ -136,3 +137,73 @@ def assert_locations_content_types(sender, instance, action, reverse, model, pk_
             raise ValidationError(
                 {key: f"{instance} is a {instance.location_type} and may not have {label} associated to it."}
             )
+
+
+def _validate_interface_ipaddress_assignments(sender, instance, pk_set, interface_field):
+    """
+    Helper function to validate IPAddressToInterface instances on Interface and VMInterface objects after M2M operations.
+
+    For example:
+        * interface.ip_addresses.add(ip_address)
+        * vm_interface.ip_addresses.add(ip_address)
+
+    Args:
+        sender: The through model class (IPAddressToInterface)
+        instance: The interface instance (Interface or VMInterface)
+        pk_set: Set of IP address PKs being modified
+        interface_field: Field name to filter on ('interface' or 'vm_interface')
+    """
+    # Get the through model instances that were just created
+    filter_kwargs = {interface_field: instance, "ip_address_id__in": pk_set}
+    through_instances = sender.objects.filter(**filter_kwargs)
+
+    # Validate each through model instance
+    for through_instance in through_instances:
+        through_instance.full_clean()
+
+
+def _validate_ipaddress_interface_assignments(sender, instance, pk_set, interface_model):
+    """
+    Helper function to validate IPAddressToInterface instances on IPAddress objects after M2M operations.
+
+    For example:
+        * ip_address.interfaces.add(interface)
+        * ip_address.vm_interfaces.add(vm_interface)
+
+    Args:
+        sender: The through model class (IPAddressToInterface)
+        instance: The interface instance (Interface or VMInterface)
+        pk_set: Set of IP address PKs being modified
+        interface_model: Field name to filter on ('interface' or 'vm_interface')
+    """
+    filter_kwargs = {"ip_address": instance, interface_model + "_id__in": pk_set}
+    through_instances = sender.objects.filter(**filter_kwargs)
+    for through_instance in through_instances:
+        through_instance.full_clean()
+
+
+@receiver(m2m_changed, sender=IPAddressToInterface)
+def validate_interface_ip_assignments(sender, instance, action, pk_set, **kwargs):
+    """
+    Validate IPAddressToInterface instances after M2M operations.
+
+    Handles both physical Interface and VMInterface IP assignments.
+    Since Django's M2M add() with through_defaults bypasses save() methods,
+    we validate the through model instances via signal handler.
+    """
+    from nautobot.dcim.models import Interface
+    from nautobot.virtualization.models import VMInterface
+
+    if action == "post_add" and pk_set:
+        # Route to appropriate validation based on instance type
+        if isinstance(instance, Interface):
+            _validate_interface_ipaddress_assignments(sender, instance, pk_set, "interface")
+        elif isinstance(instance, VMInterface):
+            _validate_interface_ipaddress_assignments(sender, instance, pk_set, "vm_interface")
+        elif isinstance(instance, IPAddress):
+            interface_model = kwargs["model"]
+
+            if interface_model == Interface:
+                _validate_ipaddress_interface_assignments(sender, instance, pk_set, "interface")
+            elif interface_model == VMInterface:
+                _validate_ipaddress_interface_assignments(sender, instance, pk_set, "vm_interface")

nautobot/ipam/templates/ipam/prefix_delete.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_delete.html' %}
+{% extends 'generic/object_destroy.html' %}
 
 {% block message_extra %}
     <p>Note: This will <strong>not</strong> delete any child prefixes or IP addresses.</p>

nautobot/ipam/templates/ipam/service.html

@@ -1,2 +1,2 @@
-{% extends 'ipam/service_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/vlan.html

@@ -1,2 +1,2 @@
-{% extends 'ipam/vlan_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/vlan_interfaces.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/vlan.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block content %}
     <div class="row">

nautobot/ipam/templates/ipam/vlan_vminterfaces.html

@@ -1,4 +1,4 @@
-{% extends 'ipam/vlan.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block content %}
     <div class="row">

nautobot/ipam/tests/test_models.py

@@ -172,6 +172,48 @@ class IPAddressToInterfaceTest(TestCase):
             IPAddressToInterface.objects.create(vm_interface=None, interface=None, ip_address=ip_addr)
         self.assertIn("Must associate to either an Interface or a VMInterface.", str(cm.exception))
 
+    def test_m2m_save_signal_prevents_iface_ipaddress_and_vminterface_through_defaults(self):
+        """Test that the m2m save signal prevents a VMInterface from using the same IPAddressToInterface instance as an Interface."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+        with self.assertRaises(ValidationError) as cm:
+            self.test_int1.ip_addresses.add(ip_addr, through_defaults={"vm_interface": self.test_vmint1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
+    def test_m2m_save_signal_prevents_vminterface_ipaddress_and_interface_through_defaults(self):
+        """Test that the m2m save signal prevents an Interface from using the same IPAddressToInterface instance as a VMInterface."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+        with self.assertRaises(ValidationError) as cm:
+            self.test_vmint1.ip_addresses.add(ip_addr, through_defaults={"interface": self.test_int1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
+    def test_m2m_save_signal_prevents_ipaddress_interface_and_vminterface_through_defaults(self):
+        """Test that the m2m save signal prevents an Interface being added to an IPAddress with a VMInterface through_defaults."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+
+        with self.assertRaises(ValidationError) as cm:
+            ip_addr.interfaces.add(self.test_int1, through_defaults={"vm_interface": self.test_vmint1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
+    def test_m2m_save_signal_prevents_ipaddress_vminterface_and_interface_through_defaults(self):
+        """Test that the m2m save signal prevents a VMInterface being added to an IPAddress with an Interface through_defaults."""
+        ip_addr = IPAddress.objects.create(address="192.0.2.1/24", status=self.status, namespace=self.namespace)
+
+        with self.assertRaises(ValidationError) as cm:
+            ip_addr.vm_interfaces.add(self.test_vmint1, through_defaults={"interface": self.test_int1})
+
+        self.assertIn(
+            "Cannot use a single instance to associate to both an Interface and a VMInterface.", str(cm.exception)
+        )
+
     def test_primary_ip_retained_when_deleted_from_device_or_module_interface(self):
         """Test primary_ip4 remains set when the same IP is assigned to multiple interfaces and deleted from one."""