nautobot 2.4.17__py3-none-any.whl → 2.4.19__py3-none-any.whl

nautobot/dcim/templates/dcim/rearport.html

@@ -2,88 +2,88 @@
 {% load helpers %}
 
 {% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Rear Port</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        {% if object.device %}
-                            <td>Device</td>
-                            <td>{{ object.device|hyperlinked_object }}</td>
-                        {% else %}
-                            <td>Module</td>
-                            <td>{{ object.module|hyperlinked_object }}</td>
-                        {% endif %}
-                    </tr>
-                    <tr>
-                        <td>Name</td>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    <tr>
-                        <td>Label</td>
-                        <td>{{ object.label|placeholder }}</td>
-                    </tr>
-                    <tr>
-                        <td>Type</td>
-                        <td>{{ object.get_type_display }}</td>
-                    </tr>
-                    <tr>
-                        <td>Positions</td>
-                        <td>{{ object.positions }}</td>
-                    </tr>
-                    <tr>
-                        <td>Description</td>
-                        <td>{{ object.description|placeholder }}</td>
-                    </tr>
-                </table>
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Rear Port</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                {% if object.device %}
+                    <td>Device</td>
+                    <td>{{ object.device|hyperlinked_object }}</td>
+                {% else %}
+                    <td>Module</td>
+                    <td>{{ object.module|hyperlinked_object }}</td>
+                {% endif %}
+            </tr>
+            <tr>
+                <td>Name</td>
+                <td>{{ object.name }}</td>
+            </tr>
+            <tr>
+                <td>Label</td>
+                <td>{{ object.label|placeholder }}</td>
+            </tr>
+            <tr>
+                <td>Type</td>
+                <td>{{ object.get_type_display }}</td>
+            </tr>
+            <tr>
+                <td>Positions</td>
+                <td>{{ object.positions }}</td>
+            </tr>
+            <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>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:rearport_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>
-                        <tr>
-                            <td>Connection Status</td>
-                            <td>
-                                {% if object.cable.status %}
-                                    <span class="label label-success">{{ object.cable.get_status_display }}</span>
-                                {% else %}
-                                    <span class="label label-info">{{ object.cable.get_status_display }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                    </table>
-                {% else %}
-                    <div class="panel-body text-muted">
-                        Not connected
-                        {% if perms.dcim.add_cable %}
-                            <span class="dropdown pull-right">
-                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
-                                </button>
-                                <ul class="dropdown-menu dropdown-menu-right">
-                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='interface' %}?return_url={{ object.get_absolute_url }}">Interface</a></li>
-                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
-                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='circuit-termination' %}?return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
-                                </ul>
-                            </span>
+    <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:rearport_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>
+                <tr>
+                    <td>Connection Status</td>
+                    <td>
+                        {% if object.cable.status %}
+                            <span class="label label-success">{{ object.cable.get_status_display }}</span>
+                        {% else %}
+                            <span class="label label-info">{{ object.cable.get_status_display }}</span>
                         {% endif %}
-                    </div>
+                    </td>
+                </tr>
+            </table>
+        {% else %}
+            <div class="panel-body text-muted">
+                Not connected
+                {% if perms.dcim.add_cable %}
+                    <span class="dropdown pull-right">
+                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-right">
+                            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='interface' %}?return_url={{ object.get_absolute_url }}">Interface</a></li>
+                            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
+                            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
+                            <li><a href="{% url 'dcim:rearport_connect' termination_a_id=object.pk termination_b_type='circuit-termination' %}?return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
+                        </ul>
+                    </span>
                 {% endif %}
             </div>
+        {% endif %}
+    </div>
 {% endblock content_right_page %}

nautobot/dcim/templates/dcim/virtualchassis_retrieve.html

@@ -1,51 +1,2 @@
 {% 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 %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/virtualdevicecontext_retrieve.html

@@ -1,6 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-    <li><a href="{% url 'dcim:device' pk=object.device.pk %}">{{ object.device }}</a></li>
-{% endblock extra_breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/tests/integration/test_device_bulk_operations.py

@@ -9,7 +9,7 @@ from nautobot.core.testing.integration import (
     BulkOperationsTestCases,
     SeleniumTestCase,
 )
-from nautobot.dcim.models import Device
+from nautobot.dcim.models import Controller, Device
 from nautobot.extras.tests.integration import create_test_device
 
 
@@ -25,6 +25,7 @@ class DeviceBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCas
     model_class = Device
 
     def setup_items(self):
+        Controller.objects.all().delete()
         Device.objects.all().delete()
         test_uuid = str(uuid.uuid4())
 
@@ -77,7 +78,7 @@ class DeviceBulkUrlParamTestCase(SeleniumTestCase):
 
         # Click the bulk-edit button (it uses formaction)
         bulk_url = reverse("dcim:device_bulk_edit")
-        btn_xpath = f'//button[@type="submit" and @formaction="{bulk_url}"]'
+        btn_xpath = f'//button[@type="submit" and starts-with(@formaction, "{bulk_url}")]'
         bulk_btn = WebDriverWait(self.browser.driver, 2).until(
             expected_conditions.element_to_be_clickable((By.XPATH, btn_xpath))
         )

nautobot/dcim/tests/integration/test_location_bulk_operations.py

@@ -17,10 +17,14 @@ class LocationBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestC
     model_edit_data = {"description": "Test description"}
     model_filter_by = {"location_type": "External"}
     model_class = Location
+    model_expected_counts: dict[str, int] = {
+        "all": 5,
+        "filtered": 2,
+    }
+    all_count = 5
 
     def setup_items(self):
-        Location.objects.all().delete()
-
+        self.model_expected_counts["all"] = Location.objects.count() + self.all_count
         # Create locations for test
         self.create_location("Test Location Integration Test 1")
         self.create_location("Test Location Integration Test 2")

nautobot/dcim/tests/test_api.py

@@ -10,7 +10,7 @@ from django.urls import reverse
 from rest_framework import status
 
 from nautobot.core.testing import APITestCase, APIViewTestCases
-from nautobot.core.testing.utils import generate_random_device_asset_tag_of_specified_size
+from nautobot.core.testing.utils import generate_random_device_asset_tag_of_specified_size, get_deletable_objects
 from nautobot.dcim.choices import (
     ConsolePortTypeChoices,
     InterfaceModeChoices,
@@ -3587,6 +3587,15 @@ class DeviceTypeToSoftwareImageFileTestCase(
 class ControllerTestCase(APIViewTestCases.APIViewTestCase):
     model = Controller
 
+    def get_deletable_object(self):
+        # This method is used in `test_recreate_object_csv`,
+        # and the CSV export-import round-trip doesn't correctly distinguish between empty-list and null values presently,
+        # so a `null` exported then re-imported will become a `[]` and cause the test to fail. Work around that for now:
+        instance = get_deletable_objects(self.model, self._get_queryset().filter(capabilities__isnull=False)).first()
+        if instance is None:
+            self.fail("Couldn't find a single deletable object!")
+        return instance
+
     @classmethod
     def setUpTestData(cls):
         statuses = Status.objects.get_for_model(Controller)
@@ -3618,6 +3627,14 @@ class ControllerTestCase(APIViewTestCases.APIViewTestCase):
                 "location": locations[2].pk,
                 "capabilities": ["wireless"],
             },
+            {
+                "name": "Controller 4",
+                "platform": platforms[3].pk,
+                "status": statuses[3].pk,
+                "role": roles[3].pk,
+                "location": locations[3].pk,
+                "capabilities": None,
+            },
         ]
         cls.bulk_update_data = {
             "platform": platforms[0].pk,
@@ -3629,6 +3646,15 @@ class ControllerTestCase(APIViewTestCases.APIViewTestCase):
 class ControllerManagedDeviceGroupTestCase(APIViewTestCases.APIViewTestCase):
     model = ControllerManagedDeviceGroup
 
+    def get_deletable_object(self):
+        # This method is used in `test_recreate_object_csv`,
+        # and the CSV export-import round-trip doesn't correctly distinguish between empty-list and null values presently,
+        # so a `null` exported then re-imported will become a `[]` and cause the test to fail. Work around that for now:
+        instance = get_deletable_objects(self.model, self._get_queryset().filter(capabilities__isnull=False)).first()
+        if instance is None:
+            self.fail("Couldn't find a single deletable object!")
+        return instance
+
     @classmethod
     def setUpTestData(cls):
         controllers = Controller.objects.all()
@@ -3651,6 +3677,12 @@ class ControllerManagedDeviceGroupTestCase(APIViewTestCases.APIViewTestCase):
                 "weight": 200,
                 "capabilities": ["wireless"],
             },
+            {
+                "name": "ControllerManagedDeviceGroup 4",
+                "controller": controllers[3].pk,
+                "weight": 200,
+                "capabilities": None,
+            },
         ]
         # changing controller is error-prone since a child group must have the same controller as its parent
         cls.update_data = {