nautobot 2.4.10__py3-none-any.whl → 2.4.12__py3-none-any.whl

nautobot/dcim/templates/dcim/virtualchassis_add.html

@@ -1,22 +1,2 @@
-{% extends 'generic/object_create.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Virtual Chassis</strong></div>
-        <div class="panel-body">
-            {% render_field form.name %}
-            {% render_field form.domain %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Member Devices</strong></div>
-        <div class="panel-body">
-            {% render_field form.location %}
-            {% render_field form.rack %}
-            {% render_field form.members %}
-            {% render_field form.initial_position %}
-        </div>
-    </div>
-    {% include 'inc/extras_features_edit_form_fields.html' %}
-{% endblock %}
+{% extends 'dcim/virtualchassis_create.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/virtualchassis_create.html

@@ -0,0 +1,22 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Virtual Chassis</strong></div>
+        <div class="panel-body">
+            {% render_field form.name %}
+            {% render_field form.domain %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Member Devices</strong></div>
+        <div class="panel-body">
+            {% render_field form.location %}
+            {% render_field form.rack %}
+            {% render_field form.members %}
+            {% render_field form.initial_position %}
+        </div>
+    </div>
+    {% include 'inc/extras_features_edit_form_fields.html' %}
+{% endblock %}

nautobot/dcim/templates/dcim/virtualchassis_edit.html

@@ -1,93 +1,2 @@
-{% extends 'base.html' %}
-{% load helpers %}
-{% load form_helpers %}
-
-{% block content %}
-    <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
-        {% csrf_token %}
-        {{ pk_form.pk }}
-        {{ formset.management_form }}
-        <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-                <h3>{% block title %}{% if vc_form.instance %}Editing {{ vc_form.instance }}{% else %}New Virtual Chassis{% endif %}{% endblock %}</h3>
-                {% if vc_form.non_field_errors %}
-                    <div class="panel panel-danger">
-                        <div class="panel-heading"><strong>Errors</strong></div>
-                        <div class="panel-body">
-                            {{ vc_form.non_field_errors }}
-                        </div>
-                    </div>
-                {% endif %}
-                <div class="panel panel-default">
-                    <div class="panel-heading"><strong>Virtual Chassis</strong></div>
-                    <div class="table panel-body">
-                        {% render_field vc_form.name %}
-                        {% render_field vc_form.domain %}
-                        {% render_field vc_form.master %}
-                    </div>
-                </div>
-                {% include 'inc/extras_features_edit_form_fields.html' with form=vc_form %}
-                <div class="panel panel-default">
-                    <div class="panel-heading"><strong>Members</strong></div>
-                    <table class="table panel-body">
-                        <thead>
-                            <tr>
-                                <th>Device</th>
-                                <th>Rack/Unit</th>
-                                <th>Serial</th>
-                                <th>Position</th>
-                                <th>Priority</th>
-                                <th></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for form in formset %}
-                                {% for field in form.hidden_fields %}
-                                    {{ field }}
-                                {% endfor %}
-                                {% with device=form.instance virtual_chassis=vc_form.instance %}
-                                    <tr>
-                                        <td>{{ device|hyperlinked_object }}</td>
-                                        <td>
-                                            {% if device.rack %}
-                                                {{ device.rack }} / {{ device.position }}
-                                            {% else %}
-                                                <span class="text-muted">&mdash;</span>
-                                            {% endif %}
-                                        </td>
-                                        <td>{{ device.serial|placeholder }}</td>
-                                        <td>
-                                            {{ form.vc_position }}
-                                            {% if form.vc_position.errors %}
-                                                <br /><small class="text-danger">{{ form.vc_position.errors.0 }}</small>
-                                            {% endif %}
-                                        </td>
-                                        <td>
-                                            {{ form.vc_priority }}
-                                            {% if form.vc_priority.errors %}
-                                                <br /><small class="text-danger">{{ form.vc_priority.errors.0 }}</small>
-                                            {% endif %}
-                                        </td>
-                                        <td>
-                                            {% if virtual_chassis.present_in_database %}
-                                                <a href="{% url 'dcim:virtualchassis_remove_member' pk=device.pk %}?return_url={% url 'dcim:virtualchassis_edit' pk=virtual_chassis.pk %}" class="btn btn-danger btn-xs{% if virtual_chassis.master == device %} disabled{% endif %}">
-                                                    <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>
-                                                </a>
-                                            {% endif %}
-                                        </td>
-                                    </tr>
-                                {% endwith %}
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
-                <button type="submit" name="_update" class="btn btn-primary">Update</button>
-                <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-            </div>
-        </div>
-    </form>
-{% endblock %}
+{% extends "virtualchassis_update.html" %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/virtualchassis_retrieve.html

@@ -0,0 +1,51 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block content_left_page %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Virtual Chassis</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>Domain</td>
+                    <td>{{ object.domain|placeholder }}</td>
+                </tr>
+                <tr>
+                    <td>Master</td>
+                    <td>{{ object.master|hyperlinked_object }}</td>
+                </tr>
+            </table>
+        </div>
+{% endblock content_left_page %}
+
+{% block content_right_page %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Members</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <th>Device</th>
+                    <th>Position</th>
+                    <th>Master</th>
+                    <th>Priority</th>
+                </tr>
+                {% for vc_member in members %}
+                    <tr{% if vc_member == device %} class="info"{% endif %}>
+                        <td>{{ vc_member|hyperlinked_object }}</td>
+                        <td><span class="badge badge-default">{{ vc_member.vc_position }}</span></td>
+                        <td>{% if object.master == vc_member %}{{ True | render_boolean }}{% endif %}</td>
+                        <td>{{ vc_member.vc_priority|placeholder }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+            {% if perms.dcim.change_virtualchassis %}
+                <div class="panel-footer text-right noprint">
+                    <a href="{% url 'dcim:virtualchassis_add_member' pk=object.pk %}?location={{ object.master.location.pk }}&rack={{ object.master.rack.pk }}" class="btn btn-primary btn-xs">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Member
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+{% endblock content_right_page %}

nautobot/dcim/templates/dcim/virtualchassis_update.html

@@ -0,0 +1,93 @@
+{% extends 'base.html' %}
+{% load helpers %}
+{% load form_helpers %}
+
+{% block content %}
+    <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
+        {% csrf_token %}
+        {{ pk_form.pk }}
+        {{ formset.management_form }}
+        <div class="row">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+                <h3>{% block title %}{% if vc_form.instance %}Editing {{ vc_form.instance }}{% else %}New Virtual Chassis{% endif %}{% endblock %}</h3>
+                {% if vc_form.non_field_errors %}
+                    <div class="panel panel-danger">
+                        <div class="panel-heading"><strong>Errors</strong></div>
+                        <div class="panel-body">
+                            {{ vc_form.non_field_errors }}
+                        </div>
+                    </div>
+                {% endif %}
+                <div class="panel panel-default">
+                    <div class="panel-heading"><strong>Virtual Chassis</strong></div>
+                    <div class="table panel-body">
+                        {% render_field vc_form.name %}
+                        {% render_field vc_form.domain %}
+                        {% render_field vc_form.master %}
+                    </div>
+                </div>
+                {% include 'inc/extras_features_edit_form_fields.html' with form=vc_form %}
+                <div class="panel panel-default">
+                    <div class="panel-heading"><strong>Members</strong></div>
+                    <table class="table panel-body">
+                        <thead>
+                            <tr>
+                                <th>Device</th>
+                                <th>Rack/Unit</th>
+                                <th>Serial</th>
+                                <th>Position</th>
+                                <th>Priority</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for form in formset %}
+                                {% for field in form.hidden_fields %}
+                                    {{ field }}
+                                {% endfor %}
+                                {% with device=form.instance virtual_chassis=vc_form.instance %}
+                                    <tr>
+                                        <td>{{ device|hyperlinked_object }}</td>
+                                        <td>
+                                            {% if device.rack %}
+                                                {{ device.rack }} / {{ device.position }}
+                                            {% else %}
+                                                <span class="text-muted">&mdash;</span>
+                                            {% endif %}
+                                        </td>
+                                        <td>{{ device.serial|placeholder }}</td>
+                                        <td>
+                                            {{ form.vc_position }}
+                                            {% if form.vc_position.errors %}
+                                                <br /><small class="text-danger">{{ form.vc_position.errors.0 }}</small>
+                                            {% endif %}
+                                        </td>
+                                        <td>
+                                            {{ form.vc_priority }}
+                                            {% if form.vc_priority.errors %}
+                                                <br /><small class="text-danger">{{ form.vc_priority.errors.0 }}</small>
+                                            {% endif %}
+                                        </td>
+                                        <td>
+                                            {% if virtual_chassis.present_in_database %}
+                                                <a href="{% url 'dcim:virtualchassis_remove_member' pk=device.pk %}?return_url={% url 'dcim:virtualchassis_edit' pk=virtual_chassis.pk %}" class="btn btn-danger btn-xs{% if virtual_chassis.master == device %} disabled{% endif %}">
+                                                    <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>
+                                                </a>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endwith %}
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
+                <button type="submit" name="_update" class="btn btn-primary">Update</button>
+                <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
+            </div>
+        </div>
+    </form>
+{% endblock %}

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]
+            ),
+        )