nautobot 2.4.9__py3-none-any.whl → 2.4.11__py3-none-any.whl

nautobot/dcim/templates/dcim/modulebay_retrieve.html

@@ -15,4 +15,96 @@
                     {% endif %}
                 {% endif %}
                 <li><a href="{{ object.get_absolute_url }}">{{ object.name }}</a></li>
-{% endblock breadcrumbs %}
+{% endblock breadcrumbs %}
+{% block content_left_page %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Module Bay</strong>
+                        </div>
+                        <table class="table table-hover panel-body attr-table">
+                            <tr>
+                                {% if object.parent_device %}
+                                    <td>Parent Device</td>
+                                    <td>
+                                        {{ object.parent_device|hyperlinked_object }}
+                                    </td>
+                                {% else %}
+                                    <td>Parent Module</td>
+                                    <td>
+                                        {{ object.parent_module|hyperlinked_object }}
+                                    </td>
+                                {% endif %}
+                            </tr>
+                            <tr>
+                                <td>Family</td>
+                                <td>
+                                    {{ object.module_family|hyperlinked_object }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Name</td>
+                                <td>{{ object.name }}</td>
+                            </tr>
+                            <tr>
+                                <td>Position</td>
+                                <td>{{ object.position }}</td>
+                            </tr>
+                            <tr>
+                                <td>Label</td>
+                                <td>{{ object.label|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>{{ object.description|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Requires first-party modules</td>
+                                <td>{{ object.requires_first_party_modules|render_boolean }}</td>
+                            </tr>
+                        </table>
+                    </div>
+{% endblock content_left_page %}
+
+{% block content_right_page %}
+    {% if object.installed_module %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Installed Module</strong>
+                        </div>
+                        <table class="table table-hover panel-body attr-table">
+                            <tr>
+                                <td>Module</td>
+                                <td>
+                                    {{ object.installed_module|hyperlinked_object }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Module Type</td>
+                                <td>
+                                    {{ object.installed_module.module_type|hyperlinked_object }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Status</td>
+                                <td>{{ object.installed_module.status|hyperlinked_object_with_color }}</td>
+                            </tr>
+                            <tr>
+                                <td>Role</td>
+                                <td>{{ object.installed_module.role|hyperlinked_object_with_color }}</td>
+                            </tr>
+                            <tr>
+                                <td>Serial</td>
+                                <td>{{ object.installed_module.serial|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Asset Tag</td>
+                                <td>{{ object.installed_module.asset_tag|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Tenant</td>
+                                <td>{{ object.installed_module.tenant|hyperlinked_object }}</td>
+                            </tr>
+                        </table>
+                    </div>
+    {% endif %}
+{% endblock content_right_page %}

nautobot/dcim/templates/dcim/modulefamily_retrieve.html

@@ -0,0 +1,31 @@
+{% extends 'generic/object_detail.html' %}
+{% load helpers %}
+
+{% block content_left_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Module Family</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Description</td>
+                <td>{{ object.description|placeholder }}</td>
+            </tr>
+        </table>
+    </div>
+{% endblock content_left_page %}
+
+{% block content_right_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Module Types</strong>
+        </div>
+        {% include 'inc/table.html' with table=module_type_table %}
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Module Bays</strong>
+        </div>
+        {% include 'inc/table.html' with table=module_bay_table %}
+    </div>
+{% endblock content_right_page %} 

nautobot/dcim/templates/dcim/moduletype_retrieve.html

@@ -101,6 +101,12 @@
                             {{ object.model }}<br/>
                         </td>
                     </tr>
+                    <tr>
+                        <td>Family</td>
+                        <td>
+                            {{ object.module_family|hyperlinked_object }}<br/>
+                        </td>
+                    </tr>
                     <tr>
                         <td>Part Number</td>
                         <td>{{ object.part_number|placeholder }}</td>

nautobot/dcim/templates/dcim/powerfeed_retrieve.html

@@ -1,168 +1,9 @@
 {% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
-
 {% block extra_breadcrumbs %}
                 <li>{{ object.power_panel.location|hyperlinked_object }}</li>
                 <li>{{ object.power_panel|hyperlinked_object }}</li>
                 {% if object.rack %}
                     <li>{{ object.rack|hyperlinked_object }}</li>
                 {% endif %}
-{% endblock extra_breadcrumbs %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Power Feed</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Power Panel</td>
-                    <td>{{ object.power_panel|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Rack</td>
-                    <td>{{ object.rack|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Type</td>
-                    <td>
-                        <span class="label label-{{ object.get_type_class }}">{{ object.get_type_display }}</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Status</td>
-                    <td>
-                        {{ object.status| hyperlinked_object_with_color }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Connected Device</td>
-                    <td>
-                        {% if object.connected_endpoint %}
-                            {{ object.connected_endpoint.parent|hyperlinked_object }}
-                            ({{ object.connected_endpoint }})
-                        {% else %}
-                            <span class="text-muted">None</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Utilization (Allocated)</td>
-                    {% with utilization=object.connected_endpoint.get_power_draw %}
-                        {% if utilization %}
-                            <td>
-                                {{ utilization.allocated }}VA / {{ object.available_power }}VA
-                                {% if object.available_power > 0 %}
-                                    {% utilization_graph_raw_data utilization.allocated object.available_power %}
-                                {% endif %}
-                            </td>
-                        {% else %}
-                            <td class="text-muted">N/A</td>
-                        {% endif %}
-                    {% endwith %}
-                </tr>
-            </table>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Electrical Characteristics</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Supply</td>
-                    <td>{{ object.get_supply_display }}</td>
-                </tr>
-                <tr>
-                    <td>Voltage</td>
-                    <td>{{ object.voltage }}V</td>
-                </tr>
-                <tr>
-                    <td>Amperage</td>
-                    <td>{{ object.amperage }}A</td>
-                </tr>
-                <tr>
-                    <td>Phase</td>
-                    <td>{{ object.get_phase_display }}</td>
-                </tr>
-                <tr>
-                    <td>Max Utilization</td>
-                    <td>{{ object.max_utilization }}%</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Connection</strong>
-            </div>
-            {% if object.cable %}
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Cable</td>
-                        <td>
-                            {{ object.cable|hyperlinked_object }}
-                            <a href="{% url 'dcim:powerfeed_trace' pk=object.pk %}" class="btn btn-primary btn-xs" title="Trace">
-                                <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
-                            </a>
-                        </td>
-                    </tr>
-                    {% if object.connected_endpoint %}
-                        <tr>
-                            {% 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>
-                            <td>{{ object.connected_endpoint|hyperlinked_object }}</td>
-                        </tr>
-                        <tr>
-                            <td>Type</td>
-                            <td>{{ object.connected_endpoint.get_type_display|placeholder }}</td>
-                        </tr>
-                        <tr>
-                            <td>Description</td>
-                            <td>{{ object.connected_endpoint.description|placeholder }}</td>
-                        </tr>
-                        <tr>
-                            <td>Path Status</td>
-                            <td>
-                                {% if object.path.is_active %}
-                                    <span class="label label-success">Reachable</span>
-                                {% else %}
-                                    <span class="label label-danger">Not Reachable</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endif %}
-                </table>
-            {% else %}
-                <div class="panel-body text-muted">
-                    {% if perms.dcim.add_cable %}
-                        <a href="{% url 'dcim:powerfeed_connect' termination_a_id=object.pk termination_b_type='power-port' %}?return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm pull-right">
-                            <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
-                        </a>
-                    {% endif %}
-                    Not connected
-                </div>
-            {% endif %}
-        </div>
-        <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 %}
+{% endblock extra_breadcrumbs %}

nautobot/dcim/tests/test_api.py

@@ -50,6 +50,7 @@ from nautobot.dcim.models import (
     Module,
     ModuleBay,
     ModuleBayTemplate,
+    ModuleFamily,
     ModuleType,
     Platform,
     PowerFeed,
@@ -1388,15 +1389,18 @@ class ModuleBayTemplateTest(Mixins.ModularDeviceComponentTemplateMixin, Mixins.B
     @classmethod
     def setUpTestData(cls):
         super().setUpTestData()
+        cls.module_family = ModuleFamily.objects.create(name="Test Module Family")
 
         cls.create_data = [
             {
                 "device_type": cls.device_type.pk,
                 "name": "Test1",
+                "module_family": cls.module_family.pk,
             },
             {
                 "module_type": cls.module_type.pk,
                 "name": "Test2",
+                "module_family": cls.module_family.pk,
             },
             {
                 "device_type": cls.device_type.pk,
@@ -3792,3 +3796,34 @@ class InterfaceVDCAssignmentTestCase(APIViewTestCases.APIViewTestCase):
     def test_docs(self):
         """Skip: InterfaceVDCAssignment has no docs yet"""
         # TODO(timizuo): Add docs for Interface VDC Assignment
+
+
+class ModuleFamilyTest(APIViewTestCases.APIViewTestCase):
+    """Test the ModuleFamily API."""
+
+    model = ModuleFamily
+    brief_fields = ["display", "id", "name", "url"]
+    create_data = [
+        {
+            "name": "Module Family 4",
+            "description": "Fourth family",
+        },
+        {
+            "name": "Module Family 5",
+            "description": "Fifth family",
+        },
+        {
+            "name": "Module Family 6",
+            "description": "Sixth family",
+        },
+    ]
+    bulk_update_data = {
+        "description": "New description",
+    }
+
+    @classmethod
+    def setUpTestData(cls):
+        """Create test data for API tests."""
+        ModuleFamily.objects.create(name="Module Family 1", description="First family")
+        ModuleFamily.objects.create(name="Module Family 2", description="Second family")
+        ModuleFamily.objects.create(name="Module Family 3", description="Third family")

nautobot/dcim/tests/test_filters.py

@@ -52,6 +52,7 @@ from nautobot.dcim.filters import (
     ManufacturerFilterSet,
     ModuleBayFilterSet,
     ModuleBayTemplateFilterSet,
+    ModuleFamilyFilterSet,
     ModuleFilterSet,
     ModuleTypeFilterSet,
     PlatformFilterSet,
@@ -100,6 +101,7 @@ from nautobot.dcim.models import (
     Module,
     ModuleBay,
     ModuleBayTemplate,
+    ModuleFamily,
     ModuleType,
     Platform,
     PowerFeed,
@@ -573,12 +575,20 @@ def common_test_data(cls):
         label="devicebay3",
         description="Device Bay Description 3",
     )
+
+    cls.module_families = (
+        ModuleFamily.objects.create(name="Module Family 1"),
+        ModuleFamily.objects.create(name="Module Family 2"),
+        ModuleFamily.objects.create(name="Module Family 3"),
+    )
     ModuleBayTemplate.objects.create(
         device_type=device_types[0],
         name="device test module bay 1",
         position=1,
         label="devicemodulebay1",
         description="device test module bay 1 description",
+        module_family=cls.module_families[0],
+        requires_first_party_modules=True,
     )
     ModuleBayTemplate.objects.create(
         device_type=device_types[1],
@@ -586,13 +596,16 @@ def common_test_data(cls):
         position=2,
         label="devicemodulebay2",
         description="device test module bay 2 description",
+        module_family=cls.module_families[1],
+        requires_first_party_modules=False,
     )
     ModuleBayTemplate.objects.create(
         device_type=device_types[2],
         name="device test module bay 3",
         position=3,
         label="devicemodulebay3",
-        description="device test module bay 3 description",
+        description="device test module bay 3 without a module family",
+        requires_first_party_modules=True,
     )
     secrets_groups = (
         SecretsGroup.objects.create(name="Secrets group 1"),
@@ -667,10 +680,16 @@ def common_test_data(cls):
             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"
+            manufacturer=cls.manufacturers[1],
+            model="Filter Test Module Type 2",
+            comments="Module Type 2",
+            module_family=cls.module_families[0],
         ),
         ModuleType.objects.create(
-            manufacturer=cls.manufacturers[2], model="Filter Test Module Type 3", comments="Module Type 3"
+            manufacturer=cls.manufacturers[2],
+            model="Filter Test Module Type 3",
+            comments="Module Type 3",
+            module_family=cls.module_families[1],
         ),
     )
 
@@ -715,6 +734,7 @@ def common_test_data(cls):
             name=f"Test Filters Module Module Bay {i+1}",
             position=i + 1,
             module_type=module_types[i % 2],
+            requires_first_party_modules=(i % 2 == 0),  # True for even indices, False for odd
         )
 
     module_roles = Role.objects.get_for_model(Module)
@@ -4055,6 +4075,18 @@ class ModuleTestCase(
         Interface.objects.filter(pk=interfaces[0].pk).update(mac_address="00-00-00-00-00-01")
         Interface.objects.filter(pk=interfaces[1].pk).update(mac_address="00-00-00-00-00-02")
 
+    def test_compatible_with_module_bay(self):
+        """Test filtering modules that are compatible with a specific module bay based on module family."""
+        module_bay = ModuleBay.objects.filter(module_family__isnull=False).first()
+        compatible_modules = Module.objects.filter(module_type__module_family=module_bay.module_family)
+        params = {"compatible_with_module_bay": module_bay.pk}
+        self.assertQuerysetEqualAndNotEmpty(self.filterset(params).qs, compatible_modules)
+
+        # Test with module bay that has no module family - should return ALL modules
+        module_bay_no_family = ModuleBay.objects.filter(module_family__isnull=True).first()
+        params = {"compatible_with_module_bay": module_bay_no_family.pk}
+        self.assertQuerysetEqual(self.filterset(params).qs, self.queryset, ordered=False)
+
 
 class ModuleTypeTestCase(FilterTestCases.FilterTestCase):
     queryset = ModuleType.objects.all()
@@ -4080,12 +4112,26 @@ class ModuleTypeTestCase(FilterTestCases.FilterTestCase):
         ("rear_port_templates", "rear_port_templates__id"),
         ("rear_port_templates", "rear_port_templates__name"),
         ("module_bay_templates", "module_bay_templates__id"),
+        ("module_family", "module_family__id"),
+        ("module_family", "module_family__name"),
     ]
 
     @classmethod
     def setUpTestData(cls):
         common_test_data(cls)
 
+    def test_compatible_with_module_bay(self):
+        """Test filtering module types that are compatible with a specific module bay based on module family."""
+        module_bay = ModuleBay.objects.filter(module_family__isnull=False).first()
+        compatible_module_types = ModuleType.objects.filter(module_family=module_bay.module_family)
+        params = {"compatible_with_module_bay": module_bay.pk}
+        self.assertQuerysetEqualAndNotEmpty(self.filterset(params).qs, compatible_module_types)
+
+        # Test with module bay that has no module family - should return ALL module types
+        module_bay_no_family = ModuleBay.objects.filter(module_family__isnull=True).first()
+        params = {"compatible_with_module_bay": module_bay_no_family.pk}
+        self.assertQuerysetEqual(self.filterset(params).qs, self.queryset, ordered=False)
+
 
 class ModuleBayTemplateTestCase(FilterTestCases.FilterTestCase):
     queryset = ModuleBayTemplate.objects.all()
@@ -4097,6 +4143,8 @@ class ModuleBayTemplateTestCase(FilterTestCases.FilterTestCase):
         ("label",),
         ("module_type", "module_type__id"),
         ("module_type", "module_type__model"),
+        ("module_family", "module_family__id"),
+        ("module_family", "module_family__name"),
         ("name",),
         ("position",),
     ]
@@ -4105,6 +4153,21 @@ class ModuleBayTemplateTestCase(FilterTestCases.FilterTestCase):
     def setUpTestData(cls):
         common_test_data(cls)
 
+    def test_requires_first_party_modules(self):
+        # TODO: Not a generic_filter_test because this is a boolean filter but not a RelatedMembershipBooleanFilter
+        with self.subTest():
+            params = {"requires_first_party_modules": True}
+            self.assertQuerysetEqual(
+                self.filterset(params, self.queryset).qs,
+                self.queryset.filter(requires_first_party_modules=True),
+            )
+        with self.subTest():
+            params = {"requires_first_party_modules": False}
+            self.assertQuerysetEqual(
+                self.filterset(params, self.queryset).qs,
+                self.queryset.filter(requires_first_party_modules=False),
+            )
+
 
 class ModuleBayTestCase(FilterTestCases.FilterTestCase):
     queryset = ModuleBay.objects.all()
@@ -4268,3 +4331,39 @@ class InterfaceVDCAssignmentTestCase(FilterTestCases.FilterTestCase):
                 status=interface_status,
             ),
         )
+
+
+class ModuleFamilyTestCase(FilterTestCases.FilterTestCase):
+    """Test cases for the ModuleFamilyFilterSet."""
+
+    queryset = ModuleFamily.objects.all()
+    filterset = ModuleFamilyFilterSet
+    generic_filter_tests = [
+        ("name",),
+        ("description",),
+        ("module_types", "module_types__id"),
+        ("module_types", "module_types__model"),
+    ]
+
+    @classmethod
+    def setUpTestData(cls):
+        """Create test data for filter tests."""
+        manufacturers = (
+            Manufacturer.objects.create(name="Manufacturer 1"),
+            Manufacturer.objects.create(name="Manufacturer 2"),
+        )
+
+        cls.module_families = (
+            ModuleFamily.objects.create(name="Module Family 1", description="First family"),
+            ModuleFamily.objects.create(name="Module Family 2", description="Second family"),
+            ModuleFamily.objects.create(name="Module Family 3", description="Third family"),
+        )
+
+        cls.module_types = (
+            ModuleType.objects.create(
+                manufacturer=manufacturers[0], model="Model 1", module_family=cls.module_families[0]
+            ),
+            ModuleType.objects.create(
+                manufacturer=manufacturers[1], model="Model 2", module_family=cls.module_families[1]
+            ),
+        )