nautobot 2.4.0b1__py3-none-any.whl → 2.4.2__py3-none-any.whl

nautobot/dcim/tables/__init__.py

@@ -145,7 +145,7 @@ class ConsoleConnectionTable(BaseTable):
         linkify=True,
         verbose_name="Port",
     )
-    device = tables.Column(linkify=True, accessor="parent")
+    device = tables.Column(linkify=True, accessor="parent", orderable=False)
     name = tables.Column(linkify=True, verbose_name="Console Port")
     reachable = BooleanColumn(accessor=Accessor("_path__is_active"), verbose_name="Reachable")
 
@@ -173,7 +173,7 @@ class PowerConnectionTable(BaseTable):
         linkify=True,
         verbose_name="Outlet",
     )
-    device = tables.Column(linkify=True, accessor="parent")
+    device = tables.Column(linkify=True, accessor="parent", orderable=False)
     name = tables.Column(linkify=True, verbose_name="Power Port")
     reachable = BooleanColumn(accessor=Accessor("_path__is_active"), verbose_name="Reachable")
 
@@ -183,7 +183,7 @@ class PowerConnectionTable(BaseTable):
 
 
 class InterfaceConnectionTable(BaseTable):
-    device_a = tables.Column(accessor=Accessor("parent"), linkify=True, verbose_name="Device A")
+    device_a = tables.Column(accessor=Accessor("parent"), linkify=True, verbose_name="Device A", orderable=False)
     interface_a = tables.Column(accessor=Accessor("name"), linkify=True, verbose_name="Interface A")
     device_b = tables.Column(
         accessor=Accessor("_path__destination__parent"),

nautobot/dcim/tables/devices.py

@@ -64,8 +64,8 @@ from .template_code import (
 __all__ = (
     "ConsolePortTable",
     "ConsoleServerPortTable",
-    "ControllerTable",
     "ControllerManagedDeviceGroupTable",
+    "ControllerTable",
     "DeviceBayTable",
     "DeviceDeviceBayTable",
     "DeviceImportTable",
@@ -75,19 +75,19 @@ __all__ = (
     "DeviceModuleConsoleServerPortTable",
     "DeviceModuleFrontPortTable",
     "DeviceModuleInterfaceTable",
-    "DeviceModulePowerPortTable",
     "DeviceModulePowerOutletTable",
+    "DeviceModulePowerPortTable",
     "DeviceModuleRearPortTable",
     "DeviceRedundancyGroupTable",
     "DeviceTable",
     "FrontPortTable",
-    "InterfaceTable",
-    "InterfaceRedundancyGroupTable",
     "InterfaceRedundancyGroupAssociationTable",
+    "InterfaceRedundancyGroupTable",
+    "InterfaceTable",
     "InventoryItemTable",
-    "ModuleTable",
     "ModuleBayTable",
     "ModuleModuleBayTable",
+    "ModuleTable",
     "PlatformTable",
     "PowerOutletTable",
     "PowerPortTable",
@@ -106,7 +106,8 @@ __all__ = (
 
 class PlatformTable(BaseTable):
     pk = ToggleColumn()
-    name = tables.LinkColumn()
+    name = tables.Column(linkify=True)
+    manufacturer = tables.Column(linkify=True)
     device_count = LinkedCountColumn(
         viewname="dcim:device_list",
         url_params={"platform": "pk"},
@@ -1409,6 +1410,7 @@ class ControllerManagedDeviceGroupTable(BaseTable):
     name = tables.TemplateColumn(template_code=TREE_LINK, attrs={"td": {"class": "text-nowrap"}})
     weight = tables.Column()
     controller = tables.Column(linkify=True)
+    tenant = TenantColumn()
     capabilities = tables.Column()
     tags = TagColumn(url_name="dcim:controllermanageddevicegroup_list")
     actions = ButtonsColumn(ControllerManagedDeviceGroup)
@@ -1440,6 +1442,7 @@ class ControllerManagedDeviceGroupTable(BaseTable):
             "wireless_networks_count",
             "controller",
             "weight",
+            "tenant",
             "capabilities",
             "tags",
             "actions",

nautobot/dcim/tables/devicetypes.py

@@ -253,7 +253,7 @@ class PowerOutletTemplateTable(ComponentTemplateTable):
             "name",
             "label",
             "type",
-            "power_port",
+            "power_port_template",
             "feed_leg",
             "description",
             "actions",
@@ -290,7 +290,7 @@ class FrontPortTemplateTable(ComponentTemplateTable):
             "name",
             "label",
             "type",
-            "rear_port",
+            "rear_port_template",
             "rear_port_position",
             "description",
             "actions",

nautobot/dcim/tables/racks.py

@@ -15,10 +15,10 @@ from nautobot.tenancy.tables import TenantColumn
 from .template_code import RACKGROUP_ELEVATIONS, TREE_LINK, UTILIZATION_GRAPH
 
 __all__ = (
-    "RackTable",
     "RackDetailTable",
     "RackGroupTable",
     "RackReservationTable",
+    "RackTable",
 )
 
 

nautobot/dcim/templates/dcim/cable.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/controller_create.html

@@ -34,13 +34,7 @@
         {% endwith %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock form %}
 

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -34,15 +34,7 @@
                             <td>Platform</td>
                             <td>{{ object.platform|hyperlinked_object }}</td>
                         </tr>
-                        <tr>
-                            <td>Tenant</td>
-                            <td>
-                                {% if object.tenant and object.tenant.tenant_group %}
-                                    {{ object.tenant.tenant_group|hyperlinked_object }} /
-                                {% endif %}
-                                {{ object.tenant|hyperlinked_object }}
-                            </td>
-                        </tr>
+                        {% include 'inc/tenant_table_row.html' %}
                         <tr>
                             <td>Description</td>
                             <td>{{ object.description|placeholder }}</td>

nautobot/dcim/templates/dcim/controllermanageddevicegroup_create.html

@@ -15,6 +15,7 @@
             {% render_field form.capabilities %}
             {% render_field form.weight %}
             {% render_field form.radio_profiles %}
+            {% render_field form.description %}
         </div>
     </div>
     <div class="panel panel-default">
@@ -69,6 +70,7 @@
             </table>
         </div>
     </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock form %}
 

nautobot/dcim/templates/dcim/controllermanageddevicegroup_retrieve.html

@@ -70,6 +70,11 @@
                             <td>Weight</td>
                             <td>{{ object.weight }}</td>
                         </tr>
+                        {% include 'inc/tenant_table_row.html' %}
+                        <tr>
+                            <td>Description</td>
+                            <td>{{ object.description|placeholder }}</td>
+                        </tr>
                     </table>
                 </div>
             </div>

nautobot/dcim/templates/dcim/device/base.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 

nautobot/dcim/templates/dcim/device.html

@@ -51,15 +51,7 @@
                                             {% endif %}
                                         </td>
                                     </tr>
-                                    <tr>
-                                        <td>Tenant</td>
-                                        <td>
-                                            {% if object.tenant and object.tenant.tenant_group %}
-                                                {{ object.tenant.tenant_group|hyperlinked_object }} /
-                                            {% endif %}
-                                            {{ object.tenant|hyperlinked_object }}
-                                        </td>
-                                    </tr>
+                                    {% include 'inc/tenant_table_row.html' %}
                                     <tr>
                                         <td>Device Family</td>
                                         <td>{{ object.device_type.device_family|hyperlinked_object }}</td>
@@ -222,8 +214,8 @@
                                         <tr>
                                             <td>Cluster</td>
                                             <td>
-                                                {% if object.cluster.group %}
-                                                    {{ object.cluster.group|hyperlinked_object }} /
+                                                {% if object.cluster.cluster_group %}
+                                                    {{ object.cluster.cluster_group|hyperlinked_object }} /
                                                 {% endif %}
                                                 {{ object.cluster|hyperlinked_object }}
                                             </td>

nautobot/dcim/templates/dcim/device_component.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block breadcrumbs %}

nautobot/dcim/templates/dcim/device_edit.html

@@ -9,34 +9,8 @@
         <div class="panel-body">
             {% render_field form.name %}
             {% render_field form.role %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Hardware</strong></div>
-        <div class="panel-body">
-            {% render_field form.manufacturer %}
-            {% render_field form.device_type %}
-            {% render_field form.serial %}
-            {% render_field form.asset_tag %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Software</strong></div>
-        <div class="panel-body">
-            {% render_field form.platform %}
-            {% render_field form.software_version %}
-            <div class="form-group" id="software_version_image_container" style="display:none">
-                <div class="col-md-3"></div>
-                <div class="col-md-9">
-                    <span class="help-block">
-                        <span id="software_version_image_description"><img src="{% static 'img/ajax-loader.gif' %}"></span>
-                        <ul id="software_version_image_list">
-                            <li> Software images for the selected software version will appear here </li>
-                        </ul>
-                    </span>
-                </div>
-            </div>
-            {% render_field form.software_image_files %}
+            {% render_field form.status %}
+            {% render_field form.secrets_group %}
         </div>
     </div>
     <div class="panel panel-default">
@@ -73,6 +47,34 @@
             {% endif %}
         </div>
     </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Hardware</strong></div>
+        <div class="panel-body">
+            {% render_field form.manufacturer %}
+            {% render_field form.device_type %}
+            {% render_field form.serial %}
+            {% render_field form.asset_tag %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Software</strong></div>
+        <div class="panel-body">
+            {% render_field form.platform %}
+            {% render_field form.software_version %}
+            <div class="form-group" id="software_version_image_container" style="display:none">
+                <div class="col-md-3"></div>
+                <div class="col-md-9">
+                    <span class="help-block">
+                        <span id="software_version_image_description"><img src="{% static 'img/ajax-loader.gif' %}"></span>
+                        <ul id="software_version_image_list">
+                            <li> Software images for the selected software version will appear here </li>
+                        </ul>
+                    </span>
+                </div>
+            </div>
+            {% render_field form.software_image_files %}
+        </div>
+    </div>
     <div class="panel panel-default">
         <div class="panel-heading"><strong>VRF Assignment</strong></div>
         <div class="panel-body">
@@ -82,12 +84,15 @@
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Management</strong></div>
         <div class="panel-body">
-            {% render_field form.status %}
             {% if editing %}
                 {% render_field form.primary_ip4 %}
                 {% render_field form.primary_ip6 %}
             {% endif %}
-            {% render_field form.secrets_group %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Topology</strong></div>
+        <div class="panel-body">
             {% render_field form.device_redundancy_group %}
             {% render_field form.device_redundancy_group_priority %}
             {% render_field form.controller_managed_device_group %}
@@ -100,13 +105,7 @@
             {% render_field form.cluster %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Local Config Context Data</strong></div>

nautobot/dcim/templates/dcim/devicetype.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load helpers %}
 {% load plugins %}

nautobot/dcim/templates/dcim/location.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load plugins %}
 {% load helpers %}
@@ -32,15 +32,7 @@
                     {% include 'dcim/inc/location_hierarchy.html' with location=object %}
                 </td>
             </tr>
-            <tr>
-                <td>Tenant</td>
-                <td>
-                    {% if object.tenant and object.tenant.tenant_group %}
-                        {{ object.tenant.tenant_group|hyperlinked_object }} /
-                    {% endif %}
-                    {{ object.tenant|hyperlinked_object }}
-                </td>
-            </tr>
+            {% include 'inc/tenant_table_row.html' %}
             <tr>
                 <td>Facility</td>
                 <td>{{ object.facility|placeholder }}</td>

nautobot/dcim/templates/dcim/location_edit.html

@@ -15,13 +15,7 @@
             {% render_field form.description %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Contact Info</strong></div>
         <div class="panel-body">

nautobot/dcim/templates/dcim/locationtype.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/locationtype_retrieve.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/manufacturer.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/platform.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/powerfeed.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/powerpanel.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/rack.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 
@@ -57,15 +57,7 @@
                     <td>Facility ID</td>
                     <td>{{ object.facility_id|placeholder }}</td>
                 </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>
-                        {% if object.tenant and object.tenant.tenant_group %}
-                            {{ object.tenant.tenant_group|hyperlinked_object }} /
-                        {% endif %}
-                        {{ object.tenant|hyperlinked_object }}
-                    </td>
-                </tr>
+                {% include 'inc/tenant_table_row.html' %}
                 <tr>
                     <td>Status</td>
                     <td>

nautobot/dcim/templates/dcim/rack_edit.html

@@ -15,13 +15,7 @@
             {% render_field form.asset_tag %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Dimensions</strong></div>
         <div class="panel-body">

nautobot/dcim/templates/dcim/rackgroup.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load helpers %}
 

nautobot/dcim/templates/dcim/rackreservation.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 
@@ -15,7 +15,7 @@
                 {% with rack=object.rack %}
                     <tr>
                         <td>Location</td>
-                        <td>{% include 'dcim/inc/location_hierarchy.html' with location=object.location %}</td>
+                        <td>{% include 'dcim/inc/location_hierarchy.html' with location=rack.location %}</td>
                     </tr>
                     <tr>
                         <td>Group</td>
@@ -43,15 +43,7 @@
                     <td>Units</td>
                     <td>{{ object.unit_list }}</td>
                 </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>
-                        {% if object.tenant and object.tenant.tenant_group %}
-                            {{ object.tenant.tenant_group|hyperlinked_object }} /
-                        {% endif %}
-                        {{ object.tenant|hyperlinked_object }}
-                    </td>
-                </tr>
+                {% include 'inc/tenant_table_row.html' %}
                 <tr>
                     <td>User</td>
                     <td>{{ object.user }}</td>

nautobot/dcim/templates/dcim/virtualchassis.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/virtualdevicecontext_retrieve.html

@@ -54,15 +54,7 @@
                     {{ object.primary_ip6|hyperlinked_object }}
                 </td>
             </tr>
-            <tr>
-                <td>Tenant</td>
-                <td>
-                    {% if object.tenant and object.tenant.tenant_group %}
-                        {{ object.tenant.tenant_group|hyperlinked_object }} /
-                    {% endif %}
-                    {{ object.tenant|hyperlinked_object }}
-                </td>
-            </tr>
+            {% include 'inc/tenant_table_row.html' %}
             <tr>
                 <td>Description</td>
                 <td>{{ object.description|placeholder }}</td>

nautobot/dcim/templates/dcim/virtualdevicecontext_update.html

@@ -23,12 +23,6 @@
             {% endif %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/dcim/tests/integration/test_controller.py

@@ -0,0 +1,62 @@
+from django.urls import reverse
+
+from nautobot.core.testing.integration import SeleniumTestCase
+from nautobot.extras.models import JobResult
+
+
+class ControllerTestCase(SeleniumTestCase):
+    """
+    Perform set of Controller tests using Selenium.
+    """
+
+    def test_controller_bulk_edit(self):
+        """
+        This test goes through the process of creating a Controller and performing bulk edit.
+        """
+        self.user.is_superuser = True
+        self.user.save()
+        self.login(self.user.username, self.password)
+
+        # Create LocationType
+        self.click_navbar_entry("Organization", "Location Types")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:locationtype_add"))
+        self.fill_select2_multiselect_field("content_types", "dcim | controller")
+        self.browser.fill("name", "Test Location Type 1")
+        self.click_edit_form_create_button()
+
+        # Create Location
+        self.click_navbar_entry("Organization", "Locations")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_list"))
+        self.click_list_view_add_button()
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:location_add"))
+        self.fill_select2_field("location_type", "Test Location Type 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.browser.fill("name", "Test Location 1")
+        self.click_edit_form_create_button()
+
+        # 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"))
+        self.browser.fill("name", "Test Controller Integration Test 1")
+        self.fill_select2_field("location", "Test Location 1")
+        self.fill_select2_field("status", "")  # pick first status
+        self.click_edit_form_create_button()
+
+        # Test bulk edit
+        self.click_navbar_entry("Devices", "Controllers")
+        self.assertEqual(self.browser.url, self.live_server_url + reverse("dcim:controller_list"))
+        self.browser.find_by_xpath("//input[@name='pk']").click()
+        bulk_edit_url = reverse("dcim:controller_bulk_edit")
+        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()
+
+        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"
+        )