nautobot 3.0.0a3__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/core/ui/object_detail.py

@@ -4,7 +4,6 @@ import contextlib
 from dataclasses import dataclass
 from enum import Enum
 import logging
-from typing import Any
 import uuid
 
 from django.contrib.contenttypes.models import ContentType
@@ -43,7 +42,7 @@ from nautobot.core.templatetags.helpers import (
 from nautobot.core.ui.choices import LayoutChoices, SectionChoices
 from nautobot.core.ui.echarts import EChartsBase
 from nautobot.core.ui.utils import render_component_template
-from nautobot.core.utils.lookup import get_filterset_for_model, get_route_for_model
+from nautobot.core.utils.lookup import get_filterset_for_model, get_route_for_model, get_view_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.utils import get_obj_from_context
@@ -247,6 +246,9 @@ class Button(Component):
         """
         if self.link_name and self.link_includes_pk:
             obj = get_obj_from_context(context, self.context_object_key)
+            if not obj:
+                logger.warning("Button %s has no object to link to", self.label)
+                return None
             return reverse(self.link_name, kwargs={"pk": obj.pk})
         elif self.link_name:
             return reverse(self.link_name)
@@ -310,6 +312,7 @@ class FormButton(Button):
         self,
         form_id: str,
         link_name: str,
+        render_on_tab_id="__all__",
         template_path="components/button/formbutton.html",
         **kwargs,
     ):
@@ -331,7 +334,7 @@ class FormButton(Button):
         if not self.form_id:
             raise ValueError("FormButton requires 'form_id' to be set in ObjectsTablePanel.")
 
-        super().__init__(link_name=link_name, template_path=template_path, **kwargs)
+        super().__init__(link_name=link_name, render_on_tab_id=render_on_tab_id, template_path=template_path, **kwargs)
 
     def get_extra_context(self, context: Context):
         return {
@@ -768,6 +771,7 @@ class ObjectsTablePanel(Panel):
         select_related_fields=None,
         prefetch_related_fields=None,
         order_by_fields=None,
+        # TODO: Is `table_title` redundant with the base Panel's `label`?
         table_title=None,
         max_display_count=None,
         paginate=True,
@@ -778,6 +782,8 @@ class ObjectsTablePanel(Panel):
         add_permissions=None,
         hide_hierarchy_ui=False,
         related_field_name=None,
+        related_list_url_name=None,
+        enable_related_link=True,
         enable_bulk_actions=False,
         tab_id=None,
         body_wrapper_template_path="components/panel/body_wrapper_table.html",
@@ -829,6 +835,11 @@ class ObjectsTablePanel(Panel):
             hide_hierarchy_ui (bool, optional): Don't display hierarchy-based indentation of tree models in this table
             related_field_name (str, optional): The name of the filter/form field for the related model that links back
                 to the base model. Defaults to the same as `table_filter` if unset. Used to populate URLs.
+            related_list_url_name (str, optional): The URL used to generate the list button URL for the related model.
+                If not provided, the default table's model `list` route is used.
+                This can be useful when the related model is a many-to-many relationship with a custom through table.
+            enable_related_link (bool, optional): If True, the badge on the related model will be a link to the related model list view.
+                When False, the badge will still show the count of the related model, but will not be a link.
             enable_bulk_actions (bool, optional): Show the pk toggle columns on the table if the user has the
                 appropriate permissions.
             tab_id (str, optional): The ID of the tab this panel belongs to. Used to append to a `return_url` when
@@ -879,6 +890,8 @@ class ObjectsTablePanel(Panel):
         self.add_permissions = add_permissions or []
         self.hide_hierarchy_ui = hide_hierarchy_ui
         self.related_field_name = related_field_name
+        self.related_list_url_name = related_list_url_name
+        self.enable_related_link = enable_related_link
         self.enable_bulk_actions = enable_bulk_actions
         self.tab_id = tab_id
         self.footer_buttons = footer_buttons
@@ -905,7 +918,12 @@ class ObjectsTablePanel(Panel):
         related_field_name = self.related_field_name or self.table_filter or obj._meta.model_name
         return_url = context.get("return_url", obj.get_absolute_url())
         if self.tab_id:
-            return_url += f"?tab={self.tab_id}"
+            try:
+                # Check to see if the this is a NautobotUIViewset action
+                view = get_view_for_model(obj._meta.model)
+                return_url += getattr(view, self.tab_id).url_path + "/"
+            except AttributeError:
+                return_url += f"?tab={self.tab_id}"
 
         if self.add_button_route is not None:
             add_permissions = self.add_permissions
@@ -1034,29 +1052,35 @@ class ObjectsTablePanel(Panel):
         body_content_table_model = body_content_table.Meta.model
         related_field_name = self.related_field_name or self.table_filter or obj._meta.model_name
 
-        list_url = getattr(self.table_class, "list_url", None)
-        if not list_url:
-            list_url = get_route_for_model(body_content_table_model, "list")
+        body_content_table_list_url = None
+        body_content_table_add_url = self._get_table_add_url(context)
+        table_title = self.table_title or body_content_table_model._meta.verbose_name_plural
 
-        try:
-            list_route = reverse(list_url)
-        except NoReverseMatch:
-            list_route = None
+        if self.enable_related_link:
+            list_url = self.related_list_url_name or getattr(self.table_class, "list_url", None)
+            if not list_url:
+                list_url = get_route_for_model(body_content_table_model, "list")
 
-        if list_route:
-            body_content_table_list_url = f"{list_route}?{related_field_name}={obj.pk}"
-        else:
-            body_content_table_list_url = None
+            try:
+                list_route = reverse(list_url)
+            except NoReverseMatch:
+                logger.warning(
+                    f"Unable to determine a valid list URL for ObjectsTablePanel `{table_title}`"
+                    f" related to `{body_content_table_model.__name__}` with `{list_url}`."
+                    " If the related object is using a through table, consider setting the `related_list_url_name`"
+                    " parameter or disabling the related link via 'enable_related_link=False'."
+                )
+                list_route = None
 
-        body_content_table_add_url = self._get_table_add_url(context)
-        body_content_table_verbose_name_plural = self.table_title or body_content_table_model._meta.verbose_name_plural
+            if list_route:
+                body_content_table_list_url = f"{list_route}?{related_field_name}={obj.pk}"
 
         return {
             "body_content_table": body_content_table,
             "body_content_table_add_url": body_content_table_add_url,
             "body_content_table_list_url": body_content_table_list_url,
             "body_content_table_verbose_name": body_content_table_model._meta.verbose_name,
-            "body_content_table_verbose_name_plural": body_content_table_verbose_name_plural,
+            "body_content_table_verbose_name_plural": table_title,
             "footer_buttons": self.footer_buttons,
             "form_id": self.form_id,
             "more_queryset_count": more_queryset_count,
@@ -1316,24 +1340,6 @@ class EChartsPanel(Panel, EChartsBase):
         super().__init__(body_wrapper_template_path=body_wrapper_template_path, body_id=self.body_id, **kwargs)
         EChartsBase.__init__(self, **chart_kwargs)
 
-    def get_data(self, context: Context) -> dict[str, Any] | None:
-        """Get the data for chart.
-
-        Args:
-            context (Context): The template or request context.
-
-        Returns:
-            dict[str, Any] | None:
-                - A dictionary in internal chart format, e.g.:
-                    {"x": [...], "series": [{"name": str, "data": [...]}]}
-                - A nested dictionary of series, e.g.:
-                    {"Series1": {"x1": val1, "x2": val2}, ...}
-                - `None` if no data is set.
-        """
-        if callable(self.data):
-            return self.data(context)  # pylint: disable=not-callable
-        return self.data
-
     def should_render(self, context: Context):
         """Determine if the panel should be rendered."""
         if not super().should_render(context):
@@ -1349,8 +1355,7 @@ class EChartsPanel(Panel, EChartsBase):
 
     def get_extra_context(self, context: Context):
         """Add chart-specific context variables."""
-        self.data = self.get_data(context)
-        chart_config = self.get_config()
+        chart_config = self.get_config(context=context)
         return {
             **super().get_extra_context(context),
             "chart": self,
@@ -1765,7 +1770,7 @@ class StatsPanel(Panel):
                 value = [related_object_list_url, related_object_count, related_object_title]
                 stats[related_object_model_class] = value
                 related_object_model_filterset = get_filterset_for_model(related_object_model_class)
-                if self.filter_name not in related_object_model_filterset.get_filters():
+                if self.filter_name not in related_object_model_filterset.base_filters:
                     raise FieldDoesNotExist(
                         f"{self.filter_name} is not a valid filter field for {related_object_model_class_meta.verbose_name}"
                     )
@@ -2144,8 +2149,8 @@ class _ObjectDetailContactsTab(Tab):
                     max_display_count=100,  # since there isn't a separate list view for ContactAssociations!
                     # TODO: we should provide a standard reusable component template for bulk-actions in the footer
                     footer_content_template_path="components/panel/footer_contacts_table.html",
-                    header_extra_content_template_path=None,
-                    label="Contacts/Teams",
+                    enable_related_link=False,
+                    table_title="Contacts/Teams",
                 ),
             )
         super().__init__(tab_id=tab_id, label=label, weight=weight, panels=panels, **kwargs)
@@ -2185,9 +2190,8 @@ class _ObjectDetailDataComplianceTab(DistinctViewTab):
                     table_class=DataComplianceTable,
                     table_attribute="associated_data_compliance",
                     related_field_name="object_id",
-                    label="Data Compliance",
+                    table_title="Data Compliance",
                     add_button_route=None,
-                    header_extra_content_template_path=None,
                     include_paginator=True,
                 ),
             )
@@ -2199,7 +2203,12 @@ class _ObjectDetailDataComplianceTab(DistinctViewTab):
     def should_render(self, context: Context):
         if not super().should_render(context):
             return False
-        return getattr(get_obj_from_context(context), "is_data_compliance_model", False)
+        obj = get_obj_from_context(context)
+        if getattr(obj, "is_data_compliance_model", False):
+            if obj.get_data_compliance_url() is not None:
+                return True
+            logger.warning("Missing data-compliance URL for %r", obj)
+        return False
 
 
 class DynamicGroupsTextPanel(BaseTextPanel):
@@ -2307,8 +2316,7 @@ class _ObjectDetailMetadataTab(Tab):
                     exclude_columns=["assigned_object"],
                     add_button_route=None,
                     related_field_name="assigned_object_id",
-                    header_extra_content_template_path=None,
-                    label="Object Metadata",
+                    table_title="Object Metadata",
                 ),
             )
         super().__init__(

nautobot/core/ui/titles.py

@@ -6,17 +6,14 @@ from django.utils.html import strip_tags
 DEFAULT_TITLES: dict[str, str] = {
     "*": "{{ verbose_name_plural|bettertitle }}",
     "list": "{{ verbose_name_plural|bettertitle }}",
-    "detail": "{{ object.display|default:object }}",
-    "retrieve": "{{ object.display|default:object }}",
+    "detail": "{{ object.page_title|default:object }}",
+    "retrieve": "{{ object.page_title|default:object }}",
     "destroy": "Delete {{ verbose_name }}?",
     "create": "Add a new {{ verbose_name }}",
-    "update": "Editing {{ verbose_name }} {{ object.display|default:object }}",
+    "update": "Editing {{ verbose_name }} {{ object.page_title|default:object }}",
     "bulk_destroy": "Delete {{ total_objs_to_delete }} {{ verbose_name_plural|bettertitle }}?",
     "bulk_rename": "Renaming {{ selected_objects|length }} {{ verbose_name_plural|bettertitle }} on {{ parent_name }}",
     "bulk_update": "Editing {{ objs_count }} {{ verbose_name_plural|bettertitle }}",
-    "changelog": "{{ object.display|default:object }} - Change Log",
-    "config_context": "{{ object.display|default:object }} - Config Context",
-    "notes": "{{ object.display|default:object }} - Notes",
     "approve": "Approve {{ verbose_name|bettertitle }}?",
     "deny": "Deny {{ verbose_name|bettertitle }}?",
 }

nautobot/core/urls.py

@@ -42,6 +42,7 @@ urlpatterns = [
     path("dcim/", include("nautobot.dcim.urls")),
     path("extras/", include("nautobot.extras.urls")),
     path("ipam/", include("nautobot.ipam.urls")),
+    path("load-balancers/", include("nautobot.load_balancers.urls")),
     path("tenancy/", include("nautobot.tenancy.urls")),
     # TODO: deprecate this url and use users
     path("user/", include("nautobot.users.urls")),
@@ -103,15 +104,14 @@ urlpatterns = [
 
 
 if settings.DEBUG:
-    try:
-        import debug_toolbar
+    urlpatterns += [path("theme-preview/", ThemePreviewView.as_view(), name="theme_preview")]
+
+
+if "debug_toolbar" in settings.INSTALLED_APPS:
+    from debug_toolbar.toolbar import debug_toolbar_urls
+
+    urlpatterns += debug_toolbar_urls()
 
-        urlpatterns += [
-            path("__debug__/", include(debug_toolbar.urls)),
-            path("theme-preview/", ThemePreviewView.as_view(), name="theme_preview"),
-        ]
-    except ImportError:
-        pass
 
 if settings.METRICS_ENABLED:
     if settings.METRICS_AUTHENTICATED:

nautobot/core/utils/filtering.py

@@ -107,6 +107,7 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
         BOOLEAN_CHOICES,
         DynamicModelMultipleChoiceField,
         MultipleContentTypeField,
+        MultiValueCharInput,
         StaticSelect2,
         StaticSelect2Multiple,
     )
@@ -127,7 +128,16 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
     elif isinstance(field, (MultiValueDecimalFilter, MultiValueFloatFilter)):
         form_field = forms.DecimalField()
     elif isinstance(field, NumberFilter):
-        form_field = forms.IntegerField()
+        # If "choices" are passed, then when 'exact' is used in an Advanced
+        # Filter, render a dropdown of choices instead of a free integer input
+        if field.lookup_expr == "exact" and getattr(field, "choices", None):
+            # Use a multi-value widget that allows both preset choices and free-form entries
+            form_field = forms.MultipleChoiceField(
+                choices=field.choices,
+                widget=MultiValueCharInput,
+            )
+        else:
+            form_field = forms.IntegerField()
     elif isinstance(field, ModelMultipleChoiceFilter):
         if getattr(field, "prefers_id", False):
             to_field_name = "id"

nautobot/core/utils/lookup.py

@@ -61,6 +61,14 @@ def resolve_attr(obj, dotted_field):
     return str(val) if val else None
 
 
+def get_breadcrumbs_for_model(model, view_type: str = "List"):
+    """Get a UI Component Framework 'Breadcrumbs' instance for the given model's related UIViewSet or generic view."""
+    view = get_view_for_model(model)
+    if hasattr(view, "get_breadcrumbs"):
+        return view.get_breadcrumbs(model, view_type=view_type)
+    return None
+
+
 def get_changes_for_model(model):
     """
     Return a queryset of ObjectChanges for a model or instance. The queryset will be filtered
@@ -78,6 +86,30 @@ def get_changes_for_model(model):
     raise TypeError(f"{model!r} is not a Django Model class or instance")
 
 
+def get_detail_view_components_context_for_model(model) -> dict:
+    """Helper method for DistinctViewTabs etc. to retrieve the UI Component Framework context for the base detail view.
+
+    Functionally equivalent to calling `get_breadcrumbs_for_model()`, `get_object_detail_content_for_model()`, and
+    `get_view_titles_for_model()`, but marginally more efficient.
+    """
+    context = {
+        "breadcrumbs": None,
+        "object_detail_content": None,
+        "view_titles": None,
+    }
+
+    view = get_view_for_model(model, view_type="")
+    if view is not None:
+        if hasattr(view, "get_breadcrumbs"):
+            context["breadcrumbs"] = view.get_breadcrumbs(model, view_type="")
+        if hasattr(view, "get_view_titles"):
+            context["view_titles"] = view.get_view_titles(model, view_type="")
+        if hasattr(view, "object_detail_content"):
+            context["object_detail_content"] = view.object_detail_content
+
+    return context
+
+
 def get_model_from_name(model_name):
     """Given a full model name in dotted format (example: `dcim.model`), a model class is returned if valid.
 
@@ -222,6 +254,12 @@ def get_form_for_model(model, form_prefix=""):
     return get_related_class_for_model(model, module_name="forms", object_suffix=object_suffix)
 
 
+def get_object_detail_content_for_model(model):
+    """Get the UI Component Framework 'object_detail_content' for the given model's related UIViewSet or ObjectView."""
+    view = get_view_for_model(model)
+    return getattr(view, "object_detail_content", None)
+
+
 def get_related_field_for_models(from_model, to_model):
     """
     Find the field on `from_model` that is a relation to `to_model`.
@@ -289,6 +327,14 @@ def get_view_for_model(model, view_type=""):
     return result
 
 
+def get_view_titles_for_model(model, view_type: str = "List"):
+    """Get a UI Component Framework 'Titles' instance for the given model's related UIViewSet or generic view."""
+    view = get_view_for_model(model)
+    if hasattr(view, "get_view_titles"):
+        return view.get_view_titles(model, view_type=view_type)
+    return None
+
+
 def get_model_for_view_name(view_name):
     """
     Return the model class associated with the given view_name e.g. "circuits:circuit_detail", "dcim:device_list" and etc.

nautobot/core/views/mixins.py

@@ -263,52 +263,57 @@ class UIComponentsMixin:
     breadcrumbs: ClassVar[Optional[Breadcrumbs]] = None
     view_titles: ClassVar[Optional[Titles]] = None
 
-    def get_view_titles(self, model: Union[None, str, Type[Model], Model] = None, view_type: str = "List") -> Titles:
+    @classmethod
+    def get_view_titles(cls, model: Union[None, str, Type[Model], Model] = None, view_type: str = "List") -> Titles:
         """
         Resolve and return the `Titles` component instance.
 
         Resolution order:
-          1) If `self.view_titles` is set on the current view, use it.
-          2) Else, if `model` is provided, copy the `view_titles` from the view
-             class associated with that model via `lookup.get_view_for_model(model, action)`.
+          1) If `.view_titles` is set on the current view, use it.
+          2) Else, if `model` is provided, copy the `view_titles` from the view class associated with that model
+             via `lookup.get_view_for_model(model, action)`.
           3) Else, instantiate and return the default `Titles()`.
 
         Args:
             model: A Django model **class**, **instance**, dotted name string, or `None`.
                 Passed to `lookup.get_view_for_model()` to find the related view class.
                 If `None`, only local/default resolution is used.
-            view_type: Logical view type used by `lookup.get_view_for_model()` (e.g., `"List"` or empty to construct `"DeviceView"` string).
+            view_type: Logical view type used by `lookup.get_view_for_model()`
+                (e.g., `"List"` or empty to construct `"DeviceView"` string).
 
         Returns:
             Titles: A concrete `Titles` component instance ready to use.
         """
-        return self._resolve_component("view_titles", Titles, model, view_type)
+        return cls._resolve_component("view_titles", Titles, model, view_type)
 
+    @classmethod
     def get_breadcrumbs(
-        self, model: Union[None, str, Type[Model], Model] = None, view_type: str = "List"
+        cls, model: Union[None, str, Type[Model], Model] = None, view_type: str = "List"
     ) -> Breadcrumbs:
         """
         Resolve and return the `Breadcrumbs` component instance.
 
         Resolution order mirrors `get_view_titles()`:
-         1) Use `self.breadcrumbs` if set locally.
-         2) Else, if `model` is provided, copy the `breadcrumbs` from the view
-             class associated with that model via `lookup.get_view_for_model(model, action)`.
+         1) Use `.breadcrumbs` if set locally.
+         2) Else, if `model` is provided, copy the `breadcrumbs` from the view class associated with that model
+            via `lookup.get_view_for_model(model, action)`.
          3) Else return a new default `Breadcrumbs()`.
 
         Args:
            model: A Django model **class**, **instance**, dotted name string, or `None`.
                 Passed to `lookup.get_view_for_model()` to find the related view class.
                 If `None`, only local/default resolution is used.
-           view_type: Logical view type used by `lookup.get_view_for_model()` (e.g., `"List"` or empty to construct `"DeviceView"` string).
+           view_type: Logical view type used by `lookup.get_view_for_model()`
+                (e.g., `"List"` or empty to construct `"DeviceView"` string).
 
         Returns:
            Breadcrumbs: A concrete `Breadcrumbs` component instance.
         """
-        return self._resolve_component("breadcrumbs", Breadcrumbs, model, view_type)
+        return cls._resolve_component("breadcrumbs", Breadcrumbs, model, view_type)
 
+    @classmethod
     def _resolve_component(
-        self,
+        cls,
         attr_name: str,
         default_cls: Type[Union[Breadcrumbs, Titles]],
         model: Union[None, str, Type[Model], Model] = None,
@@ -329,14 +334,14 @@ class UIComponentsMixin:
         Returns:
             Breadcrumbs/Title instance.
         """
-        local = getattr(self, attr_name, None)
+        local = getattr(cls, attr_name, None)
         if local is not None:
-            return self._instantiate_if_needed(local, default_cls)
+            return cls._instantiate_if_needed(local, default_cls)
 
         if model is not None:
             view_class = lookup.get_view_for_model(model, view_type)
             view_component = getattr(view_class, attr_name, None)
-            return self._instantiate_if_needed(view_component, default_cls)
+            return cls._instantiate_if_needed(view_component, default_cls)
 
         return default_cls()
 
@@ -732,7 +737,11 @@ class NautobotViewSetMixin(GenericViewSet, UIComponentsMixin, AccessMixin, GetRe
                     except TemplateDoesNotExist:
                         # Try a different detail view template format
                         template_name = f"{app_label}/{model_opts.model_name}.html"
-                        select_template([template_name])
+                        try:
+                            select_template([template_name])
+                        except TemplateDoesNotExist:
+                            # Catch-all fallback to just object_retrieve.html
+                            template_name = "generic/object_retrieve.html"
         return template_name
 
     def get_form(self, *args, **kwargs):
@@ -1500,7 +1509,9 @@ class ObjectChangeLogViewMixin(NautobotViewSetMixin):
 
     base_template: Optional[str] = None
 
-    @drf_action(detail=True)
+    @drf_action(
+        detail=True, custom_view_base_action="view", custom_view_additional_permissions=["extras.view_objectchange"]
+    )
     def changelog(self, request, *args, **kwargs):
         model = self.get_queryset().model
         data = {
@@ -1521,7 +1532,7 @@ class ObjectNotesViewMixin(NautobotViewSetMixin):
 
     base_template: Optional[str] = None
 
-    @drf_action(detail=True)
+    @drf_action(detail=True, custom_view_base_action="view", custom_view_additional_permissions=["extras.view_note"])
     def notes(self, request, *args, **kwargs):
         model = self.get_queryset().model
         data = {
@@ -1536,6 +1547,6 @@ class ObjectDataComplianceViewMixin(NautobotViewSetMixin):
     UI Mixin for a DataCompliance to show up for a given object.
     """
 
-    @drf_action(detail=True)
+    @drf_action(detail=True, url_path="data-compliance")
     def data_compliance(self, request, *args, **kwargs):
         return Response({})

nautobot/core/views/renderers.py

@@ -15,7 +15,7 @@ from nautobot.core.forms import (
     TableConfigForm,
 )
 from nautobot.core.forms.forms import DynamicFilterFormSet
-from nautobot.core.templatetags.helpers import bettertitle, validated_viewname
+from nautobot.core.templatetags.helpers import validated_viewname
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.utils.requests import (
@@ -227,7 +227,7 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
                     if view.filterset is not None:
                         filterset_filters = view.filterset.filters
                     else:
-                        filterset_filters = view.filterset_class.get_filters()
+                        filterset_filters = view.filterset_class.base_filters
                     display_filter_params = [
                         check_filter_for_display(filterset_filters, field_name, values)
                         for field_name, values in view.filter_params.items()
@@ -324,7 +324,6 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
                     "action_buttons": valid_actions,
                     "list_url": list_url,
                     "saved_views": saved_views,
-                    "title": bettertitle(model._meta.verbose_name_plural),
                 }
             )
         elif view.action in ["create", "update"]:

nautobot/data_validation/migrations/0002_data_migration_from_app.py

@@ -13,7 +13,8 @@ def update_data_validation_engine_job_module_name(apps, schema_editor):
     """
     Job = apps.get_model("extras", "Job")
     dve_jobs = Job.objects.filter(module_name="nautobot_data_validation_engine.jobs")
-    dve_jobs.update(module_name="nautobot.data_validation.jobs")
+    # Now that the DVE jobs are system jobs, they should be enabled by default
+    dve_jobs.update(module_name="nautobot.core.jobs", enabled=True)
 
 
 def update_data_validation_engine_git_repo_contents(apps, schema_editor):
@@ -170,7 +171,7 @@ def revert_data_validation_engine_job_module_name(apps, schema_editor):
     Revert the `module_name` for the Jobs to match the old location of the data validation engine.
     """
     Job = apps.get_model("extras", "Job")
-    dve_jobs = Job.objects.filter(module_name="nautobot.data_validation.jobs")
+    dve_jobs = Job.objects.filter(module_name="nautobot.core.jobs")
     dve_jobs.update(module_name="nautobot_data_validation_engine.jobs")
 
 

nautobot/dcim/api/serializers.py

@@ -30,6 +30,7 @@ from nautobot.dcim.choices import (
     ControllerCapabilitiesChoices,
     DeviceFaceChoices,
     DeviceRedundancyGroupFailoverStrategyChoices,
+    InterfaceDuplexChoices,
     InterfaceModeChoices,
     InterfaceRedundancyGroupProtocolChoices,
     InterfaceTypeChoices,
@@ -693,6 +694,8 @@ class InterfaceSerializer(
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
     mac_address = serializers.CharField(allow_blank=True, allow_null=True, required=False)
     ip_address_count = serializers.IntegerField(read_only=True, source="_ip_address_count")
+    speed = serializers.IntegerField(required=False, allow_null=True)
+    duplex = ChoiceField(choices=InterfaceDuplexChoices, allow_blank=True, required=False)
 
     class Meta:
         model = Interface

nautobot/dcim/choices.py

@@ -1154,6 +1154,55 @@ class InterfaceModeChoices(ChoiceSet):
     )
 
 
+class InterfaceDuplexChoices(ChoiceSet):
+    DUPLEX_AUTO = "auto"
+    DUPLEX_FULL = "full"
+    DUPLEX_HALF = "half"
+
+    CHOICES = (
+        (DUPLEX_AUTO, "Auto"),
+        (DUPLEX_FULL, "Full"),
+        (DUPLEX_HALF, "Half"),
+    )
+
+
+class InterfaceSpeedChoices(ChoiceSet):
+    # Stored in Kbps (for compatibility with circuits and humanize_speed filter)
+    SPEED_1M = 1_000
+    SPEED_10M = 10_000
+    SPEED_100M = 100_000
+    SPEED_1G = 1_000_000
+    SPEED_2_5G = 2_500_000
+    SPEED_5G = 5_000_000
+    SPEED_10G = 10_000_000
+    SPEED_25G = 25_000_000
+    SPEED_40G = 40_000_000
+    SPEED_50G = 50_000_000
+    SPEED_100G = 100_000_000
+    SPEED_200G = 200_000_000
+    SPEED_400G = 400_000_000
+    SPEED_800G = 800_000_000
+    SPEED_1_6T = 1_600_000_000
+
+    CHOICES = (
+        (SPEED_1M, "1 Mbps"),
+        (SPEED_10M, "10 Mbps"),
+        (SPEED_100M, "100 Mbps"),
+        (SPEED_1G, "1 Gbps"),
+        (SPEED_2_5G, "2.5 Gbps"),
+        (SPEED_5G, "5 Gbps"),
+        (SPEED_10G, "10 Gbps"),
+        (SPEED_25G, "25 Gbps"),
+        (SPEED_40G, "40 Gbps"),
+        (SPEED_50G, "50 Gbps"),
+        (SPEED_100G, "100 Gbps"),
+        (SPEED_200G, "200 Gbps"),
+        (SPEED_400G, "400 Gbps"),
+        (SPEED_800G, "800 Gbps"),
+        (SPEED_1_6T, "1.6 Tbps"),
+    )
+
+
 class InterfaceStatusChoices(ChoiceSet):
     STATUS_PLANNED = "planned"
     STATUS_ACTIVE = "active"

nautobot/dcim/constants.py

@@ -37,6 +37,13 @@ VIRTUAL_IFACE_TYPES = interface_type_by_category["Virtual interfaces"]
 
 NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES
 
+COPPER_TWISTED_PAIR_IFACE_TYPES = [
+    InterfaceTypeChoices.TYPE_100ME_FIXED,
+    InterfaceTypeChoices.TYPE_1GE_FIXED,
+    InterfaceTypeChoices.TYPE_2GE_FIXED,
+    InterfaceTypeChoices.TYPE_5GE_FIXED,
+    InterfaceTypeChoices.TYPE_10GE_FIXED,
+]
 
 #
 # PowerFeeds

nautobot/dcim/factory.py

@@ -186,7 +186,7 @@ class DeviceFactory(PrimaryModelFactory):
     )
     device_redundancy_group_priority = factory.Maybe(
         "has_device_redundancy_group",
-        factory.Faker("pyint", min_value=1, max_value=500),
+        factory.Faker("pyint", min_value=1, max_value=65535),
     )
 
     controller_managed_device_group = random_instance(ControllerManagedDeviceGroup)