nautobot 2.3.10__py3-none-any.whl → 2.3.12__py3-none-any.whl

nautobot/core/views/mixins.py

@@ -414,7 +414,7 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         else:
             # render the form with the error message.
             data = {}
-            if self.action in ["bulk_update", "bulk_destroy"]:
+            if not request.POST.get("_all") and self.action in ["bulk_update", "bulk_destroy"]:
                 pk_list = self.pk_list
                 table_class = self.get_table_class()
                 table = table_class(queryset.filter(pk__in=pk_list), orderable=False)
@@ -578,6 +578,9 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         if not form_class:
             if self.action == "bulk_destroy":
                 queryset = self.get_queryset()
+                bulk_delete_all = bool(self.request.POST.get("_all"))
+                if bulk_delete_all:
+                    return ConfirmationForm
 
                 class BulkDestroyForm(ConfirmationForm):
                     pk = ModelMultipleChoiceField(queryset=queryset, widget=MultipleHiddenInput)
@@ -909,7 +912,48 @@ class ObjectEditViewMixin(NautobotViewSetMixin, mixins.CreateModelMixin, mixins.
             return self.form_invalid(form)
 
 
-class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
+class EditAndDeleteAllModelMixin:
+    """
+    UI mixin to bulk destroy all and bulk edit all model instances.
+    """
+
+    def _get_bulk_edit_delete_all_queryset(self, request):
+        """
+        Retrieve the queryset of model instances to be bulk-deleted or bulk-deleted, filtered based on request parameters.
+
+        This method handles the retrieval of a queryset of model instances that match the specified
+        filter criteria in the request parameters, allowing a bulk delete operation to be performed
+        on all matching instances.
+        """
+        model = self.queryset.model
+
+        # This Mixin is currently been used by both NautobotUIViewSet ObjectBulkDestroyViewMixin, ObjectBulkUpdateViewMixin
+        # BulkEditView, and BulkDeleteView which uses different keys for accessing filterset
+        filterset_class = getattr(self, "filterset", None)
+        if filterset_class is None:
+            filterset_class = getattr(self, "filterset_class", None)
+
+        if request.GET and filterset_class is not None:
+            queryset = filterset_class(request.GET, model.objects.all()).qs
+            # We take this approach because filterset.qs has already applied .distinct(),
+            # and performing a .delete directly on a queryset with .distinct applied is not allowed.
+            queryset = self.queryset.filter(pk__in=queryset)
+        else:
+            queryset = model.objects.all()
+        return queryset
+
+    def _bulk_delete_all_context(self, request, queryset):
+        model = queryset.model
+        return {
+            "obj_type_plural": model._meta.verbose_name_plural,
+            "return_url": self.get_return_url(request),
+            "total_objs_to_delete": queryset.count(),
+            "delete_all": True,
+            "table": None,
+        }
+
+
+class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin, EditAndDeleteAllModelMixin):
     """
     UI mixin to bulk destroy model instances.
     """
@@ -923,7 +967,10 @@ class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
         queryset = self.get_queryset()
         model = queryset.model
         # Delete objects
-        queryset = queryset.filter(pk__in=pk_list)
+        if self.request.POST.get("_all"):
+            queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+        else:
+            queryset = queryset.filter(pk__in=pk_list)
 
         try:
             with transaction.atomic():
@@ -951,35 +998,33 @@ class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
         request.POST "_confirm": Function to validate the table form/BulkDestroyConfirmationForm and to perform the action of bulk destroy. Render the form with errors if exceptions are raised.
         """
         queryset = self.get_queryset()
-        model = queryset.model
+        delete_all = bool(request.POST.get("_all"))
+        data = {}
         # Are we deleting *all* objects in the queryset or just a selected subset?
-        if request.POST.get("_all"):
-            if self.filterset_class is not None:
-                self.pk_list = list(
-                    self.filterset_class(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True)
-                )
-            else:
-                self.pk_list = list(model.objects.all().values_list("pk", flat=True))
+        if delete_all:
+            queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+            data = self._bulk_delete_all_context(request, queryset)
         else:
             self.pk_list = list(request.POST.getlist("pk"))
+
         form_class = self.get_form_class(**kwargs)
-        data = {}
         if "_confirm" in request.POST:
             form = form_class(request.POST, initial=normalize_querydict(request.GET, form_class=form_class))
             if form.is_valid():
                 return self.form_valid(form)
             else:
                 return self.form_invalid(form)
-        table_class = self.get_table_class()
-        table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
-        if not table.rows:
-            messages.warning(
-                request,
-                f"No {queryset.model._meta.verbose_name_plural} were selected for deletion.",
-            )
-            return redirect(self.get_return_url(request))
+        if not delete_all:
+            table_class = self.get_table_class()
+            table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
+            if not table.rows:
+                messages.warning(
+                    request,
+                    f"No {queryset.model._meta.verbose_name_plural} were selected for deletion.",
+                )
+                return redirect(self.get_return_url(request))
 
-        data.update({"table": table})
+            data.update({"table": table})
         return Response(data)
 
 
@@ -1037,7 +1082,7 @@ class ObjectBulkCreateViewMixin(NautobotViewSetMixin):  # 3.0 TODO: remove, unus
             return self.form_invalid(form)
 
 
-class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
+class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, EditAndDeleteAllModelMixin):
     """
     UI mixin to bulk update model instances.
     """
@@ -1062,7 +1107,13 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
         nullified_fields = request.POST.getlist("_nullify")
         with deferred_change_logging_for_bulk_operation():
             updated_objects = []
-            for obj in queryset.filter(pk__in=form.cleaned_data["pk"]):
+            edit_all = self.request.POST.get("_all")
+
+            if edit_all:
+                queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+            else:
+                queryset = queryset.filter(pk__in=form.cleaned_data["pk"])
+            for obj in queryset:
                 self.obj = obj
                 # Update standard fields. If a field is listed in _nullify, delete its value.
                 for name in standard_fields:
@@ -1133,38 +1184,41 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
         request.POST "_edit": Function to render the user selection of objects in a table form/BulkUpdateForm via Response that is passed to NautobotHTMLRenderer.
         request.POST "_apply": Function to validate the table form/BulkUpdateForm and to perform the action of bulk update. Render the form with errors if exceptions are raised.
         """
-        queryset = self.get_queryset()
-        model = queryset.model
+        edit_all = request.POST.get("_all")
 
-        # If we are editing *all* objects in the queryset, replace the PK list with all matched objects.
-        if request.POST.get("_all"):
-            if self.filterset_class is not None:
-                self.pk_list = list(
-                    self.filterset_class(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True)
-                )
-            else:
-                self.pk_list = list(model.objects.all().values_list("pk", flat=True))
+        if edit_all:
+            self.pk_list = None
+            queryset = self._get_bulk_edit_delete_all_queryset(request)
         else:
             self.pk_list = list(request.POST.getlist("pk"))
+            queryset = self.get_queryset().filter(pk__in=self.pk_list)
+
         data = {}
         form_class = self.get_form_class()
         if "_apply" in request.POST:
             self.kwargs = kwargs
-            form = form_class(queryset.model, request.POST)
+            form = form_class(queryset.model, request.POST, edit_all=edit_all)
             restrict_form_fields(form, request.user)
             if form.is_valid():
                 return self.form_valid(form)
             else:
                 return self.form_invalid(form)
-        table_class = self.get_table_class()
-        table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
-        if not table.rows:
-            messages.warning(
-                request,
-                f"No {queryset.model._meta.verbose_name_plural} were selected to update.",
-            )
-            return redirect(self.get_return_url(request))
-        data.update({"table": table})
+        table = None
+        if not edit_all:
+            table_class = self.get_table_class()
+            table = table_class(queryset, orderable=False)
+            if not table.rows:
+                messages.warning(
+                    request,
+                    f"No {queryset.model._meta.verbose_name_plural} were selected to update.",
+                )
+                return redirect(self.get_return_url(request))
+        data.update(
+            {
+                "table": table,
+                "objs_count": queryset.count(),
+            }
+        )
         return Response(data)
 
 

nautobot/core/views/renderers.py

@@ -249,19 +249,22 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
                         "return_url": return_url,
                     }
                     form = form_class(initial=initial)
-                table = self.construct_table(view, pk_list=pk_list)
+                delete_all = request.POST.get("_all")
+                if not delete_all:
+                    table = self.construct_table(view, pk_list=pk_list)
             elif view.action == "bulk_create":  # 3.0 TODO: remove, replaced by ImportObjects system Job
                 form = view.get_form()
                 if request.data:
                     table = data.get("table")
             elif view.action == "bulk_update":
+                edit_all = request.POST.get("_all")
                 pk_list = getattr(view, "pk_list", [])
-                if pk_list:
+                if pk_list or edit_all:
                     initial_data = {"pk": pk_list}
-                    form = form_class(model, initial=initial_data)
-
+                    form = form_class(model, initial=initial_data, edit_all=edit_all)
                     restrict_form_fields(form, request.user)
-                table = self.construct_table(view, pk_list=pk_list)
+                if not edit_all:
+                    table = self.construct_table(view, pk_list=pk_list)
             elif view.action == "notes":
                 initial_data = {
                     "assigned_object_type": content_type,

nautobot/dcim/choices.py

@@ -804,6 +804,9 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_400GE_CFP8 = "400gbase-x-cfp8"
     TYPE_800GE_QSFP_DD = "800gbase-x-qsfpdd"
     TYPE_800GE_OSFP = "800gbase-x-osfp"
+    TYPE_800GE_OSFP_XD = "800gbase-x-osfp-xd"
+    TYPE_1600GE_OSFP = "1600gbase-x-osfp"
+    TYPE_1600GE_OSFP_XD = "1600gbase-x-osfp-xd"
 
     # Ethernet Backplane
     TYPE_1GE_KX = "1000base-kx"
@@ -977,6 +980,9 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_400GE_CFP8, "CPF8 (400GE)"),
                 (TYPE_800GE_QSFP_DD, "QSFP-DD (800GE)"),
                 (TYPE_800GE_OSFP, "OSFP (800GE)"),
+                (TYPE_800GE_OSFP_XD, "OSFP-XD (800GE)"),
+                (TYPE_1600GE_OSFP, "OSFP (1600GE)"),
+                (TYPE_1600GE_OSFP_XD, "OSFP-XD (1600GE)"),
             ),
         ),
         (

nautobot/dcim/tables/devices.py

@@ -220,13 +220,11 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
         )
 
 
-class DeviceImportTable(BaseTable):
+class DeviceImportTable(StatusTableMixin, RoleTableMixin, BaseTable):
     name = tables.TemplateColumn(template_code=DEVICE_LINK)
-    status = ColoredLabelColumn()
     tenant = TenantColumn()
     location = tables.Column(linkify=True)
     rack = tables.Column(linkify=True)
-    role = tables.Column(verbose_name="Role")
     device_type = tables.Column(verbose_name="Type")
 
     class Meta(BaseTable.Meta):
@@ -1277,6 +1275,9 @@ class SoftwareImageFileTable(StatusTableMixin, BaseTable):
 class SoftwareVersionTable(StatusTableMixin, BaseTable):
     pk = ToggleColumn()
     version = tables.Column(linkify=True)
+    platform = tables.Column(linkify=True)
+    release_date = tables.DateColumn()
+    end_of_support_date = tables.DateColumn()
     software_image_file_count = LinkedCountColumn(
         viewname="dcim:softwareimagefile_list",
         url_params={"software_version": "pk"},
@@ -1330,15 +1331,13 @@ class SoftwareVersionTable(StatusTableMixin, BaseTable):
         )
 
 
-class ControllerTable(BaseTable):
+class ControllerTable(StatusTableMixin, RoleTableMixin, BaseTable):
     """Table for list view."""
 
     pk = ToggleColumn()
     name = tables.Column(linkify=True)
-    status = ColoredLabelColumn()
     location = tables.Column(linkify=True)
     platform = tables.Column(linkify=True)
-    role = tables.Column(linkify=True)
     tenant = TenantColumn()
     external_integration = tables.Column(linkify=True)
     controller_device = tables.Column(linkify=True)

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -20,7 +20,7 @@
                         </tr>
                         <tr>
                             <td>Role</td>
-                            <td>{{ object.role|hyperlinked_object }}</td>
+                            <td>{{ object.role|hyperlinked_object_with_color }}</td>
                         </tr>
                         <tr>
                             <td>Location</td>

nautobot/dcim/templates/dcim/device/base.html

@@ -58,7 +58,7 @@
     <span class="hover_copy">
         <h1>
             <span id="devicename">{% block title %}{{ object }}{% endblock title %}</span>
-            <button class="btn btn-xs btn-default hover_copy_button" data-clipboard-target="#devicename">
+            <button class="btn btn-xs btn-default hover_copy_button" data-clipboard-text="{{ object }}">
                 <span class="mdi mdi-content-copy"></span>
             </button>
         </h1>

nautobot/dcim/templates/dcim/device_component_add.html

@@ -7,7 +7,7 @@
 <form action="" method="post" class="form form-horizontal">
     {% csrf_token %}
     <div class="row">
-        <div class="col-md-6 col-md-offset-3">
+        <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
             {% if form.non_field_errors %}
                 <div class="panel panel-danger">
                     <div class="panel-heading"><strong>Errors</strong></div>
@@ -25,13 +25,13 @@
                 </div>
             </div>
             {% include 'inc/extras_features_edit_form_fields.html' with form=model_form %}
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3 text-right">
-                    <button type="submit" name="_create" class="btn btn-primary">Create</button>
-                    <button type="submit" name="_addanother" class="btn btn-primary">Create and Add More</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
+            <button type="submit" name="_create" class="btn btn-primary">Create</button>
+            <button type="submit" name="_addanother" class="btn btn-primary">Create and Add More</button>
+            <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
         </div>
     </div>
 </form>

nautobot/dcim/templates/dcim/virtualchassis_add_member.html

@@ -5,7 +5,7 @@
     <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
         {% csrf_token %}
         <div class="row">
-            <div class="col-md-6 col-md-offset-3">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                 <h3>{% block title %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblock %}</h3>
                 {% if membership_form.non_field_errors %}
                     <div class="panel panel-danger">
@@ -25,7 +25,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-6 col-md-offset-3 text-right">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
                 <button type="submit" name="_save" class="btn btn-primary">Save</button>
                 <button type="submit" name="_addanother" class="btn btn-primary">Add Another</button>
                 <a href="{{ return_url }}" class="btn btn-default">Cancel</a>

nautobot/dcim/templates/dcim/virtualchassis_edit.html

@@ -8,7 +8,7 @@
         {{ pk_form.pk }}
         {{ formset.management_form }}
         <div class="row">
-            <div class="col-md-8 col-md-offset-2">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                 <h3>{% block title %}{% if vc_form.instance %}Editing {{ vc_form.instance }}{% else %}New Virtual Chassis{% endif %}{% endblock %}</h3>
                 {% if vc_form.non_field_errors %}
                     <div class="panel panel-danger">
@@ -84,7 +84,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-8 col-md-offset-2 text-right">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
                 <button type="submit" name="_update" class="btn btn-primary">Update</button>
                 <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
             </div>

nautobot/dcim/tests/integration/test_create_device.py

@@ -0,0 +1,86 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import SeleniumTestCase
+
+
+class CreateDeviceTestCase(SeleniumTestCase):
+    """
+    Create a device and all pre-requisite objects through the UI.
+    """
+
+    def test_create_device(self):
+        """
+        This test goes through the process of creating a device in the UI. All pre-requisite objects are created:
+        - Manufacturer
+        - Device Type
+        - LocationType
+        - Location
+        - Role
+        - Device
+
+        """
+        self.user.is_superuser = True
+        self.user.save()
+        self.login(self.user.username, self.password)
+
+        # Manufacturer
+        self.click_navbar_entry("Devices", "Manufacturers")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:manufacturer_add"))
+        self.browser.fill("name", "Test Manufacturer 1")
+        self.click_edit_form_create_button()
+
+        # Device Type
+        self.click_navbar_entry("Devices", "Device Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:devicetype_add"))
+        self.fill_select2_field("manufacturer", "Test Manufacturer 1")
+        self.browser.fill("model", "Test Device Type 1")
+        self.click_edit_form_create_button()
+
+        # LocationType
+        self.click_navbar_entry("Organization", "Location Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_add"))
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.browser.fill("name", "Test Location Type 1")
+        self.click_edit_form_create_button()
+
+        # Location
+        self.click_navbar_entry("Organization", "Locations")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_add"))
+        self.fill_select2_field("location_type", "Test Location Type 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.browser.fill("name", "Test Location 1")
+        self.click_edit_form_create_button()
+
+        # Role
+        self.click_navbar_entry("Organization", "Roles")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:role_add"))
+        self.browser.fill("name", "Test Role 1")
+        self.fill_select2_multiselect_field("content_types", "dcim | device")
+        self.click_edit_form_create_button()
+
+        # Device
+        self.click_navbar_entry("Devices", "Devices")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:device_add"))
+        self.browser.fill("name", "Test Device Integration Test 1")
+        self.fill_select2_field("role", "Test Role 1")
+        self.fill_select2_field("device_type", "Test Device Type 1")
+        self.fill_select2_field("location", "Test Location 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.click_edit_form_create_button()
+
+        # Assert that the device was created
+        self.assertTrue(self.browser.is_text_present("Created device Test Device Integration Test 1", wait_time=5))
+        self.assertTrue(self.browser.is_text_present("Test Location 1", wait_time=5))
+        self.assertTrue(self.browser.is_text_present("Test Device Type 1", wait_time=5))

nautobot/extras/group_sync.py

@@ -0,0 +1,42 @@
+"""Additional functions to process an OAuth2/OIDC user."""
+
+import logging
+
+from django.conf import settings
+from django.contrib.auth.models import Group
+
+logger = logging.getLogger(__name__)
+
+
+CLAIMS_GROUP_NAME = getattr(settings, "NAUTOBOT_SSO_CLAIMS_GROUP", "groups")
+""" Which claim to look at in the OAuth2/OIDC response
+
+    For Okta you can look at `Okta -> Authorization Servers -> Claims`. And a reasonable
+    default is "groups". For Azure a reasonable default is "roles".
+"""
+
+SUPERUSER_GROUPS = getattr(settings, "NAUTOBOT_SSO_SUPERUSER_GROUPS", [])
+STAFF_GROUPS = getattr(settings, "NAUTOBOT_SSO_STAFF_GROUPS", [])
+
+
+def group_sync(uid, user=None, response=None, *args, **kwargs):
+    """Sync the users groups from OAuth2/OIDC auth and set staff/superuser as appropriate."""
+    if user and response and CLAIMS_GROUP_NAME and response.get(CLAIMS_GROUP_NAME, False):
+        group_memberships = response.get(CLAIMS_GROUP_NAME)
+        is_staff = False
+        is_superuser = False
+        logger.debug(f"User {uid} is a member of {', '.join(group_memberships)}")
+        # Make sure all groups exist in Nautobot
+        group_ids = []
+        for group in group_memberships:
+            if group in SUPERUSER_GROUPS:
+                is_superuser = True
+            if group in STAFF_GROUPS:
+                is_staff = True
+            group_ids.append(Group.objects.get_or_create(name=group)[0].id)
+        user.groups.set(group_ids)
+        user.is_superuser = is_superuser
+        user.is_staff = is_staff
+        user.save()
+    else:
+        logger.debug(f"Did not receive groups from OAuth2/OIDC, response: {response}")

nautobot/extras/models/metadata.py

@@ -201,6 +201,7 @@ class ObjectMetadata(ChangeLoggedModel, BaseModel):
     objects = ObjectMetadataManager()
     natural_key_field_names = ["pk"]
     documentation_static_path = "docs/user-guide/platform-functionality/objectmetadata.html"
+    is_metadata_associable_model = False
 
     class Meta:
         ordering = ["metadata_type"]

nautobot/extras/models/models.py

@@ -831,7 +831,7 @@ class Note(ChangeLoggedModel, BaseModel):
         unique_together = [["assigned_object_type", "assigned_object_id", "user_name", "created"]]
 
     def __str__(self):
-        return f"{self.assigned_object} - {self.created.isoformat()}"
+        return f"{self.assigned_object} - {self.created.isoformat() if self.created else None}"
 
     def save(self, *args, **kwargs):
         # Record the user's name as static strings

nautobot/extras/plugins/__init__.py

@@ -207,8 +207,9 @@ class NautobotAppConfig(NautobotConfig):
         override_views = import_object(f"{self.__module__}.{self.override_views}")
         if override_views is not None:
             for qualified_view_name, view in override_views.items():
+                view_class_name = view.view_class.__name__ if hasattr(view, "view_class") else view.cls.__name__
                 self.features.setdefault("overridden_views", []).append(
-                    (qualified_view_name, f"{view.__module__}.{view.view_class.__name__}")
+                    (qualified_view_name, f"{view.__module__}.{view_class_name}")
                 )
             register_override_views(override_views, self.name)
 

nautobot/extras/tables.py

@@ -978,6 +978,7 @@ class MetadataTypeTable(BaseTable):
 
 class ObjectMetadataTable(BaseTable):
     pk = ToggleColumn()
+    # NOTE: there is no identity column in this table; this is intentional as we have no detail view for ObjectMetadata
     metadata_type = tables.Column(linkify=True)
     assigned_object = tables.TemplateColumn(
         template_code=ASSIGNED_OBJECT, verbose_name="Assigned object", orderable=False

nautobot/extras/templates/extras/inc/job_table.html

@@ -28,7 +28,7 @@
                 </th>
             </tr>
             {% endifchanged %}
-            <tr class="collapseme-{{ row.record.grouping|slugify }}{% if not perms.extras.run_job or not row.record.runnable %} disabled{% endif %} collapse in" data-parent="#accordion" {{ row.attrs.as_html }}>
+            <tr class="{% cycle 'even' 'odd' %} collapseme-{{ row.record.grouping|slugify }}{% if not perms.extras.run_job or not row.record.runnable %} disabled{% endif %} collapse in" data-parent="#accordion" {{ row.attrs.as_html }}>
                 {% for column, cell in row.items %}
                     <td {{ column.attrs.td.as_html }}>{{ cell }}</td>
                 {% endfor %}

nautobot/extras/tests/test_relationships.py

@@ -1395,6 +1395,7 @@ class RequiredRelationshipTestMixin:
         # Protected FK to SoftwareVersion prevents deletion
         Controller.objects.all().delete()
         Device.objects.all().update(software_version=None)
+        Device.objects.all().delete()
 
         # Create required relationships:
         device_ct = ContentType.objects.get_for_model(Device)

nautobot/extras/tests/test_views.py

@@ -3033,8 +3033,6 @@ class ObjectChangeTestCase(TestCase):
 
 
 class ObjectMetadataTestCase(
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
 ):
     model = ObjectMetadata

nautobot/extras/views.py

@@ -2228,8 +2228,6 @@ class MetadataTypeUIViewSet(NautobotUIViewSet):
 
 
 class ObjectMetadataUIViewSet(
-    ObjectChangeLogViewMixin,
-    ObjectDetailViewMixin,
     ObjectListViewMixin,
 ):
     filterset_class = filters.ObjectMetadataFilterSet
@@ -2846,6 +2844,7 @@ class StatusBulkDeleteView(generic.BulkDeleteView):
 
     queryset = Status.objects.all()
     table = tables.StatusTable
+    filterset = filters.StatusFilterSet
 
 
 class StatusDeleteView(generic.ObjectDeleteView):

nautobot/ipam/factory.py

@@ -238,6 +238,9 @@ class VLANFactory(PrimaryModelFactory):
                         lambda: Location.objects.filter(location_type__content_types__in=[vlan_ct]), minimum=0
                     )
                 )
+                if self.vlan_group and self.vlan_group.location:
+                    # add the parent of the vlan group location to the vlan locations
+                    self.locations.add(self.vlan_group.location.ancestors(include_self=True)[0])
 
 
 class VLANGetOrCreateFactory(VLANFactory):

nautobot/ipam/filters.py

@@ -90,6 +90,11 @@ class VRFFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyModelFil
         to_field_name="name",
         label="Device (ID or name)",
     )
+    virtual_machines = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=VirtualMachine.objects.all(),
+        to_field_name="name",
+        label="Virtual Machine (ID or name)",
+    )
     prefix = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="prefixes",
         queryset=Prefix.objects.all(),