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

nautobot/extras/templates/extras/webhook.html

@@ -2,95 +2,95 @@
 {% load helpers %}
 
 {% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Webhook</strong>
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Webhook</strong>
+        </div>
 
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Object Type(s)</td>
-                    <td>
-                        <ul>
-                            {% for content_type in content_types %}
-                                <li>{{ content_type }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Call On:</td>
-                    <td>
-                        {{ object.type_create | render_boolean }}
-                        <span>Create</span>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Object Type(s)</td>
+                <td>
+                    <ul>
+                        {% for content_type in content_types %}
+                            <li>{{ content_type }}</li>
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+            <tr>
+                <td>Call On:</td>
+                <td>
+                    {{ object.type_create | render_boolean }}
+                    <span>Create</span>
 
-                        <span style="margin-left: 2rem;">{{ object.type_update | render_boolean }}</span>
-                        <span>Update</span>
+                    <span style="margin-left: 2rem;">{{ object.type_update | render_boolean }}</span>
+                    <span>Update</span>
 
-                        <span style="margin-left: 2rem;">{{ object.type_delete | render_boolean }}</span>
-                        <span>Delete </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Enabled</td>
-                    <td>{{ object.enabled | render_boolean }}</td>
-                </tr>
-            </table>
+                    <span style="margin-left: 2rem;">{{ object.type_delete | render_boolean }}</span>
+                    <span>Delete </span>
+                </td>
+            </tr>
+            <tr>
+                <td>Enabled</td>
+                <td>{{ object.enabled | render_boolean }}</td>
+            </tr>
+        </table>
 
-        </div>
+    </div>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>HTTP</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>HTTP Method</td>
-                    <td><span>{{ object.http_method }}</span></td>
-                </tr>
-                <tr>
-                    <td>HTTP Content Type</td>
-                    <td><span>{{ object.http_content_type }}</span></td>
-                </tr>
-                <tr>
-                    <td>Payload URL</td>
-                    <td><span>{{ object.payload_url }}</span></td>
-                </tr>
-                <tr>
-                    <td>Additional Headers</td>
-                    <td><span>{% if object.additional_headers %} <pre>{{ object.additional_headers }}</pre> {% else %} {{ None }} {% endif %}</span></td>
-                </tr>
-            </table>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>HTTP</strong>
         </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>HTTP Method</td>
+                <td><span>{{ object.http_method }}</span></td>
+            </tr>
+            <tr>
+                <td>HTTP Content Type</td>
+                <td><span>{{ object.http_content_type }}</span></td>
+            </tr>
+            <tr>
+                <td>Payload URL</td>
+                <td><span>{{ object.payload_url }}</span></td>
+            </tr>
+            <tr>
+                <td>Additional Headers</td>
+                <td><span>{% if object.additional_headers %} <pre>{{ object.additional_headers }}</pre> {% else %} {{ None }} {% endif %}</span></td>
+            </tr>
+        </table>
+    </div>
 
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Security</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Secret</td>
-                    <td>{{ object.secret | placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>SSL Verification</td>
-                    <td>{{ object.ssl_verification | render_boolean }}</td>
-                </tr>
-                <tr>
-                    <td>CA File Path</td>
-                    <td><span>{{ object.ca_file_path | placeholder }}</span></td>
-                </tr>
-            </table>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Security</strong>
         </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Secret</td>
+                <td>{{ object.secret | placeholder }}</td>
+            </tr>
+            <tr>
+                <td>SSL Verification</td>
+                <td>{{ object.ssl_verification | render_boolean }}</td>
+            </tr>
+            <tr>
+                <td>CA File Path</td>
+                <td><span>{{ object.ca_file_path | placeholder }}</span></td>
+            </tr>
+        </table>
+    </div>
 {% endblock content_left_page %}
 
 {% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Body Template</strong>
-            </div>
-            <div class="panel-body">
-                {% if object.body_template %} <pre>{{ object.body_template }}</pre> {% else %} {{ None }} {% endif %}
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Body Template</strong>
+        </div>
+        <div class="panel-body">
+            {% if object.body_template %} <pre>{{ object.body_template }}</pre> {% else %} {{ None }} {% endif %}
         </div>
+    </div>
 {% endblock content_right_page %}

nautobot/extras/tests/integration/test_relationships.py

@@ -34,7 +34,7 @@ class RelationshipsTestCase(SeleniumTestCase):
         device = create_test_device()
         power_panel = PowerPanel.objects.create(
             location=device.location,
-            name="Test Power Panel",
+            name="Test-Power-Panel",
         )
         power_panel_ct = ContentType.objects.get_for_model(PowerPanel)
         device_content_type = ContentType.objects.get_for_model(Device)
@@ -53,11 +53,11 @@ class RelationshipsTestCase(SeleniumTestCase):
         # Visit the device detail page
         self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the relationship appears in the primary information tab
-        self.assertTrue(self.browser.is_text_present("power panel"))
-        self.assertTrue(self.browser.is_text_present("Power Panel"))
+        self.assertTrue(self.browser.is_text_present("Test-Power-Panel"))  # related object
+        self.assertTrue(self.browser.is_text_present("Power Panel"))  # relationship label
         # Check the relationship does NOT appear in the advanced tab
         self.browser.links.find_by_partial_text("Advanced")[0].click()
-        self.assertFalse(self.browser.is_text_present("power panel"))
+        self.assertFalse(self.browser.is_text_present("Test-Power-Panel"))
         self.assertFalse(self.browser.is_text_present("Power Panel"))
         # Set the custom_field to only show in the advanced tab
         relationship.advanced_ui = True
@@ -65,9 +65,9 @@ class RelationshipsTestCase(SeleniumTestCase):
         # Visit the device detail page
         self.browser.visit(f"{self.live_server_url}{reverse('dcim:device', kwargs={'pk': device.pk})}")
         # Check the relationship does NOT appear in the primary information tab
-        self.assertFalse(self.browser.is_text_present("power panel"))
+        self.assertFalse(self.browser.is_text_present("Test-Power-Panel"))
         self.assertFalse(self.browser.is_text_present("Power Panel"))
         # Check the relationship appears in the advanced tab
         self.browser.links.find_by_partial_text("Advanced")[0].click()
-        self.assertTrue(self.browser.is_text_present("power panel"))
+        self.assertTrue(self.browser.is_text_present("Test-Power-Panel"))
         self.assertTrue(self.browser.is_text_present("Power Panel"))

nautobot/extras/tests/test_dynamicgroups.py

@@ -18,6 +18,7 @@ from nautobot.dcim.models import (
     Device,
     DeviceType,
     FrontPort,
+    InventoryItem,
     Location,
     LocationType,
     Manufacturer,
@@ -107,6 +108,24 @@ class DynamicGroupTestBase(TestCase):
             ),
         ]
 
+        cls.inventory_items = [
+            InventoryItem.objects.create(
+                name="device-location-1-item-1",
+                serial="location-1-item-1",
+                device=cls.devices[0],
+            ),
+            InventoryItem.objects.create(
+                name="device-location-1-item-2",
+                serial="location-1-item-2",
+                device=cls.devices[0],
+            ),
+            InventoryItem.objects.create(
+                name="device-location-2-item-1",
+                serial="location-2-item-1",
+                device=cls.devices[1],
+            ),
+        ]
+
         cls.groups = [
             DynamicGroup.objects.create(
                 name="Parent",
@@ -152,7 +171,13 @@ class DynamicGroupTestBase(TestCase):
             DynamicGroup.objects.create(
                 name="MultiValueCharFilter",
                 description="A group with a multivaluechar filter",
-                filter={"name": ["device-1", "device-2", "device-3"]},
+                filter={"name": ["device-location-1", "device-location-2", "device-location-3"]},
+                content_type=cls.device_ct,
+            ),
+            DynamicGroup.objects.create(
+                name="SearchFilter",
+                description="A group with a search filter",
+                filter={"q": "location-1"},
                 content_type=cls.device_ct,
             ),
         ]
@@ -165,6 +190,8 @@ class DynamicGroupTestBase(TestCase):
         cls.third_child = cls.groups[3]
         cls.nested_child = cls.groups[4]
         cls.no_match_filter = cls.groups[5]
+        cls.multivaluechar_filter = cls.groups[6]
+        cls.search_filter = cls.groups[7]
         cls.invalid_filter = DynamicGroup.objects.create(
             name="Invalid Filter",
             description="A group with a filter that's invalid",
@@ -289,6 +316,9 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         self.assertIn(device1, group.members)
         self.assertNotIn(device2, group.members)
 
+        group = self.search_filter
+        self.assertIn(device1, group.members)
+
     def test_static_member_operations(self):
         sg = DynamicGroup.objects.create(
             name="All Prefixes",
@@ -437,17 +467,24 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
 
     def test_count(self):
         """Test `DynamicGroup.count`."""
-        expected = {
-            self.parent.count: 2,
-            self.first_child.count: 1,
-            self.second_child.count: 1,
-            self.third_child.count: 2,
-            self.nested_child.count: 2,
-            self.no_match_filter.count: 0,
-            self.invalid_filter.count: 0,
-        }
-        for grp, cnt in expected.items():
-            self.assertEqual(grp, cnt)
+        expected = [
+            (self.parent, 1),
+            (self.first_child, 1),
+            (self.second_child, 1),
+            (self.third_child, 2),
+            (self.nested_child, 2),
+            (self.no_match_filter, 0),
+            (self.multivaluechar_filter, 3),
+            (self.search_filter, 1),
+            (self.invalid_filter, 0),
+        ]
+        for grp, cnt in expected:
+            with self.subTest(grp.name):
+                self.assertEqual(grp.count, cnt, list(grp.members.values_list("name", flat=True)))
+                self.assertEqual(grp.members.count(), cnt, list(grp.members.values_list("name", flat=True)))
+                # https://github.com/nautobot/nautobot/issues/7631
+                members = grp.update_cached_members()
+                self.assertEqual(members.count(), cnt, list(members.values_list("name", flat=True)))
 
     def test_model(self):
         """Test `DynamicGroup.model`."""
@@ -635,9 +672,9 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         group1 = self.first_child  # Filter has `location`
         self.assertEqual(group1.get_initial(), group1.filter)
         # Test if MultiValueCharField is properly pre-populated
-        group2 = self.groups[6]  # Filter has `name`
+        group2 = self.multivaluechar_filter  # Filter has `name`
         initial = group2.get_initial()
-        expected = {"name": ["device-1", "device-2", "device-3"]}
+        expected = {"name": ["device-location-1", "device-location-2", "device-location-3"]}
         self.assertEqual(initial, expected)
 
     def test_set_filter(self):
@@ -1152,7 +1189,11 @@ class DynamicGroupMixinModelTest(DynamicGroupTestBase):
         with self.assertNumQueries(1):
             qs = self.devices[0].dynamic_groups
             list(qs)
-        self.assertQuerysetEqualAndNotEmpty(qs, [self.first_child, self.third_child, self.nested_child], ordered=False)
+        self.assertQuerysetEqualAndNotEmpty(
+            qs,
+            [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter],
+            ordered=False,
+        )
 
     def test_dynamic_groups_cached(self):
         for group in self.groups:
@@ -1160,21 +1201,35 @@ class DynamicGroupMixinModelTest(DynamicGroupTestBase):
         with self.assertNumQueries(1):
             qs = self.devices[0].dynamic_groups_cached
             list(qs)
-        self.assertQuerysetEqualAndNotEmpty(qs, [self.first_child, self.third_child, self.nested_child], ordered=False)
+        self.assertQuerysetEqualAndNotEmpty(
+            qs,
+            [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter],
+            ordered=False,
+        )
 
     def test_dynamic_groups_list(self):
         for group in self.groups:
             group.update_cached_members()
         with self.assertNumQueries(1):
             groups = self.devices[0].dynamic_groups_list
-        self.assertEqual(set(groups), set([self.first_child, self.third_child, self.nested_child]))
+        self.assertEqual(
+            set(groups),
+            set(
+                [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter]
+            ),
+        )
 
     def test_dynamic_groups_list_cached(self):
         for group in self.groups:
             group.update_cached_members()
         with self.assertNumQueries(1):
             groups = self.devices[0].dynamic_groups_list_cached
-        self.assertEqual(set(groups), set([self.first_child, self.third_child, self.nested_child]))
+        self.assertEqual(
+            set(groups),
+            set(
+                [self.first_child, self.third_child, self.nested_child, self.multivaluechar_filter, self.search_filter]
+            ),
+        )
 
 
 class DynamicGroupFilterTest(DynamicGroupTestBase, FilterTestCases.FilterTestCase):

nautobot/extras/tests/test_filters.py

@@ -911,7 +911,7 @@ class JobFilterSetTestCase(FilterTestCases.FilterTestCase):
 
     def test_hidden(self):
         params = {"hidden": True}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_read_only(self):
         params = {"read_only": True}

nautobot/extras/tests/test_jobs.py

@@ -352,6 +352,7 @@ class JobTransactionTest(TransactionTestCase):
             "BulkEditObjects",
             content_type=job_ct.id,
             edit_all=False,
+            pk_list=pk_list,
             filter_query_params={},
             form_data={
                 "pk": pk_list,
@@ -395,6 +396,7 @@ class JobTransactionTest(TransactionTestCase):
             "BulkEditObjects",
             content_type=job_ct.id,
             edit_all=False,
+            pk_list=pk_list,
             filter_query_params={},
             form_data={
                 "pk": pk_list,

nautobot/extras/tests/test_views.py

@@ -979,6 +979,7 @@ class DynamicGroupTestCase(
     ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.BulkDeleteObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
     # NOTE: This isn't using `ViewTestCases.PrimaryObjectViewTestCase` because bulk-import/edit
     # views for DynamicGroup do not make sense at this time, primarily because `content_type` is
     # immutable after create.
@@ -1009,6 +1010,10 @@ class DynamicGroupTestCase(
             "dynamic_group_memberships-MIN_NUM_FORMS": "0",
             "dynamic_group_memberships-MAX_NUM_FORMS": "1000",
         }
+        cls.bulk_edit_data = {
+            "description": "This is a very detailed new description",
+            "tenant": Tenant.objects.last().pk,
+        }
 
     def _get_queryset(self):
         return super()._get_queryset().filter(group_type=DynamicGroupTypeChoices.TYPE_DYNAMIC_FILTER)  # TODO
@@ -4319,8 +4324,8 @@ class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases
                 if content_type not in role_content_types:
                     if result == "Contact Associations":
                         # AssociationContact Table in the contact tab should be there.
-                        self.assertIn(
-                            f'<strong>{result}</strong>\n                                    <div class="pull-right noprint">\n',
+                        self.assertInHTML(
+                            f'<strong>{result}</strong><div class="pull-right noprint">',
                             response_body,
                         )
                         # ContactAssociationTable related to this role instances should not be there.
@@ -4331,4 +4336,4 @@ class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases
                     else:
                         self.assertNotIn(f"<strong>{result}</strong>", response_body)
                 else:
-                    self.assertIn(f"<strong>{result}</strong>", response_body)
+                    self.assertInHTML(f"<strong>{result}</strong>", response_body)

nautobot/extras/urls.py

@@ -3,8 +3,6 @@ from django.urls import path
 from nautobot.core.views.routers import NautobotUIViewSetRouter
 from nautobot.extras import views
 from nautobot.extras.models import (
-    DynamicGroup,
-    GitRepository,
     Job,
     Relationship,
 )
@@ -19,14 +17,17 @@ router.register("contacts", views.ContactUIViewSet)
 router.register("contact-associations", views.ContactAssociationUIViewSet)
 router.register("custom-fields", views.CustomFieldUIViewSet)
 router.register("custom-links", views.CustomLinkUIViewSet)
+router.register("dynamic-groups", views.DynamicGroupUIViewSet)
 router.register("export-templates", views.ExportTemplateUIViewSet)
 router.register("external-integrations", views.ExternalIntegrationUIViewSet)
+router.register("git-repositories", views.GitRepositoryUIViewSet)
 router.register("graphql-queries", views.GraphQLQueryUIViewSet)
 router.register("job-buttons", views.JobButtonUIViewSet)
 router.register("job-hooks", views.JobHookUIViewSet)
 router.register("job-queues", views.JobQueueUIViewSet)
 router.register("job-results", views.JobResultUIViewSet)
 router.register("metadata-types", views.MetadataTypeUIViewSet)
+router.register("object-changes", views.ObjectChangeUIViewSet)
 router.register("notes", views.NoteUIViewSet)
 router.register("object-metadata", views.ObjectMetadataUIViewSet)
 router.register("relationship-associations", views.RelationshipAssociationUIViewSet)
@@ -42,9 +43,6 @@ router.register("teams", views.TeamUIViewSet)
 router.register("webhooks", views.WebhookUIViewSet)
 
 urlpatterns = [
-    # Change logging
-    path("object-changes/", views.ObjectChangeListView.as_view(), name="objectchange_list"),
-    path("object-changes/<uuid:pk>/", views.ObjectChangeView.as_view(), name="objectchange"),
     # Config context schema
     path(
         "config-context-schemas/<uuid:pk>/validation/",
@@ -59,98 +57,6 @@ urlpatterns = [
         views.ObjectAssignContactOrTeamView.as_view(),
         name="object_contact_team_assign",
     ),
-    # Dynamic Groups
-    path("dynamic-groups/", views.DynamicGroupListView.as_view(), name="dynamicgroup_list"),
-    path("dynamic-groups/add/", views.DynamicGroupEditView.as_view(), name="dynamicgroup_add"),
-    path("dynamic-groups/assign-members/", views.DynamicGroupBulkAssignView.as_view(), name="dynamicgroup_bulk_assign"),
-    path(
-        "dynamic-groups/delete/",
-        views.DynamicGroupBulkDeleteView.as_view(),
-        name="dynamicgroup_bulk_delete",
-    ),
-    path("dynamic-groups/<uuid:pk>/", views.DynamicGroupView.as_view(), name="dynamicgroup"),
-    path("dynamic-groups/<uuid:pk>/edit/", views.DynamicGroupEditView.as_view(), name="dynamicgroup_edit"),
-    path("dynamic-groups/<uuid:pk>/delete/", views.DynamicGroupDeleteView.as_view(), name="dynamicgroup_delete"),
-    path(
-        "dynamic-groups/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="dynamicgroup_changelog",
-        kwargs={"model": DynamicGroup},
-    ),
-    path(
-        "dynamic-groups/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="dynamicgroup_notes",
-        kwargs={"model": DynamicGroup},
-    ),
-    # Git repositories
-    path(
-        "git-repositories/",
-        views.GitRepositoryListView.as_view(),
-        name="gitrepository_list",
-    ),
-    path(
-        "git-repositories/add/",
-        views.GitRepositoryEditView.as_view(),
-        name="gitrepository_add",
-    ),
-    path(
-        "git-repositories/delete/",
-        views.GitRepositoryBulkDeleteView.as_view(),
-        name="gitrepository_bulk_delete",
-    ),
-    path(
-        "git-repositories/edit/",
-        views.GitRepositoryBulkEditView.as_view(),
-        name="gitrepository_bulk_edit",
-    ),
-    path(
-        "git-repositories/import/",
-        views.GitRepositoryBulkImportView.as_view(),  # 3.0 TODO: remove, unused
-        name="gitrepository_import",
-    ),
-    path(
-        "git-repositories/<uuid:pk>/",
-        views.GitRepositoryView.as_view(),
-        name="gitrepository",
-    ),
-    path(
-        "git-repositories/<uuid:pk>/edit/",
-        views.GitRepositoryEditView.as_view(),
-        name="gitrepository_edit",
-    ),
-    path(
-        "git-repositories/<uuid:pk>/delete/",
-        views.GitRepositoryDeleteView.as_view(),
-        name="gitrepository_delete",
-    ),
-    path(
-        "git-repositories/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="gitrepository_changelog",
-        kwargs={"model": GitRepository},
-    ),
-    path(
-        "git-repositories/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="gitrepository_notes",
-        kwargs={"model": GitRepository},
-    ),
-    path(
-        "git-repositories/<uuid:pk>/result/",
-        views.GitRepositoryResultView.as_view(),
-        name="gitrepository_result",
-    ),
-    path(
-        "git-repositories/<uuid:pk>/sync/",
-        views.GitRepositorySyncView.as_view(),
-        name="gitrepository_sync",
-    ),
-    path(
-        "git-repositories/<uuid:pk>/dry-run/",
-        views.GitRepositoryDryRunView.as_view(),
-        name="gitrepository_dryrun",
-    ),
     # Image attachments
     path(
         "image-attachments/<uuid:pk>/edit/",