nautobot 2.4.5__py3-none-any.whl → 2.4.6__py3-none-any.whl

nautobot/extras/tests/test_api.py

@@ -292,7 +292,7 @@ class ConfigContextTest(APIViewTestCases.APIViewTestCase):
         schema = ConfigContextSchema.objects.create(
             name="Schema 1", data_schema={"type": "object", "properties": {"foo": {"type": "string"}}}
         )
-        self.add_permissions("extras.add_configcontext")
+        self.add_permissions("extras.add_configcontext", "extras.view_configcontextschema")
 
         data = {
             "name": "Config Context with schema",
@@ -2248,7 +2248,7 @@ class JobHookTest(APIViewTestCases.APIViewTestCase):
             "type_delete": True,
         }
 
-        self.add_permissions("extras.add_jobhook")
+        self.add_permissions("extras.add_jobhook", "extras.view_job")
         response = self.client.post(self._get_list_url(), data, format="json", **self.header)
         self.assertContains(
             response,
@@ -2264,7 +2264,7 @@ class JobHookTest(APIViewTestCases.APIViewTestCase):
             "type_delete": True,
         }
 
-        self.add_permissions("extras.change_jobhook")
+        self.add_permissions("extras.change_jobhook", "extras.view_job")
         job_hook2 = JobHook.objects.get(name="JobHook2")
         response = self.client.patch(self._get_detail_url(job_hook2), data, format="json", **self.header)
         self.assertContains(
@@ -2553,7 +2553,7 @@ class UserSavedViewAssociationTest(APIViewTestCases.APIViewTestCase):
             "saved_view": saved_view.pk,
             "view_name": duplicate_view_name,
         }
-        self.add_permissions("extras.add_usersavedviewassociation")
+        self.add_permissions("extras.add_usersavedviewassociation", "users.view_user", "extras.view_savedview")
         response = self.client.post(
             self._get_list_url(), duplicate_user_to_savedview_create_data, format="json", **self.header
         )
@@ -3240,7 +3240,15 @@ class RelationshipTest(APIViewTestCases.APIViewTestCase, RequiredRelationshipTes
             location=existing_location_2,
         )
 
-        self.add_permissions("dcim.view_location", "dcim.add_location", "extras.add_relationshipassociation")
+        self.add_permissions(
+            "dcim.view_location",
+            "dcim.view_locationtype",
+            "dcim.view_device",
+            "dcim.add_location",
+            "extras.view_relationship",
+            "extras.add_relationshipassociation",
+            "extras.view_status",
+        )
         response = self.client.post(
             reverse("dcim-api:location-list"),
             data={
@@ -3564,7 +3572,9 @@ class RelationshipAssociationTest(APIViewTestCases.APIViewTestCase):
             ),
         ]
 
-        self.add_permissions("extras.add_relationshipassociation")
+        self.add_permissions(
+            "extras.add_relationshipassociation", "dcim.view_device", "dcim.view_location", "extras.view_relationship"
+        )
 
         for side, field_error_name, data in associations:
             response = self.client.post(self._get_list_url(), data, format="json", **self.header)
@@ -3585,7 +3595,9 @@ class RelationshipAssociationTest(APIViewTestCases.APIViewTestCase):
             "destination_id": self.devices[2].pk,
         }
 
-        self.add_permissions("extras.add_relationshipassociation")
+        self.add_permissions(
+            "extras.add_relationshipassociation", "extras.view_relationship", "dcim.view_device", "dcim.view_location"
+        )
 
         response = self.client.post(self._get_list_url(), data, format="json", **self.header)
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
@@ -3636,8 +3648,11 @@ class RelationshipAssociationTest(APIViewTestCases.APIViewTestCase):
         Check that relationship-associations can be updated via the 'relationships' field.
         """
         self.add_permissions(
+            "dcim.view_device",
             "dcim.view_location",
             "dcim.change_location",
+            "extras.view_relationship",
+            "extras.view_relationshipassociation",
             "extras.add_relationshipassociation",
             "extras.delete_relationshipassociation",
         )

nautobot/extras/tests/test_changelog.py

@@ -277,7 +277,7 @@ class ChangeLogAPITest(APITestCase):
             ],
         }
         url = reverse("dcim-api:location-list")
-        self.add_permissions("dcim.add_location", "extras.view_status")
+        self.add_permissions("dcim.add_location", "dcim.view_locationtype", "extras.view_tag", "extras.view_status")
 
         response = self.client.post(url, data, format="json", **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -310,7 +310,7 @@ class ChangeLogAPITest(APITestCase):
             },
             "tags": [{"name": self.tags[2].name}],
         }
-        self.add_permissions("dcim.change_location", "extras.view_status")
+        self.add_permissions("dcim.change_location", "extras.view_status", "dcim.view_locationtype", "extras.view_tag")
         url = reverse("dcim-api:location-detail", kwargs={"pk": location.pk})
 
         response = self.client.put(url, data, format="json", **self.header)
@@ -457,7 +457,7 @@ class ChangeLogAPITest(APITestCase):
             "status": self.statuses[0].pk,
             "location_type": location_type.pk,
         }
-        self.add_permissions("dcim.add_location")
+        self.add_permissions("dcim.add_location", "dcim.view_locationtype", "extras.view_status")
         url = reverse("dcim-api:location-list")
 
         response = self.client.post(url, location_payload, format="json", **self.header)
@@ -492,7 +492,7 @@ class ChangeLogAPITest(APITestCase):
         )
 
         payload = {"tagged_vlans": [str(tagged_vlan.pk)], "description": "test vm interface m2m change"}
-        self.add_permissions("virtualization.change_vminterface", "ipam.change_vlan")
+        self.add_permissions("virtualization.change_vminterface", "ipam.change_vlan", "ipam.view_vlan")
         url = reverse("virtualization-api:vminterface-detail", kwargs={"pk": vm_interface.pk})
         response = self.client.patch(url, payload, format="json", **self.header)
         vm_interface.refresh_from_db()

nautobot/extras/tests/test_customfields.py

@@ -472,6 +472,9 @@ class CustomFieldDataAPITest(APITestCase):
         "dcim.add_location",
         "dcim.change_location",
         "dcim.view_location",
+        "dcim.view_locationtype",
+        "extras.view_status",
+        "extras.view_customfield",
     )
 
     def setUp(self):

nautobot/extras/tests/test_plugins.py

@@ -486,7 +486,7 @@ class TestUserContextCustomValidator(CustomValidator):
         """
         Used to validate that the correct user context is available in the custom validator.
         """
-        self.validation_error(self.context["user"])
+        self.validation_error(f"TestUserContextCustomValidator: user is {self.context['user']}")
 
 
 class AppCustomValidationTest(TestCase):
@@ -527,22 +527,28 @@ class AppCustomValidationTest(TestCase):
 
     def test_custom_validator_non_web_request_uses_anonymous_user(self):
         location_type = LocationType.objects.get(name="Campus")
-        registry["plugin_custom_validators"]["dcim.locationtype"] = [TestUserContextCustomValidator]
+        before = registry["plugin_custom_validators"]["dcim.locationtype"]
+        try:
+            registry["plugin_custom_validators"]["dcim.locationtype"] = [TestUserContextCustomValidator]
 
-        from django.contrib.auth.models import AnonymousUser
-
-        with self.assertRaises(ValidationError) as context:
-            location_type.clean()
-        self.assertEqual(context.exception.message, AnonymousUser())
+            with self.assertRaises(ValidationError) as context:
+                location_type.clean()
+            self.assertEqual(context.exception.message, "TestUserContextCustomValidator: user is AnonymousUser")
+        finally:
+            registry["plugin_custom_validators"]["dcim.locationtype"] = before
 
     def test_custom_validator_web_request_uses_real_user(self):
         location_type = LocationType.objects.get(name="Campus")
-        registry["plugin_custom_validators"]["dcim.locationtype"] = [TestUserContextCustomValidator]
-
-        with self.assertRaises(ValidationError) as context:
-            with web_request_context(user=self.user):
-                location_type.clean()
-        self.assertEqual(context.exception.message, self.user)
+        before = registry["plugin_custom_validators"]["dcim.locationtype"]
+        try:
+            registry["plugin_custom_validators"]["dcim.locationtype"] = [TestUserContextCustomValidator]
+
+            with self.assertRaises(ValidationError) as context:
+                with web_request_context(user=self.user):
+                    location_type.clean()
+            self.assertEqual(context.exception.message, f"TestUserContextCustomValidator: user is {self.user}")
+        finally:
+            registry["plugin_custom_validators"]["dcim.locationtype"] = before
 
 
 class ExampleModelCustomActionViewTest(TestCase):

nautobot/extras/tests/test_relationships.py

@@ -1,10 +1,13 @@
+import contextlib
 import logging
 import uuid
 
 from django.contrib.contenttypes.models import ContentType
+from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.urls import reverse
 from django.utils.html import format_html
+import redis.exceptions
 
 from nautobot.circuits.models import CircuitType
 from nautobot.core.forms import (
@@ -179,6 +182,12 @@ class RelationshipBaseTest:
             ),
         ]
 
+    def tearDown(self):
+        """Ensure that relationship caches are cleared to avoid leakage into other tests."""
+        with contextlib.suppress(redis.exceptions.ConnectionError):
+            cache.delete_pattern(f"{Relationship.objects.get_for_model_source.cache_key_prefix}.*")
+            cache.delete_pattern(f"{Relationship.objects.get_for_model_destination.cache_key_prefix}.*")
+
 
 class RelationshipTest(RelationshipBaseTest, ModelTestCases.BaseModelTestCase):
     model = Relationship

nautobot/extras/tests/test_tags.py

@@ -46,7 +46,7 @@ class TaggedItemTest(APITestCase):
             "location_type": self.location_type.pk,
         }
         url = reverse("dcim-api:location-list")
-        self.add_permissions("dcim.add_location")
+        self.add_permissions("dcim.add_location", "dcim.view_locationtype", "extras.view_tag", "extras.view_status")
 
         response = self.client.post(url, data, format="json", **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -67,7 +67,7 @@ class TaggedItemTest(APITestCase):
                 {"name": self.tags[3].name},
             ]
         }
-        self.add_permissions("dcim.change_location")
+        self.add_permissions("dcim.change_location", "extras.view_tag")
         url = reverse("dcim-api:location-detail", kwargs={"pk": location.pk})
 
         response = self.client.patch(url, data, format="json", **self.header)

nautobot/extras/tests/test_views.py

@@ -3584,23 +3584,28 @@ class StatusTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
 ):
     model = Status
 
     @classmethod
     def setUpTestData(cls):
         # Status objects to test.
-        content_type = ContentType.objects.get_for_model(Device)
+        device_ct = ContentType.objects.get_for_model(Device)
+        circuit_ct = ContentType.objects.get_for_model(Circuit)
+        interface_ct = ContentType.objects.get_for_model(Interface)
 
         cls.form_data = {
             "name": "new_status",
             "description": "I am a new status object.",
             "color": "ffcc00",
-            "content_types": [content_type.pk],
+            "content_types": [device_ct.pk],
         }
 
         cls.bulk_edit_data = {
             "color": "000000",
+            "add_content_types": [interface_ct.pk, circuit_ct.pk],
+            "remove_content_types": [device_ct.pk],
         }
 
 
@@ -3790,25 +3795,29 @@ class WebhookTestCase(
         }
 
 
-class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
+class RoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
     model = Role
 
     @classmethod
     def setUpTestData(cls):
-        # Status objects to test.
-        content_type = ContentType.objects.get_for_model(Device)
+        # Role objects to test.
+        device_ct = ContentType.objects.get_for_model(Device)
+        ipaddress_ct = ContentType.objects.get_for_model(IPAddress)
+        prefix_ct = ContentType.objects.get_for_model(Prefix)
 
         cls.form_data = {
             "name": "New Role",
             "description": "I am a new role object.",
             "color": ColorChoices.COLOR_GREY,
-            "content_types": [content_type.pk],
+            "content_types": [device_ct.pk],
         }
 
         cls.bulk_edit_data = {
             "color": "000000",
             "description": "I used to be a new role object.",
             "weight": 255,
+            "add_content_types": [ipaddress_ct.pk, prefix_ct.pk],
+            "remove_content_types": [device_ct.pk],
         }
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])

nautobot/extras/urls.py

@@ -17,7 +17,6 @@ from nautobot.extras.models import (
     Note,
     Relationship,
     SecretsGroup,
-    Status,
     Tag,
     Webhook,
 )
@@ -36,6 +35,7 @@ router.register("roles", views.RoleUIViewSet)
 router.register("saved-views", views.SavedViewUIViewSet)
 router.register("secrets", views.SecretUIViewSet)
 router.register("static-group-associations", views.StaticGroupAssociationUIViewSet)
+router.register("statuses", views.StatusUIViewSet)
 router.register("teams", views.TeamUIViewSet)
 
 urlpatterns = [
@@ -589,35 +589,6 @@ urlpatterns = [
         name="secretsgroup_notes",
         kwargs={"model": SecretsGroup},
     ),
-    # Custom statuses
-    path("statuses/", views.StatusListView.as_view(), name="status_list"),
-    path("statuses/add/", views.StatusEditView.as_view(), name="status_add"),
-    path("statuses/edit/", views.StatusBulkEditView.as_view(), name="status_bulk_edit"),
-    path(
-        "statuses/delete/",
-        views.StatusBulkDeleteView.as_view(),
-        name="status_bulk_delete",
-    ),
-    path("statuses/import/", views.StatusBulkImportView.as_view(), name="status_import"),  # 3.0 TODO: remove, unused
-    path("statuses/<uuid:pk>/", views.StatusView.as_view(), name="status"),
-    path("statuses/<uuid:pk>/edit/", views.StatusEditView.as_view(), name="status_edit"),
-    path(
-        "statuses/<uuid:pk>/delete/",
-        views.StatusDeleteView.as_view(),
-        name="status_delete",
-    ),
-    path(
-        "statuses/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="status_changelog",
-        kwargs={"model": Status},
-    ),
-    path(
-        "statuses/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="status_notes",
-        kwargs={"model": Status},
-    ),
     # Tags
     path("tags/", views.TagListView.as_view(), name="tag_list"),
     path("tags/add/", views.TagEditView.as_view(), name="tag_add"),

nautobot/extras/views.py

@@ -2929,62 +2929,18 @@ class DynamicGroupBulkAssignView(GetReturnURLMixin, ObjectPermissionRequiredMixi
 #
 
 
-class StatusListView(generic.ObjectListView):
-    """List `Status` objects."""
-
-    queryset = Status.objects.all()
-    filterset = filters.StatusFilterSet
-    filterset_form = forms.StatusFilterForm
-    table = tables.StatusTable
-
-
-class StatusEditView(generic.ObjectEditView):
-    """Edit a single `Status` object."""
-
-    queryset = Status.objects.all()
-    model_form = forms.StatusForm
-
-
-class StatusBulkEditView(generic.BulkEditView):
-    """Edit multiple `Status` objects."""
-
-    queryset = Status.objects.all()
-    table = tables.StatusTable
-    form = forms.StatusBulkEditForm
-
-
-class StatusBulkDeleteView(generic.BulkDeleteView):
-    """Delete multiple `Status` objects."""
-
-    queryset = Status.objects.all()
-    table = tables.StatusTable
-    filterset = filters.StatusFilterSet
-
-
-class StatusDeleteView(generic.ObjectDeleteView):
-    """Delete a single `Status` object."""
-
-    queryset = Status.objects.all()
-
-
-class StatusBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    """Bulk CSV import of multiple `Status` objects."""
-
-    queryset = Status.objects.all()
-    table = tables.StatusTable
-
-
-class StatusView(generic.ObjectView):
-    """Detail view for a single `Status` object."""
-
+class StatusUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = forms.StatusBulkEditForm
+    filterset_class = filters.StatusFilterSet
+    filterset_form_class = forms.StatusFilterForm
+    form_class = forms.StatusForm
+    serializer_class = serializers.StatusSerializer
+    table_class = tables.StatusTable
     queryset = Status.objects.all()
 
-    def get_extra_context(self, request, instance):
-        """Return ordered content types."""
-        return {
-            "content_types": instance.content_types.order_by("app_label", "model"),
-            **super().get_extra_context(request, instance),
-        }
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(object_detail.ObjectFieldsPanel(weight=100, section=SectionChoices.LEFT_HALF, fields="__all__"),)
+    )
 
 
 #

nautobot/ipam/tables.py

@@ -355,7 +355,11 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
         template_code=PREFIX_COPY_LINK, attrs={"td": {"class": "text-nowrap"}}, order_by=("network", "prefix_length")
     )
     vrf_count = LinkedCountColumn(
-        viewname="ipam:vrf_list", url_params={"prefix": "pk"}, reverse_lookup="prefixes", verbose_name="VRFs"
+        viewname="ipam:vrf_list",
+        url_params={"prefix": "pk"},
+        display_field="name",
+        reverse_lookup="prefixes",
+        verbose_name="VRFs",
     )
     tenant = TenantColumn()
     namespace = tables.Column(linkify=True)
@@ -364,7 +368,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     children = tables.Column(accessor="descendants_count", orderable=False)
     date_allocated = tables.DateTimeColumn()
     location_count = LinkedCountColumn(
-        viewname="dcim:location_list", url_params={"prefixes": "pk"}, verbose_name="Locations"
+        viewname="dcim:location_list", url_params={"prefixes": "pk"}, display_field="name", verbose_name="Locations"
     )
     cloud_networks_count = LinkedCountColumn(
         viewname="cloud:cloudnetwork_list", url_params={"prefixes": "pk"}, verbose_name="Cloud Networks"

nautobot/ipam/templates/ipam/namespace_retrieve.html

@@ -1,42 +1 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Namespace</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description }}</td>
-                </tr>
-                <tr>
-                    <td>Location</td>
-                    <td>{{ object.location | hyperlinked_object }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block extra_nav_tabs %}
-{% if perms.ipam.view_vrf %}
-    <li role="presentation"{% if active_tab == 'vrfs' %} class="active"{% endif %}>
-        <a href="{% url 'ipam:namespace_vrfs' pk=object.pk %}">VRFs <span class="badge">{{ vrf_count }}</span></a>
-    </li>
-{% endif %}
-{% if perms.ipam.view_prefix %}
-    <li role="presentation"{% if active_tab == 'prefixes' %} class="active"{% endif %}>
-        <a href="{% url 'ipam:namespace_prefixes' pk=object.pk %}">Prefixes <span class="badge">{{ prefix_count }}</span></a>
-    </li>
-{% endif %}
-{% if perms.ipam.view_ipaddress %}
-    <li role="presentation"{% if active_tab == 'ip-addresses' %} class="active"{% endif %}>
-        <a href="{% url 'ipam:namespace_ipaddresses' pk=object.pk %}">IP Addresses <span class="badge">{{ ip_address_count }}</span></a>
-    </li>
-{% endif %}
-{% endblock extra_nav_tabs %}

nautobot/ipam/templates/ipam/service.html

@@ -1,46 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-            <li>{{ object.parent|hyperlinked_object }}</li>
-{% endblock extra_breadcrumbs %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Service</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                <tr>
-                    <td>Parent</td>
-                    <td>{{ object.parent|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Protocol</td>
-                    <td>{{ object.get_protocol_display }}</td>
-                </tr>
-                <tr>
-                    <td>Ports</td>
-                    <td>{{ object.port_list }}</td>
-                </tr>
-                <tr>
-                    <td>IP Addresses</td>
-                    <td>
-                        {% for ipaddress in object.ip_addresses.all %}
-                            {{ ipaddress|hyperlinked_object }}<br>
-                        {% empty %}
-                            <span class="text-muted">None</span>
-                        {% endfor %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
+{% extends 'ipam/service_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/service_edit.html

@@ -1,18 +1,2 @@
 {% extends 'generic/object_create.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Service</strong></div>
-        <div class="panel-body">
-            {% render_field form.device %}
-            {% render_field form.virtual_machine %}
-            {% render_field form.name %}
-            {% render_field form.protocol %}
-            {% render_field form.ports %}
-            {% render_field form.ip_addresses %}
-            {% render_field form.description %}
-        </div>
-    </div>
-    {% include 'inc/extras_features_edit_form_fields.html' %}
-{% endblock %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/service_retrieve.html

@@ -0,0 +1,7 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block extra_breadcrumbs %}
+            <li>{{ object.parent|hyperlinked_object }}</li>
+{% endblock extra_breadcrumbs %}
+