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

nautobot/core/utils/lookup.py

@@ -291,9 +291,9 @@ def get_table_class_string_from_view_name(view_name):
 
     view_func = resolve(reverse(view_name)).func
     view_class = getattr(view_func, "cls", getattr(view_func, "view_class", None))
-    if hasattr(view_class, "table_class"):
+    if hasattr(view_class, "table_class") and view_class.table_class:
         return view_class.table_class.__name__
-    if hasattr(view_class, "table"):
+    if hasattr(view_class, "table") and view_class.table:
         return view_class.table.__name__
     return None
 

nautobot/dcim/factory.py

@@ -680,6 +680,7 @@ class SoftwareImageFileFactory(PrimaryModelFactory):
         has_hashing_algorithm = NautobotBoolIterator()
         has_image_file_size = NautobotBoolIterator()
         has_download_url = NautobotBoolIterator()
+        has_external_integration = NautobotBoolIterator()
 
     status = random_instance(
         lambda: Status.objects.get_for_model(SoftwareImageFile),
@@ -698,6 +699,7 @@ class SoftwareImageFileFactory(PrimaryModelFactory):
     default_image = factory.LazyAttribute(
         lambda o: not o.software_version.software_image_files.filter(default_image=True).exists()
     )
+    external_integration = factory.Maybe("has_external_integration", random_instance(ExternalIntegration))
 
 
 class SoftwareVersionFactory(PrimaryModelFactory):

nautobot/dcim/filters/__init__.py

@@ -1791,6 +1791,11 @@ class SoftwareImageFileFilterSet(NautobotFilterSet, StatusModelFilterSetMixin):
     default_image = django_filters.BooleanFilter(
         label="Is default image for associated software version",
     )
+    external_integration = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=ExternalIntegration.objects.all(),
+        to_field_name="name",
+        label="External integration (name or ID)",
+    )
 
     class Meta:
         model = SoftwareImageFile

nautobot/dcim/forms.py

@@ -36,6 +36,7 @@ from nautobot.core.forms import (
     TagFilterField,
 )
 from nautobot.core.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
+from nautobot.core.forms.fields import LaxURLField
 from nautobot.dcim.form_mixins import (
     LocatableModelBulkEditFormMixin,
     LocatableModelFilterFormMixin,
@@ -767,6 +768,16 @@ class RackReservationFilterForm(NautobotFilterForm, TenancyFilterForm):
 #
 
 
+class ManufacturerBulkEditForm(NautobotBulkEditForm):
+    pk = forms.ModelMultipleChoiceField(queryset=Manufacturer.objects.all(), widget=forms.MultipleHiddenInput())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+
+    class Meta:
+        nullable_fields = [
+            "description",
+        ]
+
+
 class ManufacturerForm(NautobotModelForm):
     class Meta:
         model = Manufacturer
@@ -4773,7 +4784,11 @@ class SoftwareImageFileBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFo
     )
     image_file_size = forms.IntegerField(required=False)
     default_image = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect, label="Is default image")
-    download_url = forms.URLField(required=False)
+    download_url = LaxURLField(required=False)
+    external_integration = DynamicModelChoiceField(
+        queryset=ExternalIntegration.objects.all(),
+        required=False,
+    )
 
     class Meta:
         model = SoftwareImageFile
@@ -4782,6 +4797,7 @@ class SoftwareImageFileBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFo
             "hashing_algorithm",
             "image_file_size",
             "download_url",
+            "external_integration",
         ]
 
 
@@ -4816,6 +4832,10 @@ class SoftwareImageFileFilterForm(NautobotFilterForm, StatusModelFilterFormMixin
         label="Has device types",
         widget=StaticSelect2(choices=BOOLEAN_WITH_BLANK_CHOICES),
     )
+    external_integration = DynamicModelChoiceField(
+        queryset=ExternalIntegration.objects.all(),
+        required=False,
+    )
 
     tags = TagFilterField(model)
 
@@ -4829,6 +4849,7 @@ class SoftwareImageFileFilterForm(NautobotFilterForm, StatusModelFilterFormMixin
         "download_url",
         "device_types",
         "has_device_types",
+        "external_integration",
         "status",
         "tags",
     ]
@@ -4843,6 +4864,11 @@ class SoftwareImageFileForm(NautobotModelForm):
         label="Device Types",
     )
 
+    external_integration = DynamicModelChoiceField(
+        queryset=ExternalIntegration.objects.all(),
+        required=False,
+    )
+
     field_order = [
         "software_version",
         "image_file_name",

nautobot/dcim/migrations/0068_alter_softwareimagefile_download_url.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.19 on 2025-03-06 19:34
+
+from django.db import migrations
+
+import nautobot.core.models.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("dcim", "0067_controllermanageddevicegroup_tenant"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="softwareimagefile",
+            name="download_url",
+            field=nautobot.core.models.fields.LaxURLField(blank=True),
+        ),
+    ]

nautobot/dcim/migrations/0069_softwareimagefile_external_integration.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.20 on 2025-03-11 19:10
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0122_add_graphqlquery_owner_content_type"),
+        ("dcim", "0068_alter_softwareimagefile_download_url"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="softwareimagefile",
+            name="external_integration",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="software_image_files",
+                to="extras.externalintegration",
+            ),
+        ),
+    ]

nautobot/dcim/models/devices.py

@@ -14,7 +14,7 @@ import yaml
 
 from nautobot.core.constants import CHARFIELD_MAX_LENGTH
 from nautobot.core.models import BaseManager, RestrictedQuerySet
-from nautobot.core.models.fields import JSONArrayField, NaturalOrderingField
+from nautobot.core.models.fields import JSONArrayField, LaxURLField, NaturalOrderingField
 from nautobot.core.models.generics import BaseModel, OrganizationalModel, PrimaryModel
 from nautobot.core.models.tree_queries import TreeModel
 from nautobot.core.utils.config import get_settings_or_config
@@ -1239,7 +1239,14 @@ class SoftwareImageFile(PrimaryModel):
         verbose_name="Image File Size",
         help_text="Image file size in bytes",
     )
-    download_url = models.URLField(blank=True, verbose_name="Download URL")
+    download_url = LaxURLField(blank=True, verbose_name="Download URL")
+    external_integration = models.ForeignKey(
+        to="extras.ExternalIntegration",
+        on_delete=models.PROTECT,
+        related_name="software_image_files",
+        blank=True,
+        null=True,
+    )
     default_image = models.BooleanField(
         verbose_name="Default Image", help_text="Is the default image for this software version", default=False
     )

nautobot/dcim/models/locations.py

@@ -220,6 +220,15 @@ class Location(TreeModel, PrimaryModel):
     def __str__(self):
         return self.name
 
+    @property
+    def display(self):
+        """
+        Honor LOCATION_NAME_AS_NATURAL_KEY for display value rendering, else fallback to TreeModel.display().
+        """
+        if get_settings_or_config("LOCATION_NAME_AS_NATURAL_KEY"):
+            return self.name
+        return super().display
+
     @classproperty  # https://github.com/PyCQA/pylint-django/issues/240
     def natural_key_field_lookups(cls):  # pylint: disable=no-self-argument
         """

nautobot/dcim/tables/devices.py

@@ -1275,6 +1275,7 @@ class SoftwareImageFileTable(StatusTableMixin, BaseTable):
             "image_file_checksum",
             "hashing_algorithm",
             "download_url",
+            "external_integration",
             "device_type_count",
             "tags",
             "actions",

nautobot/dcim/templates/dcim/device_list.html

@@ -3,7 +3,7 @@
 {% block bulk_buttons %}
     {% if perms.dcim.change_device %}
         <div class="btn-group dropup">
-            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="device-bulk-add-components-button">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">

nautobot/dcim/templates/dcim/devicetype.html

@@ -10,7 +10,7 @@
 {% block extra_buttons %}
     {% if perms.dcim.change_devicetype %}
         <div class="btn-group">
-            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="device-type-add-components-button">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">

nautobot/dcim/templates/dcim/manufacturer.html

@@ -1,64 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Manufacturer</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Devices</td>
-                    <td>
-                        <a href="{% url 'dcim:device_list' %}?manufacturer={{ object.name }}">{{ device_table.rows|length }}</a>
-                    </td>
-                </tr>
-                {% if cloud_account_table.rows %}
-                    <tr>
-                        <td>Cloud Accounts</td>
-                        <td>
-                            <a href="{% url 'cloud:cloudaccount_list' %}?provider={{ object.name }}">{{ cloud_account_table.rows|length }}</a>
-                        </td>
-                    </tr>
-                {% endif %}
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Devices</strong>
-            </div>
-            {% include 'inc/table.html' with table=device_table %}
-            {% if perms.dcim.add_device %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'dcim:device_add' %}?manufacturer={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add device
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-    {% include 'inc/paginator.html' with paginator=device_table.paginator page=device_table.page %}
-    {% if cloud_account_table.rows %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Cloud Accounts</strong>
-            </div>
-            {% include 'inc/table.html' with table=cloud_account_table %}
-            {% if perms.cloud.add_cloudaccount %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'cloud:cloudaccount_add' %}?provider={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Cloud Account
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=cloud_account_table.paginator page=cloud_account_table.page %}
-    {% endif %}
-    <div class="row"></div>
-{% endblock content_full_width_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/module_list.html

@@ -3,7 +3,7 @@
 {% block bulk_buttons %}
     {% if perms.dcim.change_module %}
         <div class="btn-group dropup">
-            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="module-bulk-add-components-button">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">

nautobot/dcim/templates/dcim/moduletype_retrieve.html

@@ -9,7 +9,7 @@
 {% block extra_buttons %}
         {% if perms.dcim.change_moduletype %}
             <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="module-type-add-components-button">
                     <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu">

nautobot/dcim/templates/dcim/softwareimagefile_retrieve.html

@@ -100,6 +100,10 @@
                                         {% endwith %}
                                     </td>
                                 </tr>
+                                <tr>
+                                    <td>External Integration</td>
+                                    <td>{{ object.external_integration|hyperlinked_object }}</td>
+                                </tr>
                                 <tr>
                                     <td>Devices overridden to use this file</td>
                                     <td>

nautobot/dcim/tests/integration/test_module_bay_position.py

@@ -0,0 +1,125 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import ObjectsListMixin, SeleniumTestCase
+from nautobot.dcim.models import DeviceType, Manufacturer, Module, ModuleBay, ModuleType
+from nautobot.extras.models import Status
+from nautobot.extras.tests.integration import create_test_device
+
+
+class ModuleBayPositionTestCase(SeleniumTestCase, ObjectsListMixin):
+    """
+    Test creating a module bay component in device and device type.
+    """
+
+    def _validate_position_field(self):
+        # Fill name pattern
+        name_pattern_field = self.browser.find_by_css("#id_name_pattern")
+        name_pattern_value = "name-0/0/[0-9]"
+        for _ in name_pattern_field.type(name_pattern_value, slowly=True):
+            pass
+
+        # Verify that position is filled
+        position_field = self.browser.find_by_css("#id_position_pattern")
+        self.assertEqual(position_field.value, name_pattern_value, "Position field value is not properly set")
+
+        # Change pattern manually and name to verify if it's not updating then
+        position_field.fill("")
+        for _ in position_field.type("new pattern", slowly=True):
+            pass
+
+        for _ in name_pattern_field.type("v2", slowly=True):
+            pass
+
+        self.assertEqual(position_field.value, "new pattern", "Position field value has unexpectedly changed")
+
+        # Regenerate position
+        self.browser.find_by_css('button[data-original-title="Regenerate position"]').click()
+        self.assertEqual(position_field.value, f"{name_pattern_value}v2", "Position field value is not re-populated")
+
+    def test_create_device_type_module_bay(self):
+        self.login_as_superuser()
+
+        manufacturer, _ = Manufacturer.objects.get_or_create(
+            name="Test Manufacturer",
+        )
+        device_type, _ = DeviceType.objects.get_or_create(manufacturer=manufacturer, model="Test Model Module Bay")
+
+        details_url = self.live_server_url + reverse("dcim:devicetype", kwargs={"pk": device_type.pk})
+        self.browser.visit(details_url)
+
+        # Navigate to module bay create page
+        self.browser.find_by_css("#device-type-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='device-type-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_create_device_module_bay(self):
+        self.login_as_superuser()
+
+        device = create_test_device("Test Device Module Bay Integration Test 1")
+        details_url = self.live_server_url + reverse("dcim:device", kwargs={"pk": device.pk})
+        self.browser.visit(details_url)
+
+        # Navigate to module bay create page
+        self.browser.find_by_css("#device-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='device-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_bulk_create_device_module_bay(self):
+        self.login_as_superuser()
+
+        device = create_test_device("Test Device Module Bay Integration Test 1", test_uuid="a15a58b0b")
+        self.browser.visit(self.live_server_url + reverse("dcim:device_list"))
+
+        self.apply_filter("location", "a15a58b0b")
+
+        self.select_one_item(pk=device.pk)
+        self.browser.find_by_css("#device-bulk-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='device-bulk-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_create_module_type_module_bay(self):
+        self.login_as_superuser()
+
+        manufacturer, _ = Manufacturer.objects.get_or_create(name="Test Manufacturer")
+        module_type = ModuleType.objects.create(model="Module_Type", manufacturer=manufacturer)
+
+        details_url = self.live_server_url + reverse("dcim:moduletype", kwargs={"pk": module_type.pk})
+        self.browser.visit(details_url)
+
+        self.browser.find_by_css("#module-type-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='module-type-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()
+
+    def test_bulk_create_module_module_bay(self):
+        self.login_as_superuser()
+
+        device = create_test_device("Test Device Module Bay Integration Test 2", test_uuid="60a7d5e")
+        module_type = ModuleType.objects.create(model="Module_Type", manufacturer=device.device_type.manufacturer)
+        device_module_bay = ModuleBay.objects.create(parent_device=device, name="Test Bay")
+        module = Module.objects.create(
+            module_type=module_type,
+            status=Status.objects.get_for_model(Module).first(),
+            parent_module_bay=device_module_bay,
+        )
+
+        self.browser.visit(self.live_server_url + reverse("dcim:module_list"))
+        self.select_one_item(pk=module.pk)
+
+        self.browser.find_by_css("#module-bulk-add-components-button").click()
+        self.browser.find_by_xpath(
+            "//*[@id='module-bulk-add-components-button']/following-sibling::*//a[normalize-space()='Module Bays']"
+        ).click()
+
+        self._validate_position_field()