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

nautobot/users/templates/users/sessionkey_delete.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_delete.html' %}
+{% extends 'generic/object_destroy.html' %}
 
 {% block message %}
     <p>Are you sure you want to delete your session key?</p>

nautobot/users/views.py

@@ -339,7 +339,7 @@ class TokenDeleteView(GenericView):
 
         return render(
             request,
-            "generic/object_delete.html",
+            "generic/object_destroy.html",
             {
                 "obj": token,
                 "obj_type": token._meta.verbose_name,
@@ -358,7 +358,7 @@ class TokenDeleteView(GenericView):
 
         return render(
             request,
-            "generic/object_delete.html",
+            "generic/object_destroy.html",
             {
                 "obj": token,
                 "obj_type": token._meta.verbose_name,

nautobot/virtualization/models.py

@@ -1,6 +1,6 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
-from django.db import models, transaction
+from django.db import models
 
 from nautobot.core.constants import CHARFIELD_MAX_LENGTH
 from nautobot.core.models import BaseManager
@@ -400,73 +400,6 @@ class VMInterface(PrimaryModel, BaseInterface):
 
         return super().to_objectchange(action, related_object=virtual_machine, **kwargs)
 
-    def add_ip_addresses(
-        self,
-        ip_addresses,
-        is_source=False,
-        is_destination=False,
-        is_default=False,
-        is_preferred=False,
-        is_primary=False,
-        is_secondary=False,
-        is_standby=False,
-    ):
-        """Add one or more IPAddress instances to this interface's `ip_addresses` many-to-many relationship.
-
-        Args:
-            ip_addresses (:obj:`list` or `IPAddress`): Instance of `nautobot.ipam.models.IPAddress` or list of `IPAddress` instances.
-            is_source (bool, optional): Is source address. Defaults to False.
-            is_destination (bool, optional): Is destination address. Defaults to False.
-            is_default (bool, optional): Is default address. Defaults to False.
-            is_preferred (bool, optional): Is preferred address. Defaults to False.
-            is_primary (bool, optional): Is primary address. Defaults to False.
-            is_secondary (bool, optional): Is secondary address. Defaults to False.
-            is_standby (bool, optional): Is standby address. Defaults to False.
-
-        Returns:
-            Number of instances added.
-        """
-        if not isinstance(ip_addresses, (tuple, list)):
-            ip_addresses = [ip_addresses]
-        with transaction.atomic():
-            for ip in ip_addresses:
-                instance = self.ip_addresses.through(
-                    ip_address=ip,
-                    vm_interface=self,
-                    is_source=is_source,
-                    is_destination=is_destination,
-                    is_default=is_default,
-                    is_preferred=is_preferred,
-                    is_primary=is_primary,
-                    is_secondary=is_secondary,
-                    is_standby=is_standby,
-                )
-                instance.validated_save()
-        return len(ip_addresses)
-
-    add_ip_addresses.alters_data = True
-
-    def remove_ip_addresses(self, ip_addresses):
-        """Remove one or more IPAddress instances from this interface's `ip_addresses` many-to-many relationship.
-
-        Args:
-            ip_addresses (:obj:`list` or `IPAddress`): Instance of `nautobot.ipam.models.IPAddress` or list of `IPAddress` instances.
-
-        Returns:
-            Number of instances removed.
-        """
-        count = 0
-        if not isinstance(ip_addresses, (tuple, list)):
-            ip_addresses = [ip_addresses]
-        with transaction.atomic():
-            for ip in ip_addresses:
-                qs = self.ip_addresses.through.objects.filter(ip_address=ip, vm_interface=self)
-                deleted_count, _ = qs.delete()
-                count += deleted_count
-        return count
-
-    remove_ip_addresses.alters_data = True
-
     @property
     def parent(self):
         return self.virtual_machine

nautobot/virtualization/templates/virtualization/virtual_machine_vminterface_delete.html

@@ -1,3 +1,3 @@
-{% extends 'generic/object_delete.html' %}
+{% extends 'generic/object_destroy.html' %}
 
 {% block message_extra %}This would also delete any/all child VMInterfaces of this VMInterface.{% endblock %}

nautobot/virtualization/templates/virtualization/virtualmachine.html

@@ -1,2 +1,2 @@
-{% extends 'virtualization/virtualmachine_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/virtualization/tests/test_models.py

@@ -140,6 +140,11 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
         self.assertEqual(count, 1)
         self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ips[-1], vm_interface=vm_interface).count(), 1)
 
+        # add a single instance which is already there
+        count = vm_interface.add_ip_addresses(ips[-1])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ips[-1], vm_interface=vm_interface).count(), 1)
+
         # add multiple instances
         count = vm_interface.add_ip_addresses(ips[:5])
         self.assertEqual(count, 5)
@@ -147,6 +152,20 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
         for ip in ips[:5]:
             self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ip, vm_interface=vm_interface).count(), 1)
 
+        # add multiple instances all of which are already there
+        count = vm_interface.add_ip_addresses(ips[:5])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 6)
+        for ip in ips[:5]:
+            self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ip, vm_interface=vm_interface).count(), 1)
+
+        # add multiple IPs some of which are there
+        count = vm_interface.add_ip_addresses(ips[3:7])
+        self.assertEqual(count, 2)
+        self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 8)
+        for ip in ips[3:7]:
+            self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ip, vm_interface=vm_interface).count(), 1)
+
     def test_remove_ip_addresses(self):
         """Test the `remove_ip_addresses` helper method on `VMInterface`"""
         vm_interface = VMInterface.objects.create(
@@ -165,13 +184,28 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
         self.assertEqual(count, 1)
         self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 9)
 
+        # remove a single instance which has already been removed
+        count = vm_interface.remove_ip_addresses(ips[-1])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 9)
+
         # remove multiple instances
         count = vm_interface.remove_ip_addresses(ips[:5])
         self.assertEqual(count, 5)
         self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 4)
 
+        # remove multiple instances all which have already been removed
+        count = vm_interface.remove_ip_addresses(ips[:5])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 4)
+
+        # remove multiple instances some of which have already been removed
+        count = vm_interface.remove_ip_addresses(ips[3:7])
+        self.assertEqual(count, 2)
+        self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 2)
+
         count = vm_interface.remove_ip_addresses(ips)
-        self.assertEqual(count, 4)
+        self.assertEqual(count, 2)
         self.assertEqual(IPAddressToInterface.objects.filter(vm_interface=vm_interface).count(), 0)
 
         # Test the pre_delete signal for IPAddressToInterface instances
@@ -180,9 +214,14 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
         self.virtualmachine.primary_ip6 = vm_interface.ip_addresses.all().filter(ip_version=6).first()
         self.virtualmachine.save()
 
-        vm_interface.remove_ip_addresses(self.virtualmachine.primary_ip4)
+        count = vm_interface.remove_ip_addresses(self.virtualmachine.primary_ip4)
+        self.assertEqual(count, 1)
         self.virtualmachine.refresh_from_db()
         self.assertEqual(self.virtualmachine.primary_ip4, None)
-        vm_interface.remove_ip_addresses(self.virtualmachine.primary_ip6)
+        # NOTE: This effectively tests what happens when you pass remove_ip_addresses None; it
+        # NOTE: does not remove a v6 address, because there are no v6 IPs created in this test
+        # NOTE: class.
+        count = vm_interface.remove_ip_addresses(self.virtualmachine.primary_ip6)
+        self.assertEqual(count, 0)
         self.virtualmachine.refresh_from_db()
         self.assertEqual(self.virtualmachine.primary_ip6, None)

{nautobot-2.4.20.dist-info → nautobot-2.4.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nautobot
-Version: 2.4.20
+Version: 2.4.21
 Summary: Source of truth and network automation platform.
 License: Apache-2.0
 Keywords: Nautobot
@@ -24,16 +24,16 @@ Requires-Dist: Django (>=4.2.25,<4.3.0)
 Requires-Dist: GitPython (>=3.1.45,<3.2.0)
 Requires-Dist: Jinja2 (>=3.1.6,<3.2.0)
 Requires-Dist: Markdown (>=3.8.2,<3.9.0)
-Requires-Dist: Pillow (>=11.0,<12.0)
+Requires-Dist: Pillow (>=12.0.0,<12.1.0)
 Requires-Dist: PyYAML (>=6.0.3,<6.1.0)
 Requires-Dist: celery (>=5.5.3,<5.6.0)
-Requires-Dist: cryptography (>=45.0.7,<45.1.0)
+Requires-Dist: cryptography (>=46.0.3,<46.1.0)
 Requires-Dist: django-ajax-tables (>=1.1.1,<1.2.0)
 Requires-Dist: django-auth-ldap (>=5.2.0,<5.3.0) ; extra == "all" or extra == "ldap"
 Requires-Dist: django-celery-beat (>=2.7.0,<2.8.0)
 Requires-Dist: django-celery-results (>=2.6.0,<2.7.0)
 Requires-Dist: django-constance (>=4.3.2,<4.4.0)
-Requires-Dist: django-cors-headers (>=4.7.0,<4.8.0)
+Requires-Dist: django-cors-headers (>=4.9.0,<4.10.0)
 Requires-Dist: django-db-file-storage (>=0.5.6.1,<0.6.0.0)
 Requires-Dist: django-extensions (>=4.1,<4.2)
 Requires-Dist: django-filter (>=25.1,<25.2)
@@ -43,15 +43,15 @@ Requires-Dist: django-prometheus (>=2.4.1,<2.5.0)
 Requires-Dist: django-redis (>=6.0.0,<6.1.0)
 Requires-Dist: django-silk (>=5.4.3,<5.5.0)
 Requires-Dist: django-storages (>=1.14.6,<1.15.0) ; extra == "all" or extra == "remote-storage"
-Requires-Dist: django-structlog[celery] (>=9.1.1,<10.0.0)
+Requires-Dist: django-structlog[celery] (>=10.0.0,<10.1.0)
 Requires-Dist: django-tables2 (>=2.7.5,<2.8.0)
 Requires-Dist: django-taggit (>=6.1.0,<6.2.0)
 Requires-Dist: django-timezone-field (>=7.1,<7.2)
-Requires-Dist: django-tree-queries (>=0.20.0,<0.21.0)
+Requires-Dist: django-tree-queries (>=0.21.2,<0.22.0)
 Requires-Dist: django-webserver (>=1.2.0,<1.3.0)
 Requires-Dist: djangorestframework (>=3.16.1,<3.17.0)
 Requires-Dist: drf-spectacular[sidecar] (>=0.28.0,<0.29.0)
-Requires-Dist: emoji (>=2.14.1,<2.15.0)
+Requires-Dist: emoji (>=2.15.0,<2.16.0)
 Requires-Dist: graphene-django (>=2.16.0,<2.17.0)
 Requires-Dist: graphene-django-optimizer (>=0.8.0,<0.9.0)
 Requires-Dist: jsonschema (>=4.7.0,<5.0.0)
@@ -62,12 +62,12 @@ Requires-Dist: netaddr (>=1.3.0,<1.4.0)
 Requires-Dist: netutils (>=1.14.0,<2.0.0)
 Requires-Dist: nh3 (>=0.3.1,<0.4.0)
 Requires-Dist: packaging (>=23.1)
-Requires-Dist: prometheus-client (>=0.22.1,<0.23.0)
+Requires-Dist: prometheus-client (>=0.23.1,<0.24.0)
 Requires-Dist: psycopg2-binary (>=2.9.11,<2.10.0)
 Requires-Dist: python-slugify (>=8.0.4,<8.1.0)
 Requires-Dist: pyuwsgi (>=2.0.30,<2.1.0)
 Requires-Dist: social-auth-app-django (>=5.4.3,<5.5.0)
-Requires-Dist: social-auth-core[saml] (>=4.7.0,<4.8.0) ; extra == "all" or extra == "sso"
+Requires-Dist: social-auth-core[saml] (>=4.8.1,<4.9.0) ; extra == "all" or extra == "sso"
 Requires-Dist: svgwrite (>=1.4.3,<1.5.0)
 Project-URL: Documentation, https://docs.nautobot.com
 Project-URL: Homepage, https://nautobot.com