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

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):
@@ -396,7 +396,7 @@ class DeviceModuleConsolePortTable(ConsolePortTable):
             "actions",
         )
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
         }
 
 
@@ -460,7 +460,7 @@ class DeviceModuleConsoleServerPortTable(ConsoleServerPortTable):
             "actions",
         )
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
         }
 
 
@@ -535,7 +535,7 @@ class DeviceModulePowerPortTable(PowerPortTable):
             "connection",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class PowerOutletTable(ModularDeviceComponentTable, PathEndpointTable):
@@ -613,7 +613,7 @@ class DeviceModulePowerOutletTable(PowerOutletTable):
             "connection",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class BaseInterfaceTable(BaseTable):
@@ -739,7 +739,7 @@ class DeviceModuleInterfaceTable(InterfaceTable):
             "actions",
         ]
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
             "data-name": lambda record: record.name,
         }
 
@@ -815,7 +815,7 @@ class DeviceModuleFrontPortTable(FrontPortTable):
             "cable_peer",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class RearPortTable(ModularDeviceComponentTable, CableTerminationTable):
@@ -874,7 +874,7 @@ class DeviceModuleRearPortTable(RearPortTable):
             "cable_peer",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class DeviceBayTable(DeviceComponentTable):
@@ -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">
@@ -406,6 +406,18 @@
 {% endif %}
 {% if object.is_dynamic_group_associable_model and perms.extras.view_dynamicgroup %}
     <div id="dynamic_groups" role="tabpanel" class="tab-pane {% if request.GET.tab == 'dynamic_groups' %}active{% else %}fade{% endif %}">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="alert alert-warning">
+                    Dynamic group membership is cached for performance reasons,
+                    therefore this table may not always be up-to-date.
+                    <br>You can refresh the membership of any specific group by navigating to it from the list below
+                    or from the <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+                    <br>You can also refresh the membership of all groups by running the
+                    <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
+                </div>
+            </div>
+        </div>
         <div class="row">
             <div class="col-md-12">
                 <form method="post">
@@ -427,7 +439,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 +452,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 %}
@@ -215,6 +215,18 @@
         {% endif %}
         {% if object.is_dynamic_group_associable_model and perms.extras.view_dynamicgroup %}
             <div id="dynamic_groups" role="tabpanel" class="tab-pane {% if request.GET.tab == 'dynamic_groups' %}active{% else %}fade{% endif %}">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="alert alert-warning">
+                            Dynamic group membership is cached for performance reasons,
+                            therefore this table may not always be up-to-date.
+                            <br>You can refresh the membership of any specific group by navigating to it from the list below
+                            or from the <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+                            <br>You can also refresh the membership of all groups by running the
+                            <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
+                        </div>
+                    </div>
+                </div>
                 <div class="row">
                     <div class="col-md-12">
                         <form method="post">
@@ -236,7 +248,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 +261,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,

nautobot/dcim/tests/test_filters.py

@@ -656,9 +656,15 @@ def common_test_data(cls):
     device_redundancy_groups = iter(DeviceRedundancyGroup.objects.all())
 
     module_types = (
-        ModuleType.objects.create(manufacturer=cls.manufacturers[0], model="Filter Test Module Type 1"),
-        ModuleType.objects.create(manufacturer=cls.manufacturers[1], model="Filter Test Module Type 2"),
-        ModuleType.objects.create(manufacturer=cls.manufacturers[2], model="Filter Test Module Type 3"),
+        ModuleType.objects.create(
+            manufacturer=cls.manufacturers[0], model="Filter Test Module Type 1", comments="Module Type 1"
+        ),
+        ModuleType.objects.create(
+            manufacturer=cls.manufacturers[1], model="Filter Test Module Type 2", comments="Module Type 2"
+        ),
+        ModuleType.objects.create(
+            manufacturer=cls.manufacturers[2], model="Filter Test Module Type 3", comments="Module Type 3"
+        ),
     )
 
     # Create 3 of each component template on the first two module types
@@ -898,7 +904,7 @@ class ModularDeviceComponentTestMixin(DeviceComponentTestMixin):
         )
         parent_module_bay = ModuleBay.objects.create(name="Parent module bay", position="1", parent_device=device)
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model=f"Test Device Filter for {model} Module Type"
+            manufacturer=manufacturer, model=f"Test Device Filter for {model} Module Type", comments="Module Type test"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -2526,7 +2532,7 @@ class InterfaceTestCase(PathEndpointModelTestMixin, ModularDeviceComponentTestMi
             name="Parent module bay", position="1", parent_device=device_vc_master
         )
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model="Test Device Filter for Interface Module Type"
+            manufacturer=manufacturer, model="Test Device Filter for Interface Module Type", comments="Module Type test"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -2772,7 +2778,7 @@ class FrontPortTestCase(ModularDeviceComponentTestMixin, FilterTestCases.FilterT
         )
         parent_module_bay = ModuleBay.objects.create(name="Parent module bay", position="1", parent_device=device)
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model="Test Device Filter for FrontPort Module Type"
+            manufacturer=manufacturer, model="Test Device Filter for FrontPort Module Type", comments="Module Type test"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -3357,7 +3363,7 @@ class CableTestCase(FilterTestCases.FilterTestCase):
         )
         parent_module_bay = ModuleBay.objects.create(name="Parent module bay", position="1", parent_device=device)
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model="Test Device Filter for Cable Module Type"
+            manufacturer=manufacturer, model="Test Device Filter for Cable Module Type", comments="Module Type test"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -4012,6 +4018,7 @@ class ModuleTypeTestCase(FilterTestCases.FilterTestCase):
     queryset = ModuleType.objects.all()
     filterset = ModuleTypeFilterSet
     generic_filter_tests = [
+        ("comments",),
         ("manufacturer", "manufacturer__id"),
         ("manufacturer", "manufacturer__name"),
         ("model",),

nautobot/dcim/tests/test_forms.py

@@ -12,6 +12,8 @@ from nautobot.dcim.models import (
     Manufacturer,
     Platform,
     Rack,
+    SoftwareImageFile,
+    SoftwareVersion,
 )
 from nautobot.extras.models import Role, SecretsGroup, Status
 from nautobot.ipam.models import VLAN
@@ -43,6 +45,15 @@ class DeviceTestCase(FormTestCases.BaseFormTestCase):
         cls.manufacturer = cls.device_type.manufacturer
         cls.platform = Platform.objects.filter(manufacturer=cls.device_type.manufacturer).first()
         cls.device_role = Role.objects.get_for_model(Device).first()
+        cls.software_version_contains_no_valid_image_for_device_type = SoftwareVersion.objects.create(
+            platform=cls.platform,
+            version="New version 1.0.0",
+            status=Status.objects.get_for_model(SoftwareVersion).first(),
+        )
+        cls.software_version = SoftwareVersion.objects.first()
+        cls.software_image_files = SoftwareImageFile.objects.exclude(software_version=cls.software_version).exclude(
+            default_image=True
+        )
 
         Device.objects.create(
             name="Device 1",
@@ -134,6 +145,49 @@ class DeviceTestCase(FormTestCases.BaseFormTestCase):
         self.assertFalse(form.is_valid())
         self.assertIn("face", form.errors)
 
+    def test_no_software_image_file_specified_is_valid(self):
+        form = DeviceForm(
+            data={
+                "name": "New Device",
+                "role": self.device_role.pk,
+                "tenant": None,
+                "manufacturer": self.manufacturer.pk,
+                "device_type": self.device_type.pk,
+                "location": self.location.pk,
+                "rack": None,
+                "face": None,
+                "position": None,
+                "platform": self.platform.pk,
+                "status": self.device_status.pk,
+                "secrets_group": SecretsGroup.objects.first().pk,
+                "software_version": self.software_version_contains_no_valid_image_for_device_type.pk,
+                "software_image_files": [],
+            }
+        )
+        self.assertTrue(form.is_valid())
+
+    def test_invalid_software_image_file_specified(self):
+        form = DeviceForm(
+            data={
+                "name": "New Device",
+                "role": self.device_role.pk,
+                "tenant": None,
+                "manufacturer": self.manufacturer.pk,
+                "device_type": self.device_type.pk,
+                "location": self.location.pk,
+                "rack": None,
+                "face": None,
+                "position": None,
+                "platform": self.platform.pk,
+                "status": self.device_status.pk,
+                "secrets_group": SecretsGroup.objects.first().pk,
+                "software_version": self.software_version.pk,
+                "software_image_files": list(self.software_image_files.values_list("pk", flat=True)),
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertIn("software_image_files", form.errors)
+
     def test_non_racked_device_with_position(self):
         form = DeviceForm(
             data={

nautobot/dcim/tests/test_models.py

@@ -1723,11 +1723,19 @@ class DeviceTestCase(ModelTestCases.BaseModelTestCase):
         software_version.software_image_files.all().update(default_image=False)
         self.device_type.software_image_files.set([])
         self.device.software_version = software_version
+        invalid_software_image_file = SoftwareImageFile.objects.filter(default_image=False).first()
+        invalid_software_image_file.device_types.set([])
+        self.device.software_image_files.set([invalid_software_image_file])
 
-        # No device type or default image match
+        # There is an invalid non-default software_image_file specified for the software version
+        # It is not a default image and it does not match any device type
         with self.assertRaises(ValidationError):
             self.device.validated_save()
 
+        # user should be able to specify any software version without specifying software_image_files
+        self.device.software_image_files.set([])
+        self.device.validated_save()
+
         # Default image matches
         software_image_file = software_version.software_image_files.first()
         software_image_file.default_image = True
@@ -1903,6 +1911,37 @@ class DeviceTestCase(ModelTestCases.BaseModelTestCase):
         self.assertNotEqual(child_mtime_after_parent_rack_update_save, child_mtime_after_parent_site_update_save)
 
 
+class DeviceBayTestCase(ModelTestCases.BaseModelTestCase):
+    model = DeviceBay
+
+    def setUp(self):
+        self.devices = Device.objects.filter(device_type__subdevice_role=SubdeviceRoleChoices.ROLE_PARENT)
+        devicetype = DeviceType.objects.create(
+            manufacturer=self.devices[0].device_type.manufacturer,
+            model="TestDeviceType1",
+            u_height=0,
+            subdevice_role=SubdeviceRoleChoices.ROLE_CHILD,
+        )
+        child_device = Device.objects.create(
+            device_type=devicetype,
+            role=self.devices[0].role,
+            name="TestDevice1",
+            status=self.devices[0].status,
+            location=self.devices[0].location,
+        )
+        DeviceBay.objects.create(device=self.devices[0], name="Device Bay 1", installed_device=child_device)
+
+    def test_assigning_installed_device(self):
+        server = Device.objects.exclude(device_type__subdevice_role=SubdeviceRoleChoices.ROLE_CHILD).last()
+        bay = DeviceBay(device=self.devices[1], name="Device Bay Err", installed_device=server)
+        with self.assertRaises(ValidationError) as err:
+            bay.validated_save()
+        self.assertIn(
+            f'Cannot install device "{server}"; device-type "{server.device_type}" subdevice_role is not "child".',
+            str(err.exception),
+        )
+
+
 class DeviceTypeToSoftwareImageFileTestCase(ModelTestCases.BaseModelTestCase):
     model = DeviceTypeToSoftwareImageFile
 

nautobot/dcim/tests/test_views.py

@@ -817,6 +817,7 @@ class DeviceTypeTestCase(
         cls.bulk_edit_data = {
             "u_height": 0,
             "is_full_depth": False,
+            "comments": "changed comment",
         }
 
     def test_list_has_correct_links(self):
@@ -1196,6 +1197,7 @@ class ModuleTypeTestCase(
         ModuleType.objects.create(
             model="Test Module Type 1",
             manufacturer=manufacturers[0],
+            comments="test comment",
         )
         ModuleType.objects.create(
             model="Test Module Type 2",
@@ -1215,10 +1217,12 @@ class ModuleTypeTestCase(
             "model": "Test Module Type X",
             "part_number": "123ABC",
             "tags": [t.pk for t in Tag.objects.get_for_model(ModuleType)],
+            "comments": "test comment",
         }
 
         cls.bulk_edit_data = {
             "manufacturer": manufacturers[1].pk,
+            "comments": "changed comment",
         }
 
     def test_list_has_correct_links(self):
@@ -2080,7 +2084,7 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         status_active = statuses[0]
 
         # We want unique sets of software image files for each device type
-        software_image_files = list(SoftwareImageFile.objects.all()[:4])
+        software_image_files = list(SoftwareImageFile.objects.filter(default_image=False)[:4])
         software_versions = list(SoftwareVersion.objects.filter(software_image_files__isnull=False)[:2])
         software_image_files[0].software_version = software_versions[0]
         software_image_files[1].software_version = software_versions[0]
@@ -2090,6 +2094,10 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             software_image_file.save()
         devicetypes[0].software_image_files.set(software_image_files[:2])
         devicetypes[1].software_image_files.set(software_image_files[2:])
+        # Only valid software image files are those that belong to the device type or default images
+        valid_software_image_files = software_image_files[2:] + [
+            SoftwareImageFile.objects.filter(default_image=True).first()
+        ]
 
         cls.custom_fields = (
             CustomField.objects.create(
@@ -2201,7 +2209,7 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "cf_crash_counter": -1,
             "cr_router-id": None,
             "software_version": software_versions[1].pk,
-            "software_image_files": [f.pk for f in software_versions[0].software_image_files.all()],
+            "software_image_files": [f.pk for f in valid_software_image_files],
         }
 
         cls.bulk_edit_data = {
@@ -2359,6 +2367,19 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
                 sorted(interface_ips),
             )
 
+        with self.subTest("Assert Assigning IPAddress Without Selecting Any IPAddress Raises Exception"):
+            assign_ip_form_data["pk"] = []
+            assign_ip_request = {
+                "path": reverse("ipam:ipaddress_assign")
+                + f"?interface={self.interfaces[1].id}&return_url={device_list_url}",
+                "data": post_data(assign_ip_form_data),
+            }
+            response = self.client.post(**assign_ip_request, follow=True)
+            self.assertHttpStatus(response, 200)
+            self.assertIn(
+                "Please select at least one IP Address from the table.", response.content.decode(response.charset)
+            )
+
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_device_rearports(self):
         device = Device.objects.first()
@@ -4172,6 +4193,28 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "domain": "domain-x",
         }
 
+    def test_device_interfaces_count_correct(self):
+        """
+        This checks whether the other memebers' interfaces are included in the
+        interfaces tab of the master device and whether the interface count on the tab header is
+        rendered correctly.
+        """
+        self.user.is_superuser = True
+        self.user.save()
+        interface_status = Status.objects.get_for_model(Interface).first()
+        Interface.objects.create(device=self.devices[0], name="eth0", status=interface_status)
+        Interface.objects.create(device=self.devices[0], name="eth1", status=interface_status)
+        Interface.objects.create(device=self.devices[1], name="device 1 interface 1", status=interface_status)
+        Interface.objects.create(device=self.devices[1], name="device 1 interface 2", status=interface_status)
+        Interface.objects.create(device=self.devices[2], name="device 2 interface 1", status=interface_status)
+        Interface.objects.create(device=self.devices[2], name="device 2 interface 2", status=interface_status)
+        response = self.client.get(reverse("dcim:device_interfaces", kwargs={"pk": self.devices[0].pk}))
+        self.assertIn('Interfaces <span class="badge">6</span>', str(response.content))
+        self.assertIn("device 1 interface 1", str(response.content))
+        self.assertIn("device 1 interface 2", str(response.content))
+        self.assertIn("device 2 interface 1", str(response.content))
+        self.assertIn("device 2 interface 2", str(response.content))
+
     def test_device_column_visible(self):
         """
         This checks whether the device column on a device's interfaces

nautobot/dcim/utils.py

@@ -14,7 +14,7 @@ from netutils.lib_mapper import (
     SCRAPLI_LIB_MAPPER_REVERSE,
 )
 
-from nautobot.core.utils.color import hex_to_rgb, lighten_color, rgb_to_hex
+from nautobot.core.choices import ColorChoices
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.dcim.choices import InterfaceModeChoices
 from nautobot.dcim.constants import NETUTILS_NETWORK_DRIVER_MAPPING_NAMES
@@ -55,11 +55,14 @@ def cable_status_color_css(record):
     """
     if not record.cable:
         return ""
-    # The status colors are for use with labels and such, and tend to be quite bright.
-    # For this function we want a much milder, mellower color suitable as a row background.
-    base_color = record.cable.get_status_color().strip("#")
-    lighter_color = rgb_to_hex(*lighten_color(*hex_to_rgb(base_color), 0.75))
-    return f"background-color: #{lighter_color}"
+    else:
+        CABLE_STATUS_TO_CSS_CLASS = {
+            ColorChoices.COLOR_GREEN: "success",
+            ColorChoices.COLOR_AMBER: "warning",
+            ColorChoices.COLOR_CYAN: "info",
+        }
+        status_color = record.cable.get_status_color().strip("#")
+        return CABLE_STATUS_TO_CSS_CLASS.get(status_color, "")
 
 
 def get_network_driver_mapping_tool_names():

nautobot/dcim/views.py

@@ -1923,7 +1923,7 @@ class DeviceInterfacesView(DeviceComponentTabView):
 
     def get_extra_context(self, request, instance):
         interfaces = (
-            instance.all_interfaces.restrict(request.user, "view")
+            instance.vc_interfaces.restrict(request.user, "view")
             .prefetch_related(
                 Prefetch("ip_addresses", queryset=IPAddress.objects.restrict(request.user)),
                 Prefetch("member_interfaces", queryset=Interface.objects.restrict(request.user)),
@@ -4049,6 +4049,9 @@ class DeviceRedundancyGroupUIViewSet(NautobotUIViewSet):
             devices_table = tables.DeviceTable(devices)
             devices_table.columns.show("device_redundancy_group_priority")
             context["devices_table"] = devices_table
+            controllers = instance.controllers_sorted.restrict(request.user)
+            controllers_table = tables.ControllerTable(controllers)
+            context["controllers_table"] = controllers_table
         return context
 
 

nautobot/extras/api/serializers.py

@@ -6,6 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
+from timezone_field.rest_framework import TimeZoneSerializerField
 
 from nautobot.core.api import (
     BaseModelSerializer,
@@ -228,7 +229,6 @@ class ContactAssociationSerializer(NautobotModelSerializer):
         fields = "__all__"
         validators = []
         extra_kwargs = {
-            "role": {"required": False},
             "contact": {"required": False},
             "team": {"required": False},
         }
@@ -582,6 +582,7 @@ class JobVariableSerializer(serializers.Serializer):
 
 class ScheduledJobSerializer(BaseModelSerializer):
     # start_time = serializers.DateTimeField(format=None, required=False)
+    time_zone = TimeZoneSerializerField(required=False)
 
     class Meta:
         model = ScheduledJob