nautobot 2.4.18__py3-none-any.whl → 2.4.19__py3-none-any.whl

nautobot/core/tests/test_graphql.py

@@ -11,7 +11,7 @@ from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
 from django.db.models import Count, Q
-from django.test import override_settings, TestCase
+from django.test import override_settings
 from django.test.client import RequestFactory
 from django.urls import reverse
 import graphene.types
@@ -38,7 +38,7 @@ from nautobot.core.graphql.schema import (
 )
 from nautobot.core.graphql.types import DateType, OptimizedNautobotObjectType
 from nautobot.core.graphql.utils import str_to_var_name
-from nautobot.core.testing import create_test_user, NautobotTestClient
+from nautobot.core.testing import create_test_user, NautobotTestClient, TestCase
 from nautobot.dcim.choices import ConsolePortTypeChoices, InterfaceModeChoices, InterfaceTypeChoices, PortTypeChoices
 from nautobot.dcim.filters import DeviceFilterSet, LocationFilterSet
 from nautobot.dcim.graphql.types import DeviceType as DeviceTypeGraphQL
@@ -1453,9 +1453,7 @@ query {
             # Assert GraphQL returned properties match those expected
             self.assertEqual(console_server_port_entry["connected_console_port"], connected_console_port)
 
-    @skip(
-        "Works in isolation, fails as part of the overall test suite due to issue #446, also something is broken with content types"
-    )
+    @skip("Works in isolation, fails as part of the overall test suite due to issue #446")
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_query_relationship_associations(self):
         """Test queries involving relationship associations."""
@@ -2442,6 +2440,23 @@ query {
         expected_interfaces_first = {"ip_addresses": [{"primary_ip4_for": [{"id": str(self.device1.id)}]}]}
         self.assertEqual(result.data["device"]["interfaces"][0], expected_interfaces_first)
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_query_optimizer_reverse_lookup(self):
+        """
+        Test query optimization in the case of a query mixing reverse and forward nested lookups.
+
+        See https://github.com/nautobot/nautobot/issues/7651.
+        """
+        query = """query { tenant_groups { name tenants { name } } }"""
+        # Prewarm caches of Relationships and such to reduce variation in the number of queries below
+        result = self.execute_query(query)
+        self.assertNotIn("error", str(result))
+        # Run it again and assert that the optimized query is run.
+        # Before the fix for #7651 this would result in N+1 queries where N is the number of tenant-groups!
+        with self.assertNumQueries(2):
+            result = self.execute_query(query)
+        self.assertNotIn("error", str(result))
+
 
 class GraphQLTypeTestCase(UnitTestTestCase):
     def test_date_type(self):

nautobot/core/tests/test_jobs.py

@@ -798,7 +798,8 @@ class BulkEditTestCase(TransactionTestCase):
             "BulkEditObjects",
             content_type=self.role_ct.id,
             edit_all=False,
-            filter_query_params={"per_page": 2},
+            filter_query_params={"per_page": [2]},
+            pk_list=pk_list,
             form_data={"pk": pk_list, "color": "aa1409"},
             username=self.user.username,
         )
@@ -818,7 +819,8 @@ class BulkEditTestCase(TransactionTestCase):
             "BulkEditObjects",
             content_type=self.role_ct.id,
             edit_all=False,
-            filter_query_params={"sort": "name"},
+            pk_list=pk_list,
+            filter_query_params={"sort": ["name"]},
             form_data={"pk": pk_list, "color": "aa1409"},
             username=self.user.username,
         )
@@ -872,6 +874,7 @@ class BulkEditTestCase(TransactionTestCase):
             content_type=self.namespace_ct.id,
             edit_all=False,
             filter_query_params={},
+            pk_list=pk_list,
             form_data={
                 "pk": pk_list,
                 "description": "Example description for bulk edit",
@@ -969,15 +972,16 @@ class BulkEditTestCase(TransactionTestCase):
             "nautobot.core.jobs.bulk_actions",
             "BulkEditObjects",
             content_type=self.status_ct.id,
-            edit_all=False,
-            filter_query_params={"name__isw": "A", "sort": "name"},
+            edit_all=True,
+            filter_query_params={"name__isw": ["A"], "sort": ["name"]},
+            pk_list=[str(statuses[0].pk)],
             form_data={
                 "pk": [str(statuses[0].pk)],
                 "color": "aa1409",
             },
             username=self.user.username,
         )
-        self._common_no_error_test_assertion(Status, job_result, 1, name__istartswith="A", color="aa1409")
+        self._common_no_error_test_assertion(Status, job_result, len(statuses), name__istartswith="A", color="aa1409")
         self.assertNotEqual(status_to_ignore.color, "aa1409")
 
     def test_bulk_edit_objects_passing_in_both_pk_list_and_edit_all(self):
@@ -994,7 +998,7 @@ class BulkEditTestCase(TransactionTestCase):
             "BulkEditObjects",
             content_type=self.status_ct.id,
             edit_all=True,
-            filter_query_params={"name__isw": "A"},
+            filter_query_params={"name__isw": ["A"]},
             # pk ignored if edit_all is True
             form_data={
                 "pk": [str(statuses[0].pk)],
@@ -1110,9 +1114,12 @@ class BulkDeleteTestCase(TransactionTestCase):
         job_result = create_job_result_and_run_job(
             "nautobot.core.jobs.bulk_actions",
             "BulkDeleteObjects",
+            username=self.user.username,
             content_type=self.status_ct.id,
+            delete_all=False,
+            filter_query_params={},
             pk_list=statuses_to_delete,
-            username=self.user.username,
+            saved_view_id=None,
         )
         self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         job_log = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
@@ -1129,19 +1136,19 @@ class BulkDeleteTestCase(TransactionTestCase):
         obj_perm.save()
         obj_perm.users.add(self.user)
         obj_perm.object_types.add(ContentType.objects.get_for_model(Status))
-
         job_result = create_job_result_and_run_job(
             "nautobot.core.jobs.bulk_actions",
             "BulkDeleteObjects",
+            username=self.user.username,
             content_type=self.status_ct.id,
+            delete_all=False,
+            filter_query_params={},
             pk_list=statuses_to_delete,
-            username=self.user.username,
+            saved_view_id=None,
         )
         self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         error_log = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
-        self.assertEqual(
-            error_log.message, "You do not have permissions to delete some of the objects provided in `pk_list`."
-        )
+        self.assertIn("Cannot delete some instances of model", error_log.message)
         self.assertEqual(Status.objects.filter(pk__in=statuses_to_delete).count(), len(statuses_to_delete))
 
     def test_bulk_delete_objects_select_all(self):
@@ -1155,11 +1162,12 @@ class BulkDeleteTestCase(TransactionTestCase):
         job_result = create_job_result_and_run_job(
             "nautobot.core.jobs.bulk_actions",
             "BulkDeleteObjects",
+            username=self.user.username,
             content_type=ContentType.objects.get_for_model(Circuit).id,
             delete_all=True,
-            filter_query_params={"per_page": 10},
+            filter_query_params={"per_page": [10]},
             pk_list=[],
-            username=self.user.username,
+            saved_view_id=None,
         )
         self._common_no_error_test_assertion(Circuit, job_result)
 
@@ -1174,11 +1182,12 @@ class BulkDeleteTestCase(TransactionTestCase):
         job_result = create_job_result_and_run_job(
             "nautobot.core.jobs.bulk_actions",
             "BulkDeleteObjects",
+            username=self.user.username,
             content_type=self.role_ct.id,
             delete_all=False,
             filter_query_params={},
             pk_list=roles_pks,
-            username=self.user.username,
+            saved_view_id=None,
         )
         self._common_no_error_test_assertion(Role, job_result, pk__in=roles_pks)
         self.assertTrue(Role.objects.filter(name=roles_to_ignore.name).exists())
@@ -1192,10 +1201,12 @@ class BulkDeleteTestCase(TransactionTestCase):
         job_result = create_job_result_and_run_job(
             "nautobot.core.jobs.bulk_actions",
             "BulkDeleteObjects",
+            username=self.user.username,
             content_type=self.status_ct.id,
             delete_all=True,
-            filter_query_params={"name__isw": "Example Status", "sort": "name"},
-            username=self.user.username,
+            filter_query_params={"name__isw": ["Example Status"], "sort": ["name"]},
+            pk_list=[],
+            saved_view_id=None,
         )
         self._common_no_error_test_assertion(Status, job_result, name__istartswith="Example Status")
         self.assertTrue(Status.objects.filter(name=status_to_ignore.name).exists())
@@ -1211,11 +1222,12 @@ class BulkDeleteTestCase(TransactionTestCase):
         job_result = create_job_result_and_run_job(
             "nautobot.core.jobs.bulk_actions",
             "BulkDeleteObjects",
+            username=self.user.username,
             content_type=self.role_ct.id,
             delete_all=False,
-            filter_query_params={"name__isw": "Example Status"},
+            filter_query_params={"name__isw": ["Example Status"]},
             pk_list=roles_pks,
-            username=self.user.username,
+            saved_view_id=None,
         )
         self._common_no_error_test_assertion(Role, job_result, pk__in=roles_pks)
         self.assertTrue(Role.objects.filter(name=roles_to_ignore.name).exists())
@@ -1228,10 +1240,11 @@ class BulkDeleteTestCase(TransactionTestCase):
         job_result = create_job_result_and_run_job(
             "nautobot.core.jobs.bulk_actions",
             "BulkDeleteObjects",
+            username=self.user.username,
             content_type=self.status_ct.pk,
             delete_all=True,
-            filter_query_params={"name__isw": "Example Status", "sort": "name"},
+            filter_query_params={"name__isw": ["Example Status"]},
             pk_list=[str(Status.objects.first().pk)],
-            username=self.user.username,
+            saved_view_id=None,
         )
         self._common_no_error_test_assertion(Role, job_result, name__istartswith="Example Status")

nautobot/core/tests/test_ui.py

@@ -4,10 +4,25 @@ from unittest.mock import patch
 
 from django.template import Context
 from django.test import RequestFactory
+from django.urls import reverse
 
+from nautobot.cloud.models import CloudNetwork, CloudResourceType, CloudService
+from nautobot.cloud.tables import CloudServiceTable
+from nautobot.cloud.views import CloudResourceTypeUIViewSet
 from nautobot.core.templatetags.helpers import HTML_NONE
 from nautobot.core.testing import TestCase
-from nautobot.core.ui.object_detail import BaseTextPanel, DataTablePanel, ObjectFieldsPanel, ObjectsTablePanel, Panel
+from nautobot.core.ui.object_detail import (
+    _ObjectDetailAdvancedTab,
+    _ObjectDetailMainTab,
+    BaseTextPanel,
+    DataTablePanel,
+    DistinctViewTab,
+    ObjectDetailContent,
+    ObjectFieldsPanel,
+    ObjectsTablePanel,
+    Panel,
+    SectionChoices,
+)
 from nautobot.dcim.models import DeviceRedundancyGroup
 from nautobot.dcim.tables.devices import DeviceTable
 
@@ -213,3 +228,162 @@ class ObjectsTablePanelTest(TestCase):
             panel.get_extra_context(context_data)
 
         self.assertIn("non-existent column `non_existent_column`", str(context.exception))
+
+
+class ObjectDetailContentExtraTabsTest(TestCase):
+    """
+    Test suite for verifying the behavior of ObjectDetailContent when rendering default and extra tabs.
+    """
+
+    user_permissions = ["cloud.view_cloudresourcetype", "cloud.view_cloudservice", "cloud.view_cloudnetwork"]
+
+    def setUp(self):
+        super().setUp()
+        self.factory = RequestFactory()
+        self.request = self.factory.get("/")
+        self.request.user = self.user
+        self.default_tabs_id = ["main", "advanced", "contacts", "dynamic_groups", "object_metadata"]
+
+    def test_default_extra_tabs_exist(self):
+        """
+        Test the default set of tabs (main, advanced, contacts, dynamic_groups, object_metadata) is present.
+        """
+        content = ObjectDetailContent(
+            panels=[],
+        )
+
+        self.assertEqual(len(content.tabs), len(self.default_tabs_id))
+        tab_ids = [t.tab_id for t in content.tabs]
+        self.assertListEqual(tab_ids, self.default_tabs_id)
+
+    def test_extra_tabs_exist(self):
+        """
+        Test that extra tabs (e.g. "services") can be injected via the `extra_tabs` argument.
+        Validating that tab IDs are correctly combined when extra tabs are provided.
+        """
+        content = ObjectDetailContent(
+            panels=[],
+            extra_tabs=[
+                DistinctViewTab(
+                    weight=1000,
+                    tab_id="services",
+                    label="Cloud Services",
+                    url_name="cloud:cloudresourcetype_services",
+                    related_object_attribute="cloud_services",
+                    panels=(
+                        ObjectsTablePanel(
+                            section=SectionChoices.FULL_WIDTH,
+                            weight=100,
+                            table_class=CloudServiceTable,
+                            table_filter="cloud_resource_type",
+                            tab_id="services",
+                        ),
+                    ),
+                ),
+            ],
+        )
+
+        self.assertEqual(len(content.tabs), len(self.default_tabs_id) + 1)
+        tab_ids = [t.tab_id for t in content.tabs]
+        self.default_tabs_id.append("services")
+        self.assertListEqual(tab_ids, self.default_tabs_id)
+
+    def test_extra_tab_panel_context(self):
+        """
+        Confirming that extra tab panels produce the correct context,
+        including `url` and `body_content_table` populated with the expected related objects.
+        """
+        cloud_resource_type = CloudResourceType.objects.get_for_model(CloudNetwork)[0]
+        cloud_services = CloudService.objects.filter(cloud_resource_type=cloud_resource_type)
+
+        tab = DistinctViewTab(
+            weight=1000,
+            tab_id="services",
+            label="Cloud Services",
+            url_name="cloud:cloudresourcetype_services",
+            related_object_attribute="cloud_services",
+            panels=(
+                ObjectsTablePanel(
+                    section=SectionChoices.FULL_WIDTH,
+                    weight=100,
+                    table_class=CloudServiceTable,
+                    table_filter="cloud_resource_type",
+                    tab_id="services",
+                ),
+            ),
+        )
+        context = {"request": self.request, "object": cloud_resource_type}
+        extra_context = tab.get_extra_context(context)
+        self.assertIn("url", extra_context)
+        self.assertTrue(extra_context["url"].endswith("/services/"))
+
+        panel = tab.panels[0]
+        panel_context = panel.get_extra_context(context)
+
+        self.assertIn("body_content_table", panel_context)
+        table = panel_context["body_content_table"]
+        self.assertQuerySetEqual(cloud_services, table.data)
+
+    def test_tab_conditional_rendering(self):
+        """
+        Assert default tabs render on the main detail view but not sub-views, while distinct-view-tabs do the reverse.
+        """
+        cloud_resource_type = CloudResourceType.objects.get_for_model(CloudNetwork)[0]
+        content = CloudResourceTypeUIViewSet.object_detail_content
+
+        # Main detail view renders all base tabs and no DistinctViewTabs
+        request = self.factory.get(cloud_resource_type.get_absolute_url())
+        request.user = self.user
+        context_data = {
+            "request": request,
+            "object": cloud_resource_type,
+            "settings": {},
+            "csrf_token": "",
+            "perms": [],
+            "created_by": self.request.user,
+            "last_updated_by": self.request.user,
+            "view_action": "retrieve",
+            "detail": True,
+        }
+        context = Context(context_data)
+        for tab in content.tabs:
+            if isinstance(tab, DistinctViewTab):
+                with patch.object(tab.panels[0], "render", wraps=tab.panels[0].render) as panel_render:
+                    self.assertEqual(tab.render(context), "")
+                    panel_render.assert_not_called()
+            elif isinstance(tab, (_ObjectDetailMainTab, _ObjectDetailAdvancedTab)):  # other base tabs might not render
+                with patch.object(tab.panels[0], "render", wraps=tab.panels[0].render) as panel_render:
+                    self.assertNotEqual(tab.render(context), "")
+                    panel_render.assert_called()
+
+        # Distinct tab view renders its tab *only*
+        request = self.factory.get(reverse("cloud:cloudresourcetype_networks", kwargs={"pk": cloud_resource_type.pk}))
+        request.user = self.user
+        context_data["request"] = request
+        context_data["view_action"] = "networks"
+        context = Context(context_data)
+        for tab in content.tabs:
+            if isinstance(tab, DistinctViewTab) and tab.url_name == "cloud:cloudresourcetype_networks":  # pylint: disable=no-member
+                with patch.object(tab.panels[0], "render", wraps=tab.panels[0].render) as panel_render:
+                    self.assertNotEqual(tab.render(context), "")
+                    panel_render.assert_called()
+            else:
+                with patch.object(tab.panels[0], "render", wraps=tab.panels[0].render) as panel_render:
+                    self.assertEqual(tab.render(context), "")
+                    panel_render.assert_not_called()
+
+        # Same, but for a different distinct view tab
+        request = self.factory.get(reverse("cloud:cloudresourcetype_services", kwargs={"pk": cloud_resource_type.pk}))
+        request.user = self.user
+        context_data["request"] = request
+        context_data["view_action"] = "services"
+        context = Context(context_data)
+        for tab in content.tabs:
+            if isinstance(tab, DistinctViewTab) and tab.url_name == "cloud:cloudresourcetype_services":  # pylint: disable=no-member
+                with patch.object(tab.panels[0], "render", wraps=tab.panels[0].render) as panel_render:
+                    self.assertNotEqual(tab.render(context), "")
+                    panel_render.assert_called()
+            else:
+                with patch.object(tab.panels[0], "render", wraps=tab.panels[0].render) as panel_render:
+                    self.assertEqual(tab.render(context), "")
+                    panel_render.assert_not_called()

nautobot/core/tests/test_utils.py

@@ -81,6 +81,41 @@ class NormalizeQueryDictTest(TestCase):
             {"name": ["Sample Status"], "content_types": ["dcim.device"]},
         )
 
+        self.assertDictEqual(
+            requests.normalize_querydict({"name": ["Sample Status"], "content_types": ["1"]}, form_class=StatusForm),
+            {"name": "Sample Status", "content_types": ["1"]},
+        )
+
+        self.assertDictEqual(
+            requests.normalize_querydict(
+                requests.convert_querydict_to_dict(QueryDict("name=Sample Status&content_types=1")),
+                form_class=StatusForm,
+            ),
+            {"name": "Sample Status", "content_types": ["1"]},
+        )
+
+
+class ConvertQueryDictToDictTest(TestCase):
+    """
+    Validate convert_querydict_to_dict() utility function.
+    """
+
+    def test_convert_querydict_to_dict(self):
+        self.assertDictEqual(
+            requests.convert_querydict_to_dict(QueryDict("foo=1&bar=2&bar=3&baz=")),
+            {"foo": ["1"], "bar": ["2", "3"], "baz": [""]},
+        )
+
+        self.assertDictEqual(
+            requests.convert_querydict_to_dict(QueryDict("name=Sample Status&content_types=1")),
+            {"name": ["Sample Status"], "content_types": ["1"]},
+        )
+
+        self.assertDictEqual(
+            requests.convert_querydict_to_dict(QueryDict("name=Sample Status&content_types=dcim.device")),
+            {"name": ["Sample Status"], "content_types": ["dcim.device"]},
+        )
+
 
 class DeepMergeTest(TestCase):
     """

nautobot/core/tests/test_views_generic.py

@@ -0,0 +1,43 @@
+from itertools import combinations
+
+from nautobot.core.testing import TestCase
+from nautobot.core.views import generic
+from nautobot.dcim.models import Location
+
+
+class TestViewsGeneric(TestCase):
+    def test_mro_resolve_for_generic_views(self):
+        """
+        Test if all the generic views can be used extend view class.
+
+        Tries to detect if there is no MRO issues according to the #7829.
+        """
+        generic_views = [
+            generic.GenericView,
+            generic.ObjectListView,
+            generic.ObjectView,
+            generic.ObjectEditView,
+            generic.ObjectDeleteView,
+            generic.BulkCreateView,
+            generic.ObjectImportView,
+            generic.BulkImportView,
+            generic.BulkEditView,
+            generic.BulkRenameView,
+            generic.BulkDeleteView,
+            generic.ComponentCreateView,
+            generic.BulkComponentCreateView,
+        ]
+        generic_views_pairs = combinations(generic_views, 2)
+
+        for base_view, extension_view in generic_views_pairs:
+            with self.subTest("Test different class inheritance."):
+
+                class MyMixin(base_view):
+                    pass
+
+                # Defining this class will fail if there is MRO issue
+                # pylint: disable=unused-variable
+                class MyView(MyMixin, extension_view):
+                    queryset = Location.objects.all()
+
+                # pylint: enable=unused-variable