nautobot 2.3.0b1__py3-none-any.whl → 2.3.1__py3-none-any.whl

nautobot/core/templates/nautobot_config.py.j2

@@ -295,6 +295,15 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 # CELERY_TASK_SOFT_TIME_LIMIT = int(os.getenv("NAUTOBOT_CELERY_TASK_SOFT_TIME_LIMIT", str(5 * 60)))
 # CELERY_TASK_TIME_LIMIT = int(os.getenv("NAUTOBOT_CELERY_TASK_TIME_LIMIT", str(10 * 60)))
 
+# How many tasks a worker is allowed to reserve for its own consumption and execution.
+# If set to zero (not recommended) a single worker can reserve all tasks even if other workers are free.
+# For short running tasks (such as webhooks) you may want to set this to a larger number to increase throughput.
+# Conversely, for long running tasks (such as SSoT or Golden-Config Jobs at scale) you may want to set this to 1
+# so that a worker executing a long-running task will not prefetch other tasks, which would block their execution
+# until the long-running task completes.
+# https://docs.celeryq.dev/en/stable/userguide/optimizing.html#prefetch-limits
+# CELERY_WORKER_PREFETCH_MULTIPLIER = int(os.getenv("NAUTOBOT_CELERY_WORKER_PREFETCH_MULTIPLIER", "4"))
+
 # Ports for prometheus metric HTTP server running on the celery worker.
 # Normally this should be set to a single port, unless you have multiple workers running on a single machine, i.e.
 # sharing the same available ports. In that case you need to specify a range of ports greater than or equal to the
@@ -307,6 +316,12 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 #         int(value) for value in os.getenv("NAUTOBOT_CELERY_WORKER_PROMETHEUS_PORTS").split(",")
 #     ]
 
+# If enabled stdout and stderr of running jobs will be redirected to the task logger.
+# CELERY_WORKER_REDIRECT_STDOUTS = is_truthy(os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS", "True"))
+
+# The log level of log messages generated by redirected job stdout and stderr.
+# Can be one of `DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`.
+# CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS_LEVEL", "WARNING")
 
 # Number of days to retain changelog entries. Set to 0 to retain changes indefinitely. Defaults to 90 if not set here.
 #

nautobot/core/testing/filters.py

@@ -132,6 +132,17 @@ class FilterTestCases:
                     if generic_filter_test not in self.generic_filter_tests:
                         self.generic_filter_tests = (*self.generic_filter_tests, generic_filter_test)
 
+                # Make sure we have at least 3 contacts and 3 teams in the database
+                if Contact.objects.count() < 3:
+                    Contact.objects.create(name="Generic Filter Test Contact 1")
+                    Contact.objects.create(name="Generic Filter Test Contact 2")
+                    Contact.objects.create(name="Generic Filter Test Contact 3")
+
+                if Team.objects.count() < 3:
+                    Team.objects.create(name="Generic Filter Test Team 1")
+                    Team.objects.create(name="Generic Filter Test Team 2")
+                    Team.objects.create(name="Generic Filter Test Team 3")
+
                 # Make sure we have some valid contact-associations:
                 for contact, team, instance in zip(Contact.objects.all()[:3], Team.objects.all()[:3], self.queryset):
                     ContactAssociation.objects.create(
@@ -272,7 +283,7 @@ class FilterTestCases:
             # if lookup_method is iexact use the full updated attr
             if lookup_method == "iexact":
                 lookup = randomized_attr_value.upper()
-                model_queryset = self.queryset.filter(**{f"{filter_field_name}": lookup})
+                model_queryset = self.queryset.filter(**{f"{filter_field_name}__iexact": lookup})
             else:
                 lookup = randomized_attr_value[1:].upper()
                 model_queryset = self.queryset.filter(**{f"{filter_field_name}__icontains": lookup})

nautobot/core/tests/integration/test_general_functionality.py

@@ -24,7 +24,7 @@ class StaticMediaFailureTestCase(SeleniumTestCase):
             reverse("graphql"),
             reverse("api_docs"),
             "/admin/",
-            "/static/docs/overview/index.html",
+            "/static/docs/index.html",
         ]
         for url in test_urls:
             with self.subTest(test_url=url):

nautobot/core/tests/test_jobs.py

@@ -3,24 +3,27 @@ from pathlib import Path
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
+from django.core.files.base import ContentFile
 from django.utils import timezone
 import yaml
 
 from nautobot.core.jobs.cleanup import CleanupTypes
 from nautobot.core.testing import create_job_result_and_run_job, TransactionTestCase
-from nautobot.dcim.models import DeviceType, Location, LocationType, Manufacturer
+from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
 from nautobot.extras.choices import JobResultStatusChoices, LogLevelChoices
 from nautobot.extras.factory import JobResultFactory, ObjectChangeFactory
 from nautobot.extras.models import (
     Contact,
     ContactAssociation,
     ExportTemplate,
+    FileProxy,
     JobLogEntry,
     JobResult,
     ObjectChange,
     Role,
     Status,
 )
+from nautobot.ipam.models import Prefix
 from nautobot.users.models import ObjectPermission
 
 
@@ -218,6 +221,76 @@ class ImportObjectsTestCase(TransactionTestCase):
         )
         self.assertEqual(4, Status.objects.filter(name__startswith="test_status").count())
 
+    def test_csv_import_with_utf_8_with_bom_encoding(self):
+        """
+        A superuser running the job with a .csv file with utf_8 with bom encoding should successfully create all specified objects.
+        Test for bug fix https://github.com/nautobot/nautobot/issues/5812 and https://github.com/nautobot/nautobot/issues/5985
+        """
+
+        status = Status.objects.get(name="Active").pk
+        content = f"prefix,status\n192.168.1.1/32,{status}"
+        content = content.encode("utf-8-sig")
+        filename = "test.csv"
+        csv_file = FileProxy.objects.create(name=filename, file=ContentFile(content, name=filename))
+        job_result = create_job_result_and_run_job(
+            "nautobot.core.jobs",
+            "ImportObjects",
+            content_type=ContentType.objects.get_for_model(Prefix).pk,
+            csv_file=csv_file.id,
+        )
+        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertFalse(
+            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
+        )
+        self.assertFalse(
+            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR).exists()
+        )
+        self.assertEqual(
+            1, Prefix.objects.filter(status=Status.objects.get(name="Active"), prefix="192.168.1.1/32").count()
+        )
+        mfr = Manufacturer.objects.create(name="Test Cisco Manufacturer")
+        device_type = DeviceType.objects.create(
+            manufacturer=mfr,
+            model="Cisco CSR1000v",
+            u_height=0,
+        )
+        location_type = LocationType.objects.create(name="Test Location Type")
+        location_type.content_types.set([ContentType.objects.get_for_model(Device)])
+        location = Location.objects.create(
+            name="Device Location",
+            location_type=location_type,
+            status=Status.objects.get_for_model(Location).first(),
+        )
+        role = Role.objects.create(name="Device Status")
+        role.content_types.set([ContentType.objects.get_for_model(Device)])
+        content = "\n".join(
+            [
+                "serial,asset_tag,device_type,location,status,name,role",
+                f"1021C4,CA211,{device_type.pk},{location.pk},{status},Test-AC-01,{role}",
+                f"1021C5,CA212,{device_type.pk},{location.pk},{status},Test-AC-02,{role}",
+            ]
+        )
+        content = content.encode("utf-8-sig")
+        filename = "test.csv"
+        csv_file = FileProxy.objects.create(name=filename, file=ContentFile(content, name=filename))
+        job_result = create_job_result_and_run_job(
+            "nautobot.core.jobs",
+            "ImportObjects",
+            content_type=ContentType.objects.get_for_model(Device).pk,
+            csv_file=csv_file.id,
+        )
+        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertFalse(
+            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
+        )
+        self.assertFalse(
+            JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR).exists()
+        )
+        device_1 = Device.objects.get(name="Test-AC-01")
+        device_2 = Device.objects.get(name="Test-AC-02")
+        self.assertEqual(device_1.serial, "1021C4")
+        self.assertEqual(device_2.serial, "1021C5")
+
     def test_csv_import_bad_row(self):
         """A row of incorrect data should fail validation for that object but import all others successfully if `roll_back_if_error` is False."""
         csv_data = self.csv_data.split("\n")

nautobot/core/views/__init__.py

@@ -299,7 +299,7 @@ class SearchView(AccessMixin, View):
 
                     # Construct the results table for this object type
                     filtered_queryset = filterset({"q": form.cleaned_data["q"]}, queryset=queryset).qs
-                    table = table(filtered_queryset, orderable=False)
+                    table = table(filtered_queryset, hide_hierarchy_ui=True, orderable=False)
                     table.paginate(per_page=SEARCH_MAX_RESULTS)
 
                     if table.page:

nautobot/core/views/generic.py

@@ -586,6 +586,7 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 
         if form.is_valid():
             logger.debug("Form validation was successful")
+            msg = f"Deleted {self.queryset.model._meta.verbose_name} {obj}"
 
             try:
                 obj.delete()
@@ -594,7 +595,6 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 handle_protectederror([obj], request, e)
                 return redirect(obj.get_absolute_url())
 
-            msg = f"Deleted {self.queryset.model._meta.verbose_name} {obj}"
             logger.info(msg)
             messages.success(request, msg)
 

nautobot/core/views/mixins.py

@@ -745,8 +745,8 @@ class ObjectDestroyViewMixin(NautobotViewSetMixin, mixins.DestroyModelMixin):
         queryset = self.get_queryset()
         try:
             with transaction.atomic():
-                obj.delete()
                 msg = f"Deleted {queryset.model._meta.verbose_name} {obj}"
+                obj.delete()
                 self.logger.info(msg)
                 messages.success(request, msg)
                 self.success_url = self.get_return_url(request, obj)

nautobot/core/views/utils.py

@@ -360,12 +360,14 @@ def common_detail_view_context(request, instance):
 
     if instance.is_metadata_associable_model:
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
-        object_metadatas = instance.associated_object_metadatas.restrict(request.user, "view").order_by("scoped_fields")
-        object_metadatas_table = ObjectMetadataTable(object_metadatas, orderable=False)
-        object_metadatas_table.columns.hide("assigned_object")
-        RequestConfig(request, paginate).configure(object_metadatas_table)
-        context["associated_object_metadatas_table"] = object_metadatas_table
+        object_metadata = instance.associated_object_metadata.restrict(request.user, "view").order_by(
+            "metadata_type", "scoped_fields"
+        )
+        object_metadata_table = ObjectMetadataTable(object_metadata, orderable=False)
+        object_metadata_table.columns.hide("assigned_object")
+        RequestConfig(request, paginate).configure(object_metadata_table)
+        context["associated_object_metadata_table"] = object_metadata_table
     else:
-        context["associated_object_metadatas_table"] = None
+        context["associated_object_metadata_table"] = None
 
     return context

nautobot/dcim/factory.py

@@ -760,13 +760,16 @@ module_types = (
 class ModuleTypeFactory(PrimaryModelFactory):
     class Meta:
         model = ModuleType
-        exclude = ("has_part_number",)
+        exclude = ("has_part_number", "has_comments")
 
     manufacturer = random_instance(Manufacturer, allow_null=False)
 
     has_part_number = NautobotBoolIterator()
     part_number = factory.Maybe("has_part_number", factory.Faker("ean", length=8), "")
 
+    has_comments = NautobotBoolIterator()
+    comments = factory.Maybe("has_comments", factory.Faker("bs"))
+
     @factory.lazy_attribute
     def model(self):
         """

nautobot/dcim/filters/__init__.py

@@ -1999,6 +1999,10 @@ class ModuleTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
                 "lookup_expr": "icontains",
                 "preprocessor": str.strip,
             },
+            "comments": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
         },
     )
     has_modules = RelatedMembershipBooleanFilter(

nautobot/dcim/forms.py

@@ -886,6 +886,7 @@ class DeviceTypeBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     software_image_files = DynamicModelMultipleChoiceField(queryset=SoftwareImageFile.objects.all(), required=False)
     u_height = forms.IntegerField(required=False)
     is_full_depth = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect(), label="Is full depth")
+    comments = CommentField(label="Comments", required=False)
 
     class Meta:
         nullable_fields = ["device_family", "software_image_files"]
@@ -946,6 +947,7 @@ class DeviceTypeFilterForm(NautobotFilterForm):
 
 class ModuleTypeForm(NautobotModelForm):
     manufacturer = DynamicModelChoiceField(queryset=Manufacturer.objects.all())
+    comments = CommentField(label="Comments")
 
     class Meta:
         model = ModuleType
@@ -953,6 +955,7 @@ class ModuleTypeForm(NautobotModelForm):
             "manufacturer",
             "model",
             "part_number",
+            "comments",
             "tags",
         ]
 
@@ -974,6 +977,7 @@ class ModuleTypeImportForm(BootstrapMixin, forms.ModelForm):
             "manufacturer",
             "model",
             "part_number",
+            "comments",
         ]
 
 
@@ -981,6 +985,7 @@ class ModuleTypeBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=ModuleType.objects.all(), widget=forms.MultipleHiddenInput())
     manufacturer = DynamicModelChoiceField(queryset=Manufacturer.objects.all(), required=False)
     part_number = forms.CharField(required=False)
+    comments = CommentField(label="Comments", required=False)
 
     class Meta:
         nullable_fields = []
@@ -2059,6 +2064,25 @@ class DeviceForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalC
         if position:
             self.fields["position"].widget.choices = [(position, f"U{position}")]
 
+    def clean(self):
+        super().clean()
+
+        device_type = self.cleaned_data["device_type"]
+        software_image_files = self.cleaned_data["software_image_files"]
+
+        # If any software image file is specified, validate that
+        # each of the software image files belongs to the device's device type or is a default image
+        for image_file in software_image_files:
+            if not image_file.default_image and device_type not in image_file.device_types.all():
+                raise ValidationError(
+                    {
+                        "software_image_files": (
+                            f"Software image file {image_file} for version '{image_file.software_version}' is not "
+                            f"valid for device type {device_type}."
+                        )
+                    }
+                )
+
     def save(self, *args, **kwargs):
         instance = super().save(*args, **kwargs)
         instance.vrfs.set(self.cleaned_data["vrfs"])

nautobot/dcim/migrations/0061_module_models.py

@@ -138,6 +138,7 @@ class Migration(migrations.Migration):
                 ),
                 ("model", models.CharField(max_length=255)),
                 ("part_number", models.CharField(blank=True, max_length=255)),
+                ("comments", models.TextField(blank=True)),
             ],
             options={
                 "ordering": ("manufacturer", "model"),

nautobot/dcim/models/device_components.py

@@ -26,6 +26,7 @@ from nautobot.dcim.choices import (
     PowerOutletFeedLegChoices,
     PowerOutletTypeChoices,
     PowerPortTypeChoices,
+    SubdeviceRoleChoices,
 )
 from nautobot.dcim.constants import (
     NONCONNECTABLE_IFACE_TYPES,
@@ -1096,6 +1097,12 @@ class DeviceBay(ComponentModel):
                         "installed_device": f"Cannot install the specified device; device is already installed in {current_bay}"
                     }
                 )
+            if self.installed_device.device_type.subdevice_role != SubdeviceRoleChoices.ROLE_CHILD:
+                raise ValidationError(
+                    {
+                        "installed_device": f'Cannot install device "{self.installed_device}"; device-type "{self.installed_device.device_type}" subdevice_role is not "child".'
+                    }
+                )
 
 
 #

nautobot/dcim/models/devices.py

@@ -452,7 +452,6 @@ class Platform(OrganizationalModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",
@@ -819,21 +818,18 @@ class Device(PrimaryModel, ConfigContextModel):
                 }
             )
 
-        # Validate device software version has a software image file that matches the device's device type or is a default image
-        if self.software_version is not None and not any(
-            (
-                self.software_version.software_image_files.filter(device_types=self.device_type).exists(),
-                self.software_version.software_image_files.filter(default_image=True).exists(),
-            )
-        ):
-            raise ValidationError(
-                {
-                    "software_version": (
-                        f"No software image files for version '{self.software_version}' are "
-                        f"valid for device type {self.device_type}."
-                    )
-                }
-            )
+        # If any software image file is specified, validate that
+        # each of the software image files belongs to the device's device type or is a default image
+        for image_file in self.software_image_files.all():
+            if not image_file.default_image and self.device_type not in image_file.device_types.all():
+                raise ValidationError(
+                    {
+                        "software_image_files": (
+                            f"Software image file {image_file} for version '{image_file.software_version}' is not "
+                            f"valid for device type {self.device_type}."
+                        )
+                    }
+                )
 
     def save(self, *args, **kwargs):
         is_new = not self.present_in_database
@@ -1109,7 +1105,6 @@ class VirtualChassis(PrimaryModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "statuses",
@@ -1155,6 +1150,10 @@ class DeviceRedundancyGroup(PrimaryModel):
     def devices_sorted(self):
         return self.devices.order_by("device_redundancy_group_priority")
 
+    @property
+    def controllers_sorted(self):
+        return self.controllers.order_by("name")
+
     def __str__(self):
         return self.name
 
@@ -1337,7 +1336,6 @@ class SoftwareVersion(PrimaryModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",
@@ -1421,7 +1419,6 @@ class Controller(PrimaryModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "webhooks",
@@ -1510,6 +1507,7 @@ class ModuleType(PrimaryModel):
     part_number = models.CharField(
         max_length=CHARFIELD_MAX_LENGTH, blank=True, help_text="Discrete part number (optional)"
     )
+    comments = models.TextField(blank=True)
 
     clone_fields = [
         "manufacturer",
@@ -1530,6 +1528,7 @@ class ModuleType(PrimaryModel):
                 ("manufacturer", self.manufacturer.name),
                 ("model", self.model),
                 ("part_number", self.part_number),
+                ("comments", self.comments),
             )
         )
 

nautobot/dcim/models/racks.py

@@ -91,7 +91,6 @@ class RackGroup(TreeModel, OrganizationalModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",

nautobot/dcim/tables/devices.py

@@ -261,7 +261,7 @@ class ModuleTable(StatusTableMixin, RoleTableMixin, BaseTable):
     )
     location = tables.Column(linkify=True)
     tenant = TenantColumn()
-    tags = TagColumn(url_name="dcim:device_list")
+    tags = TagColumn(url_name="dcim:module_list")
     actions = ButtonsColumn(Module, prepend_template=MODULE_BUTTONS)
 
     class Meta(BaseTable.Meta):
@@ -1125,13 +1125,27 @@ class DeviceRedundancyGroupTable(BaseTable):
         url_params={"device_redundancy_group": "pk"},
         verbose_name="Devices",
     )
+    controller_count = LinkedCountColumn(
+        viewname="dcim:controller_list",
+        url_params={"controller_device_redundancy_group": "pk"},
+        verbose_name="Controllers",
+    )
     secrets_group = tables.Column(linkify=True)
     tags = TagColumn(url_name="dcim:deviceredundancygroup_list")
 
     class Meta(BaseTable.Meta):
         model = DeviceRedundancyGroup
-        fields = ("pk", "name", "status", "failover_strategy", "device_count", "secrets_group", "tags")
-        default_columns = ("pk", "name", "status", "failover_strategy", "device_count")
+        fields = (
+            "pk",
+            "name",
+            "status",
+            "failover_strategy",
+            "controller_count",
+            "device_count",
+            "secrets_group",
+            "tags",
+        )
+        default_columns = ("pk", "name", "status", "failover_strategy", "controller_count", "device_count")
 
 
 #

nautobot/dcim/tables/devicetypes.py

@@ -160,7 +160,7 @@ class ModuleTypeTable(BaseTable):
         url_params={"module_type": "pk"},
         verbose_name="Modules",
     )
-    tags = TagColumn(url_name="dcim:devicetype_list")
+    tags = TagColumn(url_name="dcim:moduletype_list")
 
     class Meta(BaseTable.Meta):
         model = ModuleType

nautobot/dcim/templates/dcim/device/base.html

@@ -71,7 +71,7 @@
                 <a href="{% url 'dcim:device_modulebays' pk=object.pk %}">Modules {% badge module_count %}</a>
             </li>
         {% endif %}
-        {% with interface_count=object.all_interfaces.count %}
+        {% with interface_count=object.vc_interfaces.count %}
             {% if interface_count %}
                 <li role="presentation" {% if active_tab == 'interfaces' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_interfaces' pk=object.pk %}">Interfaces {% badge interface_count %}</a>

nautobot/dcim/templates/dcim/device.html

@@ -233,7 +233,7 @@
                                     {% include 'dcim/inc/detail_softwareversion_softwareimagefile_rows.html' %}
                                 </table>
                             </div>
-                            {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic computed_fields_advanced_ui=False %}
+                            {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic computed_fields=object.get_computed_fields_grouping_basic computed_fields_advanced_ui=False %}
                             {% include 'inc/relationships/panel_override.html' with relationships_fields_override=object.get_relationships_data_basic_fields %}
                             {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:device_list' %}
                             <div class="panel panel-default">
@@ -427,7 +427,7 @@
     </div>
 {% endif %}
 {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-    <div id="object_metadatas" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadatas' %}active{% else %}fade{% endif %}">
+    <div id="object_metadata" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadata' %}active{% else %}fade{% endif %}">
         <div class="row">
             <div class="col-md-12">
                 <form method="post">
@@ -440,7 +440,7 @@
                             </div>
                         </div>
                         <div class="table-responsive">
-                            {% render_table associated_object_metadatas_table 'inc/table.html' %}
+                            {% render_table associated_object_metadata_table 'inc/table.html' %}
                         </div>
                     </div>
                 </form>

nautobot/dcim/templates/dcim/deviceredundancygroup_retrieve.html

@@ -45,6 +45,12 @@
 {% endblock content_right_page %}
 
 {% block content_full_width_page %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Controllers</strong>
+            </div>
+            {% include 'responsive_table.html' with table=controllers_table %}
+        </div>
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Devices</strong>

nautobot/dcim/templates/dcim/moduletype_retrieve.html

@@ -113,6 +113,23 @@
             </div>
 {% endblock content_left_page %}
 
+{% block content_right_page %}
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <strong>Comments</strong>
+    </div>
+    <div class="panel-body rendered-markdown">
+        {% if object.comments %}
+            {{ object.comments|render_markdown }}
+        {% else %}
+            <span class="text-muted">None</span>
+        {% endif %}
+    </div>
+</div>
+{% endblock content_right_page %}
+
+
+
 {% block extra_tab_content %}
                 <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'interfaces' %}active{% else %}fade{% endif %}" id="interfaces">
                     {% include 'dcim/inc/moduletype_component_table.html' with table=interface_table title='Interfaces' tab='interfaces' %}

nautobot/dcim/templates/dcim/softwareimagefile_retrieve.html

@@ -144,7 +144,7 @@
             </div>
             <div class="row">
                 <div class="col-md-6">
-                    {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic computed_fields_advanced_ui=False %}
+                    {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic computed_fields=object.get_computed_fields_grouping_basic computed_fields_advanced_ui=False %}
                     {% include 'inc/relationships_panel.html' %}
                     {% include 'extras/inc/tags_panel.html' %}
                     {% plugin_left_page object %}
@@ -236,7 +236,7 @@
             </div>
         {% endif %}
         {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-            <div id="object_metadatas" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadatas' %}active{% else %}fade{% endif %}">
+            <div id="object_metadata" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadata' %}active{% else %}fade{% endif %}">
                 <div class="row">
                     <div class="col-md-12">
                         <form method="post">
@@ -249,7 +249,7 @@
                                     </div>
                                 </div>
                                 <div class="table-responsive">
-                                    {% render_table associated_object_metadatas_table 'inc/table.html' %}
+                                    {% render_table associated_object_metadata_table 'inc/table.html' %}
                                 </div>
                             </div>
                         </form>

nautobot/dcim/tests/test_api.py

@@ -1022,6 +1022,7 @@ class ModuleTypeTest(APIViewTestCases.APIViewTestCase):
     model = ModuleType
     bulk_update_data = {
         "part_number": "ABC123",
+        "comments": "changed comment",
     }
 
     @classmethod
@@ -1033,6 +1034,7 @@ class ModuleTypeTest(APIViewTestCases.APIViewTestCase):
                 "manufacturer": manufacturer_id,
                 "model": "Module Type 1",
                 "part_number": "123456",
+                "comments": "test comment",
             },
             {
                 "manufacturer": manufacturer_id,