nautobot 2.4.1__py3-none-any.whl → 2.4.3__py3-none-any.whl

nautobot/dcim/templates/dcim/powerfeed.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}
@@ -39,7 +39,7 @@
                     <td>Connected Device</td>
                     <td>
                         {% if object.connected_endpoint %}
-                            {{ object.connected_endpoint.device|hyperlinked_object }}
+                            {{ object.connected_endpoint.parent|hyperlinked_object }}
                             ({{ object.connected_endpoint }})
                         {% else %}
                             <span class="text-muted">None</span>
@@ -110,8 +110,13 @@
                     </tr>
                     {% if object.connected_endpoint %}
                         <tr>
-                            <td>Device</td>
-                            <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                            {% if object.connected_endpoint.device %}
+                                <td>Device</td>
+                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                            {% else %}
+                                <td>Module</td>
+                                <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                            {% endif %}
                         </tr>
                         <tr>
                             <td>Power Port</td>

nautobot/dcim/templates/dcim/poweroutlet.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>
@@ -57,8 +62,13 @@
                         </tr>
                         {% if object.connected_endpoint %}
                             <tr>
-                                <td>Device</td>
-                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% if object.connected_endpoint.device %}
+                                    <td>Device</td>
+                                    <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% else %}
+                                    <td>Module</td>
+                                    <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                                {% endif %}
                             </tr>
                             <tr>
                                 <td>Power Port</td>

nautobot/dcim/templates/dcim/powerpanel.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/powerport.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>
@@ -57,8 +62,13 @@
                         </tr>
                         {% if object.connected_endpoint %}
                             <tr>
-                                <td>Device</td>
-                                <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% if object.connected_endpoint.device %}
+                                    <td>Device</td>
+                                    <td>{{ object.connected_endpoint.device|hyperlinked_object }}</td>
+                                {% else %}
+                                    <td>Module</td>
+                                    <td>{{ object.connected_endpoint.module|hyperlinked_object }}</td>
+                                {% endif %}
                             </tr>
                             <tr>
                                 <td>Power Outlet / Feed</td>

nautobot/dcim/templates/dcim/rack.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 

nautobot/dcim/templates/dcim/rackgroup.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load helpers %}
 

nautobot/dcim/templates/dcim/rackreservation.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 
@@ -15,7 +15,7 @@
                 {% with rack=object.rack %}
                     <tr>
                         <td>Location</td>
-                        <td>{% include 'dcim/inc/location_hierarchy.html' with location=object.location %}</td>
+                        <td>{% include 'dcim/inc/location_hierarchy.html' with location=rack.location %}</td>
                     </tr>
                     <tr>
                         <td>Group</td>

nautobot/dcim/templates/dcim/rearport.html

@@ -8,8 +8,13 @@
                 </div>
                 <table class="table table-hover panel-body attr-table">
                     <tr>
-                        <td>Device</td>
-                        <td>{{ object.device|hyperlinked_object }}</td>
+                        {% if object.device %}
+                            <td>Device</td>
+                            <td>{{ object.device|hyperlinked_object }}</td>
+                        {% else %}
+                            <td>Module</td>
+                            <td>{{ object.module|hyperlinked_object }}</td>
+                        {% endif %}
                     </tr>
                     <tr>
                         <td>Name</td>

nautobot/dcim/templates/dcim/virtualchassis.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/tests/integration/test_device_bulk_operations.py

@@ -0,0 +1,30 @@
+import uuid
+
+from nautobot.core.testing.integration import (
+    BulkOperationsTestCases,
+)
+from nautobot.dcim.models import Device
+from nautobot.extras.tests.integration import create_test_device
+
+
+class DeviceBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
+    """
+    Test devices bulk edit / delete operations.
+    """
+
+    model_menu_path = ("Devices", "Devices")
+    model_base_viewname = "dcim:device"
+    model_edit_data = {"serial": "Test serial"}
+    model_filter_by = {"location": "Test Location 2"}
+    model_class = Device
+
+    def setup_items(self):
+        Device.objects.all().delete()
+        test_uuid = str(uuid.uuid4())
+
+        # Create device for test
+        create_test_device("Test Device Integration Test 1", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 2", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 3", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 4", "Test Location 2", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 5", "Test Location 2", test_uuid=test_uuid)

nautobot/dcim/tests/integration/test_fileinputpicker.py

@@ -0,0 +1,87 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import SeleniumTestCase, WebDriverWait
+from nautobot.dcim.models import Location, LocationType
+from nautobot.extras.models import Job, Status
+
+
+class ClearableFileInputTestCase(SeleniumTestCase):
+    def setUp(self):
+        super().setUp()
+        self.user.is_superuser = True
+        self.user.save()
+        self.login(self.user.username, self.password)
+
+    def tearDown(self):
+        self.logout()
+        super().tearDown()
+
+    def _assert_file_picker(self, uri_to_visit: str, page_loaded_confirmation: str, file_input_selector_id: str):
+        """
+        Ensure clearable input file type has working clear and info display.
+        """
+        self.browser.visit(f"{self.live_server_url}{uri_to_visit}")
+        WebDriverWait(self.browser, 10).until(lambda driver: driver.is_text_present(page_loaded_confirmation))
+
+        # Find the first file input button and scroll to it
+        front_image_button = self.browser.find_by_css("span.group-span-filestyle.input-group-btn").first
+        front_image_button.scroll_to()
+
+        # cancel button is NOT visible initially
+        self.assertFalse(self.browser.find_by_css("button.clear-button").first.visible)
+
+        # Test file text changes after selecting a file
+        file_selection_indicator_css = "div.bootstrap-filestyle input[type='text'].form-control"
+        self.assertEqual(self.browser.find_by_css(file_selection_indicator_css).first.value, "")
+        front_image_file_input = self.browser.find_by_id(file_input_selector_id).first
+        front_image_file_input.value = "/dev/null"
+        self.assertEqual(self.browser.find_by_css(file_selection_indicator_css).first.value, "null")
+
+        # clear button is now visible
+        clear_button = self.browser.find_by_css("button.clear-button").first
+        self.assertTrue(clear_button.visible)
+
+        # clicking clearbutton should hide the button, and wipe the file input value
+        clear_button.click()
+        self.assertFalse(clear_button.visible)
+        self.assertEqual(front_image_file_input.value, "")
+
+    def test_add_device_page(self):
+        """
+        Confirm device type add page input is working correctly.
+        """
+        self._assert_file_picker(
+            uri_to_visit=reverse("dcim:devicetype_add"),
+            page_loaded_confirmation="Device Type",
+            file_input_selector_id="id_front_image",
+        )
+
+    def test_job_runner_page(self):
+        """
+        Confirm job run page file input is working correctly.
+        """
+        example_job = Job.objects.get(name="Example File Input/Output job").pk
+        job_example_file_uri = reverse("extras:job_run", kwargs={"pk": example_job})
+        self._assert_file_picker(
+            uri_to_visit=job_example_file_uri,
+            page_loaded_confirmation="Example File",
+            file_input_selector_id="id_input_file",
+        )
+
+    def test_location_image_attachment_view(self):
+        """
+        Confirm location image attachment page is working correctly.
+        """
+        location_type, _ = LocationType.objects.get_or_create(name="Campus")
+        location_status = Status.objects.get_for_model(Location).first()
+        location, _ = Location.objects.get_or_create(
+            name="Test Location 1", location_type=location_type, status=location_status
+        )
+        location_image_attach_uri = reverse(
+            "dcim:location_add_image", kwargs={"object_id": location.id, "model": Location}
+        )
+        self._assert_file_picker(
+            uri_to_visit=location_image_attach_uri,
+            page_loaded_confirmation="Image attachment",
+            file_input_selector_id="id_image",
+        )

nautobot/dcim/tests/integration/test_location_bulk_operations.py

@@ -0,0 +1,43 @@
+from django.contrib.contenttypes.models import ContentType
+
+from nautobot.core.testing.integration import (
+    BulkOperationsTestCases,
+)
+from nautobot.dcim.models import Device, Location, LocationType
+from nautobot.extras.models import Status
+
+
+class LocationBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
+    """
+    Test locations bulk edit / delete operations.
+    """
+
+    model_menu_path = ("Organization", "Locations")
+    model_base_viewname = "dcim:location"
+    model_edit_data = {"description": "Test description"}
+    model_filter_by = {"location_type": "External"}
+    model_class = Location
+
+    def setup_items(self):
+        Location.objects.all().delete()
+
+        # Create locations for test
+        self.create_location("Test Location Integration Test 1")
+        self.create_location("Test Location Integration Test 2")
+        self.create_location("Test Location Integration Test 3")
+        self.create_location("Test Location Integration Test 4", "External")
+        self.create_location("Test Location Integration Test 5", "External")
+
+    @staticmethod
+    def create_location(location_name, location_type="Internal"):
+        location_type, location_type_created = LocationType.objects.get_or_create(name=location_type)
+        if location_type_created:
+            location_type.content_types.add(ContentType.objects.get_for_model(Device))
+            location_type.save()
+
+        location_status = Status.objects.get_for_model(Location).first()
+        Location.objects.get_or_create(
+            name=location_name,
+            status=location_status,
+            location_type=location_type,
+        )

nautobot/dcim/tests/test_models.py

@@ -2790,7 +2790,7 @@ class ControllerTestCase(ModelTestCases.BaseModelTestCase):
             controller.validated_save()
         self.assertEqual(
             error.exception.message_dict["location"][0],
-            f'Devices may not associate to locations of type "{location_type}".',
+            f'Controllers may not associate to locations of type "{location_type}".',
         )
 
 

nautobot/dcim/tests/test_views.py

@@ -161,7 +161,7 @@ def create_test_device(name):
     return device
 
 
-class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
+class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
     model = LocationType
     sort_on_field = "nestable"
 
@@ -194,6 +194,13 @@ class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             "nestable": True,
         }
 
+        cls.bulk_edit_data = {
+            "description": "A generic description",
+            "add_content_types": [
+                ContentType.objects.get_for_model(CircuitTermination).pk,
+            ],
+        }
+
     def _get_queryset(self):
         return super()._get_queryset().order_by("-last_updated")
 
@@ -743,6 +750,7 @@ class DeviceFamilyTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         cls.form_data = {
             "name": "New Device Family",
             "description": "A new device family",
+            "tags": [t.pk for t in Tag.objects.get_for_model(DeviceFamily)],
         }
         cls.bulk_edit_data = {
             "description": "A new device family",

nautobot/dcim/views.py

@@ -40,7 +40,7 @@ from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.utils.lookup import get_form_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.utils.requests import normalize_querydict
-from nautobot.core.views import generic, mixins as view_mixins
+from nautobot.core.views import generic
 from nautobot.core.views.mixins import (
     GetReturnURLMixin,
     ObjectBulkDestroyViewMixin,
@@ -213,21 +213,13 @@ class BaseDeviceComponentTemplatesBulkRenameView(generic.BulkRenameView):
 #
 
 
-class LocationTypeUIViewSet(
-    view_mixins.ObjectDetailViewMixin,
-    view_mixins.ObjectListViewMixin,
-    view_mixins.ObjectEditViewMixin,
-    view_mixins.ObjectDestroyViewMixin,
-    view_mixins.ObjectBulkDestroyViewMixin,
-    view_mixins.ObjectBulkCreateViewMixin,  # 3.0 TODO: remove this mixin as it's no longer used
-    view_mixins.ObjectChangeLogViewMixin,
-    view_mixins.ObjectNotesViewMixin,
-):
+class LocationTypeUIViewSet(NautobotUIViewSet):
     queryset = LocationType.objects.all()
     filterset_class = filters.LocationTypeFilterSet
     filterset_form_class = forms.LocationTypeFilterForm
     table_class = tables.LocationTypeTable
     form_class = forms.LocationTypeForm
+    bulk_update_form_class = forms.LocationTypeBulkEditForm
     serializer_class = serializers.LocationSerializer
 
     object_detail_content = object_detail.ObjectDetailContent(
@@ -1755,16 +1747,21 @@ class DeviceListView(generic.ObjectListView):
 
 class DeviceView(generic.ObjectView):
     queryset = Device.objects.select_related(
+        "cluster__cluster_group",
+        "controller_managed_device_group__controller",
+        "device_redundancy_group",
+        "device_type__device_family",
         "location",
-        "rack__rack_group",
-        "tenant__tenant_group",
-        "role",
         "platform",
         "primary_ip4",
         "primary_ip6",
+        "rack__rack_group",
+        "role",
+        "secrets_group",
         "software_version",
         "status",
-    )
+        "tenant__tenant_group",
+    ).prefetch_related("images", "software_image_files")
 
     object_detail_content = object_detail.ObjectDetailContent(
         extra_buttons=(

nautobot/extras/api/serializers.py

@@ -480,11 +480,32 @@ class GitRepositorySerializer(TaggedModelSerializerMixin, NautobotModelSerialize
 
 class GraphQLQuerySerializer(ValidatedModelSerializer, NotesSerializerMixin):
     variables = serializers.DictField(read_only=True)
+    owner_content_type = ContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("graphql_query_owners").get_query()),
+        required=False,
+        allow_null=True,
+        default=None,
+    )
+    owner = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = GraphQLQuery
         fields = "__all__"
 
+    @extend_schema_field(
+        PolymorphicProxySerializer(
+            component_name="GraphQLQueryOwner",
+            resource_type_field_name="object_type",
+            serializers=lambda: nested_serializers_for_models(FeatureQuery("graphql_query_owners").list_subclasses()),
+            allow_null=True,
+        )
+    )
+    def get_owner(self, obj):
+        if obj.owner is None:
+            return None
+        depth = get_nested_serializer_depth(self)
+        return return_nested_serializer_data_based_on_depth(self, depth, obj, obj.owner, "owner")
+
 
 class GraphQLQueryInputSerializer(serializers.Serializer):
     variables = serializers.DictField(allow_null=True, default={})
@@ -1148,3 +1169,15 @@ class WebhookSerializer(ValidatedModelSerializer, NotesSerializerMixin):
             raise serializers.ValidationError(conflicts)
 
         return validated_attrs
+
+
+#
+# More Git repositories
+#
+
+
+class GitRepositorySyncResponseSerializer(serializers.Serializer):
+    """Serializer representing responses from the GitRepository.sync() POST endpoint."""
+
+    message = serializers.CharField(read_only=True)
+    job_result = JobResultSerializer(read_only=True)

nautobot/extras/api/views.py

@@ -425,7 +425,7 @@ class GitRepositoryViewSet(NautobotModelViewSet):
     serializer_class = serializers.GitRepositorySerializer
     filterset_class = filters.GitRepositoryFilterSet
 
-    @extend_schema(methods=["post"], request=serializers.GitRepositorySerializer)
+    @extend_schema(methods=["post"], responses={"200": serializers.GitRepositorySyncResponseSerializer}, request=None)
     # Since we are explicitly checking for `extras:change_gitrepository` in the API sync() method
     # We explicitly set the permission_classes to IsAuthenticated in the @action decorator
     # bypassing the default DRF permission check for `extras:add_gitrepository` and the permission check fall through to the function itself.
@@ -441,8 +441,16 @@ class GitRepositoryViewSet(NautobotModelViewSet):
             raise CeleryWorkerNotRunningException()
 
         repository = get_object_or_404(GitRepository, id=pk)
-        repository.sync(user=request.user)
-        return Response({"message": f"Repository {repository} sync job added to queue."})
+        job_result = repository.sync(user=request.user)
+
+        data = {
+            # Kept message for backward compatibility for now
+            "message": f"Repository {repository} sync job added to queue.",
+            "job_result": job_result,
+        }
+
+        serializer = serializers.GitRepositorySyncResponseSerializer(data, context={"request": request})
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
 
 #
@@ -828,7 +836,7 @@ class JobQueueViewSet(NautobotModelViewSet):
     filterset_class = filters.JobQueueFilterSet
 
 
-class JobQueueAssignmentViewSet(NautobotModelViewSet):
+class JobQueueAssignmentViewSet(ModelViewSet):
     """
     Manage job queue assignments through DELETE, GET, POST, PUT, and PATCH requests.
     """
@@ -1061,7 +1069,7 @@ class MetadataChoiceViewSet(ModelViewSet):
     filterset_class = filters.MetadataChoiceFilterSet
 
 
-class ObjectMetadataViewSet(NautobotModelViewSet):
+class ObjectMetadataViewSet(ModelViewSet):
     queryset = ObjectMetadata.objects.all()
     serializer_class = serializers.ObjectMetadataSerializer
     filterset_class = filters.ObjectMetadataFilterSet

nautobot/extras/constants.py

@@ -11,6 +11,7 @@ EXTRAS_FEATURES = [
     "dynamic_groups",
     "export_template_owners",
     "export_templates",
+    "graphql_query_owners",
     "graphql",
     "job_results",  # No longer used
     "locations",