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

nautobot/core/ui/object_detail.py

@@ -532,6 +532,7 @@ class Panel(Component):
         self,
         *,
         label="",
+        css_class="default",
         section=SectionChoices.FULL_WIDTH,
         body_id=None,
         body_content_template_path=None,
@@ -546,6 +547,7 @@ class Panel(Component):
 
         Args:
             label (str): Label to display for this panel. Optional; if an empty string, the panel will have no label.
+            css_class (str): Panel variant to render as, e.g. "default", "warning", "info".
             section (str): One of the [`SectionChoices`](./ui.md#nautobot.apps.ui.SectionChoices) values, indicating the layout section this Panel belongs to.
             body_id (str): HTML element `id` to attach to the rendered body wrapper of the panel.
             body_content_template_path (str): Template path to render the content contained *within* the panel body.
@@ -557,6 +559,7 @@ class Panel(Component):
                 (a `div` or `table`) as well as its contents. Generally you won't override this as a user.
         """
         self.label = label
+        self.css_class = css_class
         self.section = section
         self.body_id = body_id
         self.body_content_template_path = body_content_template_path
@@ -583,6 +586,7 @@ class Panel(Component):
                 self.template_path,
                 context,
                 label=self.render_label(context),
+                css_class=self.css_class,
                 header_extra_content=self.render_header_extra_content(context),
                 body=self.render_body(context),
                 footer_content=self.render_footer_content(context),
@@ -1609,7 +1613,7 @@ class StatsPanel(Panel):
         instance = get_obj_from_context(context)
         request = context["request"]
         if isinstance(instance, TreeModel):
-            self.filter_pks = (
+            self.filter_pks = list(
                 instance.descendants(include_self=True).restrict(request.user, "view").values_list("pk", flat=True)
             )
         else:
@@ -1625,9 +1629,10 @@ class StatsPanel(Panel):
                 else:
                     related_object_model_class, query = related_field, f"{self.filter_name}__in"
                 filter_dict = {query: self.filter_pks}
-                related_object_count = (
-                    related_object_model_class.objects.restrict(request.user, "view").filter(**filter_dict).count()
-                )
+                qs = related_object_model_class.objects.restrict(request.user, "view").filter(**filter_dict)
+                if len(self.filter_pks) > 1:
+                    qs = qs.distinct()
+                related_object_count = qs.count()
                 related_object_model_class_meta = related_object_model_class._meta
                 related_object_list_url = validated_viewname(related_object_model_class, "list")
                 related_object_title = bettertitle(related_object_model_class_meta.verbose_name_plural)
@@ -2034,6 +2039,36 @@ class _ObjectDetailContactsTab(Tab):
         )
 
 
+class DynamicGroupsTextPanel(BaseTextPanel):
+    """Panel displaying a note about caching of dynamic groups."""
+
+    def __init__(
+        self,
+        *,
+        weight,
+        render_as=BaseTextPanel.RenderOptions.MARKDOWN,
+        label="Dynamic Group caching",
+        css_class="warning",
+        **kwargs,
+    ):
+        super().__init__(weight=weight, render_as=render_as, label=label, css_class=css_class, **kwargs)
+
+    def get_value(self, context):
+        dg_list_url = reverse("extras:dynamicgroup_list")
+        job_run_url = reverse(
+            "extras:job_run_by_class_path",
+            kwargs={"class_path": "nautobot.core.jobs.groups.RefreshDynamicGroupCaches"},
+        )
+        return (
+            "Dynamic group membership is cached for performance reasons, "
+            "therefore this page may not always be up-to-date.\n\n"
+            "You can refresh the membership of any specific group by accessing it from the list below or from the "
+            f'[Dynamic Groups list view]({dg_list_url}) and clicking the "Refresh Members" button.\n\n'
+            "You can also refresh the membership of **all** groups by running the "
+            f"[Refresh Dynamic Group Caches job]({job_run_url})."
+        )
+
+
 @dataclass
 class _ObjectDetailGroupsTab(Tab):
     """Built-in class for a Tab displaying information about associated dynamic groups."""
@@ -2050,8 +2085,9 @@ class _ObjectDetailGroupsTab(Tab):
     ):
         if panels is None:
             panels = (
+                DynamicGroupsTextPanel(weight=100),
                 ObjectsTablePanel(
-                    weight=100,
+                    weight=200,
                     table_class=DynamicGroupTable,
                     table_attribute="dynamic_groups",
                     exclude_columns=["content_type"],

nautobot/core/utils/filtering.py

@@ -17,6 +17,15 @@ from nautobot.core.utils.lookup import get_filterset_for_model
 # e.g `name__ic` has lookup expr `ic (icontains)` while `name` has no lookup expr
 CONTAINS_LOOKUP_EXPR_RE = re.compile(r"(?<=__)\w+")
 
+MODEL_VERBOSE_NAME_PLURAL_TO_FEATURE_NAME_MAPPING = {
+    "cables": "cable_terminations",
+    "metadata_types": "metadata",
+    "object_metadata": "metadata",
+    "location_types": "locations",
+    "static_group_associations": "dynamic_groups",
+    "relationship_associations": "relationships",
+}
+
 
 def build_lookup_label(field_name, _verbose_name):
     """
@@ -131,18 +140,11 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
     elif isinstance(
         field, ContentTypeMultipleChoiceFilter
     ):  # While there are other objects using `ContentTypeMultipleChoiceFilter`, the case where
-        # models that have such a filter and the `verbose_name_plural` has multiple words is ony one: "dynamic groups".
+        # models that have such a filter and the `verbose_name_plural` does not match, we can lookup the feature name.
         from nautobot.core.models.fields import slugify_dashes_to_underscores  # Avoid circular import
 
         plural_name = slugify_dashes_to_underscores(model._meta.verbose_name_plural)
-
-        # Cable-connectable models use "cable_terminations", not "cables", as the feature name
-        if plural_name == "cables":
-            plural_name = "cable_terminations"
-        elif plural_name == "metadata_types":
-            plural_name = "metadata"
-        elif plural_name == "object_metadata":
-            plural_name = "metadata"
+        plural_name = MODEL_VERBOSE_NAME_PLURAL_TO_FEATURE_NAME_MAPPING.get(plural_name, plural_name)
         try:
             form_field = MultipleContentTypeField(choices_as_strings=True, feature=plural_name)
         except KeyError:

nautobot/core/views/generic.py

@@ -580,7 +580,7 @@ class ObjectDeleteView(UIComponentsMixin, GetReturnURLMixin, ObjectPermissionReq
     """
 
     queryset: Optional[QuerySet] = None  # TODO: required, declared Optional only to avoid a breaking change
-    template_name = "generic/object_delete.html"
+    template_name = "generic/object_destroy.html"
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, "delete")
@@ -1037,7 +1037,7 @@ class BulkEditView(
     filterset: Optional[type[FilterSet]] = None
     table: Optional[type[Table]] = None  # TODO: required, declared Optional only to avoid a breaking change
     form: Optional[type[Form]] = None  # TODO: required, declared Optional only to avoid a breaking change
-    template_name = "generic/object_bulk_edit.html"
+    template_name = "generic/object_bulk_update.html"
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, "change")
@@ -1239,7 +1239,7 @@ class BulkDeleteView(
     filterset: Optional[type[FilterSet]] = None
     table: Optional[type[Table]] = None  # TODO: required, declared Optional only to avoid a breaking change
     form: Optional[type[Form]] = None
-    template_name = "generic/object_bulk_delete.html"
+    template_name = "generic/object_bulk_destroy.html"
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, "delete")

nautobot/dcim/models/device_components.py

@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db import models, transaction
+from django.db import models
 from django.db.models import Sum
 from django.utils.functional import classproperty
 
@@ -595,6 +595,86 @@ class BaseInterface(RelationshipModel):
 
         return super().save(*args, **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.
+        """
+        through_defaults = {
+            "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,
+        }
+
+        if not isinstance(ip_addresses, (tuple, list)):
+            ip_addresses = [ip_addresses]
+
+        # This ensures that ips_to_add only contains IPs which need to be added to the interface. This ensures
+        # that len(ips_to_add) accurately represents the results of the action.
+        ips_to_add = set(ip_addresses) - set(self.ip_addresses.all())
+
+        if ips_to_add:
+            self.ip_addresses.add(*ips_to_add, through_defaults=through_defaults)  # pylint: disable=no-member  # Intf/VMIntf both have ip_addresses
+
+        return len(ips_to_add)
+
+    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.
+        """
+        if not isinstance(ip_addresses, (tuple, list)):
+            ip_addresses = [ip_addresses]
+
+        # The delete() call used previously (ref: https://github.com/nautobot/nautobot/issues/3236)
+        # meant that if None was passed in, it was silently ignored. Rather that raise an exception,
+        # this comprehension maintains backwards compatibility.
+        ip_addresses = {ip for ip in ip_addresses if ip is not None}
+
+        # This checks that the IPs passed in are actually on the interface. By populating
+        # ips_to_remove correctly, we ensure that the only IPs passed to remove() are IPs known
+        # to be on the interface. This ensures that len(ips_to_remove) accurately represents
+        # the results of the action.
+        ips_to_remove = ip_addresses & set(self.ip_addresses.all())
+
+        if ips_to_remove:
+            self.ip_addresses.remove(*ips_to_remove)  # pylint: disable=no-member  # Intf/VMIntf both have ip_addresses
+
+        return len(ips_to_remove)
+
+    remove_ip_addresses.alters_data = True
+
 
 @extras_features(
     "cable_terminations",
@@ -797,73 +877,6 @@ class Interface(ModularComponentModel, CableTermination, PathEndpoint, BaseInter
                         }
                     )
 
-    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,
-                    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, interface=self)
-                deleted_count, _ = qs.delete()
-                count += deleted_count
-        return count
-
-    remove_ip_addresses.alters_data = True
-
     @property
     def is_connectable(self):
         return self.type not in NONCONNECTABLE_IFACE_TYPES

nautobot/dcim/templates/dcim/device/config.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ object }} - Config{% endblock %}
 

nautobot/dcim/templates/dcim/device/consoleports.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/consoleserverports.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/devicebays.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/frontports.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/interfaces.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/inventory.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/lldp_neighbors.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block title %}{{ object }} - LLDP Neighbors{% endblock %}

nautobot/dcim/templates/dcim/device/modulebays.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/poweroutlets.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/powerports.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/rearports.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device/status.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block title %}{{ object }} - Status{% endblock %}

nautobot/dcim/templates/dcim/device/wireless.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/device/base.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/dcim/templates/dcim/device.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block javascript %}

nautobot/dcim/templates/dcim/device_interface_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 interfaces of this interface.{% endblock %}

nautobot/dcim/templates/dcim/devicetype.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/devicetype_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/dcim/templates/dcim/footer_convert_to_contact_or_team_record.html

@@ -0,0 +1,14 @@
+{% load perms %}
+{% load helpers %}
+{% if perms.dcim.contact_association %}
+    {% if object.contact_name or object.contact_phone or object.contact_email %}
+        {% with request.path|add:"?tab=contacts"|urlencode as return_url %}
+            <div class="text-right noprint">
+                <a href="{% url 'dcim:location_migrate_data_to_contact' pk=object.pk %}?return_url={{ return_url }}" class="btn btn-primary btn-xs">
+                    <span class="mdi mdi-account-edit" aria-hidden="true"></span>
+                    Convert to contact/team record
+                </a>
+            </div>
+        {% endwith %}
+    {% endif %}
+{% endif %}

nautobot/dcim/templates/dcim/interface_bulk_delete.html

@@ -1,3 +1,3 @@
-{% extends 'generic/object_bulk_delete.html' %}
+{% extends 'generic/object_bulk_destroy.html' %}
 
 {% block message_extra %}This would also delete any/all child interfaces of these interfaces.{% endblock %}

nautobot/dcim/templates/dcim/inventoryitem_bulk_delete.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_bulk_delete.html' %}
+{% extends 'generic/object_bulk_destroy.html' %}
 
 {% block message_extra %}
     <p class="text-center text-danger"><i class="mdi mdi-alert"></i> This will also delete all child inventory items of those listed.</p>