nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/dcim/templates/dcim/rack_retrieve.html

@@ -3,24 +3,31 @@
 {% load static %}
 
 {% block extra_buttons %}
-    <a {% if prev_rack %}href="{% url 'dcim:rack' pk=prev_rack.pk %}"{% else %}disabled="disabled"{% endif %} class="btn btn-primary">
-        <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous Rack
-    </a>
-    <a {% if next_rack %}href="{% url 'dcim:rack' pk=next_rack.pk %}"{% else %}disabled="disabled"{% endif %} class="btn btn-primary">
-        <span class="mdi mdi-chevron-right" aria-hidden="true"></span> Next Rack
-    </a>
-{% endblock extra_buttons %}
-
-{% block title %}Rack {{ object }}{% endblock title %}
-
-{% block panel_buttons %}
-    <button class="btn btn-sm btn-secondary toggle-fullname" selected="selected">
+    {% if prev_rack %}
+        <a href="{% url 'dcim:rack' pk=prev_rack.pk %}" class="btn btn-primary">
+            <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous Rack
+        </a>
+    {% else %}
+        <a aria-disabled="true" class="btn btn-primary disabled">
+            <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous Rack
+        </a>
+    {% endif %}
+    {% if next_rack %}
+        <a href="{% url 'dcim:rack' pk=next_rack.pk %}" class="btn btn-primary">
+            <span class="mdi mdi-chevron-right" aria-hidden="true"></span> Next Rack
+        </a>
+    {% else %}
+        <a aria-disabled="true" class="btn btn-primary disabled">
+            <span class="mdi mdi-chevron-right" aria-hidden="true"></span> Next Rack
+        </a>
+    {% endif %}
+    <button class="btn btn-secondary toggle-fullname" selected="selected">
         <span class="mdi mdi-checkbox-marked-circle-outline" aria-hidden="true"></span> Show Device Full Name
     </button>
-    <button class="btn btn-sm btn-secondary toggle-images" selected="selected">
+    <button class="btn btn-secondary toggle-images" selected="selected">
         <span class="mdi mdi-checkbox-marked-circle-outline" aria-hidden="true"></span> Show Images
     </button>
-{% endblock panel_buttons %}
+{% endblock extra_buttons %}
 
 {% block content_left_page %}
     <div class="card">
@@ -160,7 +167,7 @@
                             <span class="badge" style="color: {{ powerfeed.status.color|fgcolor }}; background-color: #{{powerfeed.status.color}}">{{ powerfeed.get_status_display }}</span>
                         </td>
                         <td>
-                            <span class="badge badge-{{ powerfeed.get_type_class }}">{{ powerfeed.get_type_display }}</span>
+                            <span class="badge bg-{{ powerfeed.get_type_class }}">{{ powerfeed.get_type_display }}</span>
                         </td>
                         {% with power_port=powerfeed.connected_endpoint %}
                             {% if power_port %}

nautobot/dcim/templates/dcim/rearport.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}
@@ -72,14 +72,15 @@
                 Not connected
                 {% if perms.dcim.add_cable %}
                     <span class="dropdown float-end">
-                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        {# comment The "fixed" strategy allows the dropdown to break out of the containing card #}
+                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-popper-config='{"strategy": "fixed"}'>
                             <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 class="dropdown-menu dropdown-menu-end">
+                            <li><a class="dropdown-item" 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 class="dropdown-item" 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 class="dropdown-item" 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 class="dropdown-item" 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 %}

nautobot/dcim/templates/dcim/trace/cable.html

@@ -8,7 +8,7 @@
     {% if cable.length %}
         ({{ cable.length }} {{ cable.get_length_unit_display }})<br />
     {% endif %}
-    <span class="label" style="color: {{cable.status.color|fgcolor}}; background-color: #{{cable.status.color}}">{{ cable.get_status_display }}</span><br />
+    <span class="badge" style="color: {{cable.status.color|fgcolor}}; background-color: #{{cable.status.color}}">{{ cable.get_status_display }}</span><br />
     {% for tag in cable.tags.all %}
         {% tag tag 'dcim:cable_list' %}
     {% endfor %}

nautobot/dcim/templates/dcim/virtualchassis_add_member.html

@@ -3,25 +3,27 @@
 
 {% block content %}
     <form action="" method="post" enctype="multipart/form-data" class="h-100 vstack">
-        {% csrf_token %}b
-        <div class="col-xl-8 offset-lg-2 col-lg-10 offset-md-1">
+        {% csrf_token %}
+        <div class="row justify-content-center">
             <h3 class="mb-16">{% block title %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblock %}</h3>
-            {% if membership_form.non_field_errors %}
-                <div class="card border-danger">
-                    <div class="card-header bg-danger-subtle border-danger text-body">
-                        <strong>Errors</strong>
+            <div class="col-xl-8 col-lg-10">
+                {% if membership_form.non_field_errors %}
+                    <div class="card border-danger">
+                        <div class="card-header bg-danger-subtle border-danger text-body">
+                            <strong>Errors</strong>
+                        </div>
+                        <div class="card-body">
+                            {{ membership_form.non_field_errors }}
+                        </div>
                     </div>
+                {% endif %}
+                <div class="card">
+                    <div class="card-header"><strong>Add New Member</strong></div>
                     <div class="card-body">
-                        {{ membership_form.non_field_errors }}
+                        {% render_form member_select_form %}
+                        {% render_form membership_form %}
                     </div>
                 </div>
-            {% endif %}
-            <div class="card">
-                <div class="card-header"><strong>Add New Member</strong></div>
-                <div class="card-body">
-                    {% render_form member_select_form %}
-                    {% render_form membership_form %}
-                </div>
             </div>
         </div>
         <div class="nb-form-sticky-footer">

nautobot/dcim/templates/dcim/virtualchassis_update.html

@@ -2,14 +2,15 @@
 {% load helpers %}
 {% load form_helpers %}
 
+{% block title %}{% if vc_form.instance %}Editing {{ vc_form.instance }}{% else %}New Virtual Chassis{% endif %}{% endblock %}
+
 {% block content %}
     <form action="" method="post" enctype="multipart/form-data" class="h-100 vstack">
         {% csrf_token %}
         {{ pk_form.pk }}
         {{ formset.management_form }}
-        <div class="row align-content-start flex-fill">
-            <div class="col-xl-8 offset-lg-2 col-lg-10 offset-md-1">
-                <h3 class="mb-16">{% block title %}{% if vc_form.instance %}Editing {{ vc_form.instance }}{% else %}New Virtual Chassis{% endif %}{% endblock %}</h3>
+        <div class="row justify-content-center flex-fill">
+            <div class="col-xl-8 col-lg-10">
                 {% if vc_form.non_field_errors %}
                     <div class="card border-danger">
                         <div class="card-header bg-danger-subtle border-danger text-body">
@@ -31,7 +32,7 @@
                 {% include 'inc/extras_features_edit_form_fields.html' with form=vc_form %}
                 <div class="card">
                     <div class="card-header"><strong>Members</strong></div>
-                    <table class="card-body">
+                    <table class="table table-hover">
                         <thead>
                             <tr>
                                 <th>Device</th>
@@ -72,9 +73,16 @@
                                         </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-sm{% if virtual_chassis.master == device %} disabled{% endif %}">
-                                                    <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>
-                                                </a>
+                                                {% if virtual_chassis.master != device %}
+                                                    <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-sm">
+                                                        <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>
+                                                    </a>
+                                                {% else %}
+                                                    <a aria-disabled="true" class="btn btn-danger btn-sm disabled">
+                                                        <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>
+                                                    </a>
+                                                {% endif %}
                                             {% endif %}
                                         </td>
                                     </tr>

nautobot/dcim/tests/integration/test_controller.py

@@ -1,4 +1,3 @@
-from django.test import tag
 from django.urls import reverse
 
 from nautobot.core.testing.integration import SeleniumTestCase
@@ -10,7 +9,6 @@ class ControllerTestCase(SeleniumTestCase):
     Perform set of Controller tests using Selenium.
     """
 
-    @tag("fix_in_v3")
     def test_controller_bulk_edit(self):
         """
         This test goes through the process of creating a Controller and performing bulk edit.
@@ -38,6 +36,7 @@ class ControllerTestCase(SeleniumTestCase):
 
         # Create Controller
         self.click_navbar_entry("Devices", "Controllers")
+
         self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:controller_list"))
         self.click_list_view_add_button()
         self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:controller_add"))
@@ -54,9 +53,8 @@ class ControllerTestCase(SeleniumTestCase):
         self.browser.find_by_xpath(f"//button[@formaction='{bulk_edit_url}']").click()
 
         # Submit bulk edit form without any changes
-        self.browser.find_by_xpath("//button[@name='_apply']", wait_time=5).click()
+        self.assertTrue(self.browser.is_element_present_by_xpath("//button[@name='_apply']", wait_time=5))
+        self.browser.find_by_xpath("//button[@name='_apply']").click()
 
         job_result = JobResult.objects.filter(name="Bulk Edit Objects").first()
-        self.assertEqual(
-            self.browser.url, self.live_server_url + reverse("extras:jobresult", args=[job_result.pk]) + "?tab=main"
-        )
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:jobresult", args=[job_result.pk]))

nautobot/dcim/tests/integration/test_controller_managed_device_group.py

@@ -1,4 +1,3 @@
-from django.test import tag
 from django.urls import reverse
 
 from nautobot.core.testing.integration import SeleniumTestCase
@@ -10,7 +9,6 @@ class ControllerManagedDeviceGroupsTestCase(SeleniumTestCase):
     Perform set of Controller Managed Device Group tests using Selenium.
     """
 
-    @tag("fix_in_v3")
     def test_controller_managed_device_groups_bulk_edit(self):
         """
         This test goes through the process of creating a Controller Managed Device Group and performing bulk edit.
@@ -66,6 +64,4 @@ class ControllerManagedDeviceGroupsTestCase(SeleniumTestCase):
         self.browser.find_by_xpath("//button[@name='_apply']", wait_time=5).click()
 
         job_result = JobResult.objects.filter(name="Bulk Edit Objects").first()
-        self.assertEqual(
-            self.browser.url, self.live_server_url + reverse("extras:jobresult", args=[job_result.pk]) + "?tab=main"
-        )
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("extras:jobresult", args=[job_result.pk]))

nautobot/dcim/tests/integration/test_create_device.py

@@ -1,4 +1,3 @@
-from django.test import tag
 from django.urls import reverse
 
 from nautobot.core.testing.integration import SeleniumTestCase
@@ -9,7 +8,6 @@ class CreateDeviceTestCase(SeleniumTestCase):
     Create a device and all pre-requisite objects through the UI.
     """
 
-    @tag("fix_in_v3")
     def test_create_device(self):
         """
         This test goes through the process of creating a device in the UI. All pre-requisite objects are created:

nautobot/dcim/tests/integration/test_device_bulk_operations.py

@@ -1,6 +1,5 @@
 import uuid
 
-from django.test import tag
 from django.urls import reverse
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions
@@ -14,7 +13,6 @@ from nautobot.dcim.models import Controller, Device
 from nautobot.extras.tests.integration import create_test_device
 
 
-@tag("fix_in_v3")
 class DeviceBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
     """
     Test devices bulk edit / delete operations.
@@ -92,6 +90,6 @@ class DeviceBulkUrlParamTestCase(SeleniumTestCase):
                 lambda d: d.find_element(By.ID, "select2-id_device_type-container")
                 .find_element(By.CLASS_NAME, "select2-selection__placeholder")
                 .text.strip()
-                == "None"
+                == "---------"
             )
         )

nautobot/dcim/tests/integration/test_fileinputpicker.py

@@ -1,7 +1,6 @@
-from django.test import tag
 from django.urls import reverse
 
-from nautobot.core.testing.integration import SeleniumTestCase, WebDriverWait
+from nautobot.core.testing.integration import SeleniumTestCase
 from nautobot.dcim.models import Location, LocationType
 from nautobot.extras.models import Job, Status
 
@@ -16,14 +15,14 @@ class ClearableFileInputTestCase(SeleniumTestCase):
         Ensure clearable input file type has working clear and info display.
         """
         self.browser.visit(f"{self.live_server_url}{uri_to_visit}")
-        WebDriverWait(self.browser, 10).until(lambda driver: driver.is_text_present(page_loaded_confirmation))
+        self.assertTrue(self.browser.is_text_present(page_loaded_confirmation, wait_time=10))
 
         # Find the first file input button and scroll to it
         front_image_button = self.browser.find_by_css("span.group-span-filestyle.input-group-btn").first
         front_image_button.scroll_to()
 
         # cancel button is NOT visible initially
-        self.assertFalse(self.browser.find_by_css("button.clear-button").first.visible)
+        self.assertTrue(self.browser.find_by_css("button.clear-button").first.is_not_visible(wait_time=5))
 
         # Test file text changes after selecting a file
         file_selection_indicator_css = "div.bootstrap-filestyle input[type='text'].form-control"
@@ -34,14 +33,13 @@ class ClearableFileInputTestCase(SeleniumTestCase):
 
         # clear button is now visible
         clear_button = self.browser.find_by_css("button.clear-button").first
-        self.assertTrue(clear_button.visible)
+        self.assertTrue(clear_button.is_visible(wait_time=5))
 
         # clicking clearbutton should hide the button, and wipe the file input value
         clear_button.click()
-        self.assertFalse(clear_button.visible)
+        self.assertTrue(clear_button.is_not_visible(wait_time=5))
         self.assertEqual(front_image_file_input.value, "")
 
-    @tag("fix_in_v3")
     def test_add_device_page(self):
         """
         Confirm device type add page input is working correctly.
@@ -52,7 +50,6 @@ class ClearableFileInputTestCase(SeleniumTestCase):
             file_input_selector_id="id_front_image",
         )
 
-    @tag("fix_in_v3")
     def test_job_runner_page(self):
         """
         Confirm job run page file input is working correctly.
@@ -65,7 +62,6 @@ class ClearableFileInputTestCase(SeleniumTestCase):
             file_input_selector_id="id_input_file",
         )
 
-    @tag("fix_in_v3")
     def test_location_image_attachment_view(self):
         """
         Confirm location image attachment page is working correctly.
@@ -80,6 +76,6 @@ class ClearableFileInputTestCase(SeleniumTestCase):
         )
         self._assert_file_picker(
             uri_to_visit=location_image_attach_uri,
-            page_loaded_confirmation="Image attachment",
+            page_loaded_confirmation="IMAGE ATTACHMENT",
             file_input_selector_id="id_image",
         )

nautobot/dcim/tests/integration/test_location_bulk_operations.py

@@ -1,5 +1,4 @@
 from django.contrib.contenttypes.models import ContentType
-from django.test import tag
 
 from nautobot.core.testing.integration import (
     BulkOperationsTestCases,
@@ -8,7 +7,6 @@ from nautobot.dcim.models import Device, Location, LocationType
 from nautobot.extras.models import Status
 
 
-@tag("fix_in_v3")
 class LocationBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
     """
     Test locations bulk edit / delete operations.

nautobot/dcim/tests/integration/test_module_bay_position.py

@@ -33,10 +33,9 @@ class ModuleBayPositionTestCase(SeleniumTestCase, ObjectsListMixin):
         self.assertEqual(position_field.value, "new pattern", "Position field value has unexpectedly changed")
 
         # Regenerate position
-        self.browser.execute_script(
-            "document.querySelector('button[title=\"Regenerate position\"]').scrollIntoView({ behavior: 'instant', block: 'start' })"
-        )
-        self.browser.find_by_css('button[title="Regenerate position"]').click()
+        regenerate_position_button = self.browser.find_by_css('button[title="Regenerate position"]')
+        self.scroll_element_into_view(element=regenerate_position_button)
+        regenerate_position_button.click()
         self.assertEqual(position_field.value, f"{name_pattern_value}v2", "Position field value is not re-populated")
 
     def test_create_device_type_module_bay(self):