nautobot 2.2.0b1__py3-none-any.whl → 2.2.1__py3-none-any.whl

nautobot/dcim/tables/__init__.py

@@ -8,7 +8,7 @@ from .cables import CableTable
 from .devices import (
     ConsolePortTable,
     ConsoleServerPortTable,
-    ControllerDeviceGroupTable,
+    ControllerManagedDeviceGroupTable,
     ControllerTable,
     DeviceBayTable,
     DeviceConsolePortTable,
@@ -66,7 +66,7 @@ __all__ = (
     "ConsoleServerPortTable",
     "ConsoleServerPortTemplateTable",
     "ControllerTable",
-    "ControllerDeviceGroupTable",
+    "ControllerManagedDeviceGroupTable",
     "DeviceBayTable",
     "DeviceBayTemplateTable",
     "DeviceConsolePortTable",

nautobot/dcim/tables/devices.py

@@ -14,7 +14,7 @@ from nautobot.dcim.models import (
     ConsolePort,
     ConsoleServerPort,
     Controller,
-    ControllerDeviceGroup,
+    ControllerManagedDeviceGroup,
     Device,
     DeviceBay,
     DeviceRedundancyGroup,
@@ -60,7 +60,7 @@ __all__ = (
     "ConsolePortTable",
     "ConsoleServerPortTable",
     "ControllerTable",
-    "ControllerDeviceGroupTable",
+    "ControllerManagedDeviceGroupTable",
     "DeviceBayTable",
     "DeviceConsolePortTable",
     "DeviceConsoleServerPortTable",
@@ -164,7 +164,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     device_redundancy_group_priority = tables.TemplateColumn(
         template_code="""{% if record.device_redundancy_group %}<span class="badge badge-default">{{ record.device_redundancy_group_priority|default:'None' }}</span>{% else %}—{% endif %}"""
     )
-    controller_device_group = tables.Column(linkify=True)
+    controller_managed_device_group = tables.Column(linkify=True)
     secrets_group = tables.Column(linkify=True)
     tags = TagColumn(url_name="dcim:device_list")
 
@@ -193,7 +193,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "vc_priority",
             "device_redundancy_group",
             "device_redundancy_group_priority",
-            "controller_device_group",
+            "controller_managed_device_group",
             "secrets_group",
             "tags",
         )
@@ -919,7 +919,7 @@ class VirtualChassisTable(BaseTable):
     master = tables.Column(linkify=True)
     member_count = LinkedCountColumn(
         viewname="dcim:device_list",
-        url_params={"virtual_chassis_id": "pk"},
+        url_params={"virtual_chassis": "pk"},
         verbose_name="Members",
     )
     tags = TagColumn(url_name="dcim:virtualchassis_list")
@@ -1142,8 +1142,8 @@ class ControllerTable(BaseTable):
     role = tables.Column(linkify=True)
     tenant = TenantColumn()
     external_integration = tables.Column(linkify=True)
-    deployed_controller_device = tables.Column(linkify=True)
-    deployed_controller_group = tables.Column(linkify=True)
+    controller_device = tables.Column(linkify=True)
+    controller_device_redundancy_group = tables.Column(linkify=True)
     tags = TagColumn(url_name="dcim:controller_list")
     actions = ButtonsColumn(Controller)
 
@@ -1160,8 +1160,8 @@ class ControllerTable(BaseTable):
             "role",
             "tenant",
             "external_integration",
-            "deployed_controller_device",
-            "deployed_controller_group",
+            "controller_device",
+            "controller_device_redundancy_group",
             "tags",
             "actions",
         )
@@ -1173,28 +1173,25 @@ class ControllerTable(BaseTable):
             "platform",
             "role",
             "tenant",
-            "external_integration",
-            "deployed_controller_device",
-            "deployed_controller_group",
             "actions",
         )
 
 
-class ControllerDeviceGroupTable(BaseTable):
+class ControllerManagedDeviceGroupTable(BaseTable):
     """Table for list view."""
 
     pk = ToggleColumn()
     name = tables.TemplateColumn(template_code=TREE_LINK, attrs={"td": {"class": "text-nowrap"}})
     weight = tables.Column()
     controller = tables.Column(linkify=True)
-    tags = TagColumn(url_name="dcim:controllerdevicegroup_list")
-    actions = ButtonsColumn(ControllerDeviceGroup)
+    tags = TagColumn(url_name="dcim:controllermanageddevicegroup_list")
+    actions = ButtonsColumn(ControllerManagedDeviceGroup)
     device_count = tables.TemplateColumn(template_code=LINKED_RECORD_COUNT, verbose_name="Devices")
 
     class Meta(BaseTable.Meta):
         """Meta attributes."""
 
-        model = ControllerDeviceGroup
+        model = ControllerManagedDeviceGroup
         fields = (
             "pk",
             "name",

nautobot/dcim/tables/template_code.py

@@ -91,7 +91,7 @@ LINKED_RECORD_COUNT = """
 
 TREE_LINK = """
 {% load helpers %}
-{% tree_hierarchy_ui_representation record.tree_depth|as_range table.order_by %}
+{% tree_hierarchy_ui_representation record.tree_depth|as_range table.hide_hierarchy_ui %}
 <a href="{{ record.get_absolute_url }}">{{ record.name }}</a>
 """
 

nautobot/dcim/templates/dcim/controller_create.html

@@ -0,0 +1,70 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Controller</strong></div>
+        <div class="panel-body">
+            {% render_field form.name %}
+            {% render_field form.status %}
+            {% render_field form.role %}
+            {% render_field form.location %}
+            {% render_field form.platform %}
+            {% render_field form.description %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Integration</strong></div>
+        <div class="panel-body">
+        {% render_field form.external_integration %}
+        {% with controllerdevice_tab_active=form.initial.controller_device %}
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation"{% if controllerdevice_tab_active %} class="active"{% endif %}><a href="#controllerdevice" role="tab" data-toggle="tab">Controller Device</a></li>
+                <li role="presentation"{% if not controllerdevice_tab_active %} class="active"{% endif %}><a href="#controller_device_redundancy_group" role="tab" data-toggle="tab">Controller Device Redundancy Group</a></li>
+            </ul>
+            <div class="tab-content">
+                <div class="tab-pane{% if not controllerdevice_tab_active %} active{% endif %}" id="controller_device_redundancy_group">
+                    {% render_field form.controller_device_redundancy_group %}
+                </div>
+                <div class="tab-pane{% if controllerdevice_tab_active %} active{% endif %}" id="controllerdevice">
+                    {% render_field form.controller_device %}
+                </div>
+            </div>
+        {% 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/extras_features_edit_form_fields.html' %}
+{% endblock form %}
+
+{% block javascript %}
+<script type="text/javascript">
+    const controllerDevice = $('#id_controller_device');
+    const controllerDeviceRedundancyGroup = $('#id_controller_device_redundancy_group');
+
+    const controllerUpdated = function() {
+        if (controllerDevice.val()) {
+            controllerDeviceRedundancyGroup.val('');
+            controllerDeviceRedundancyGroup.trigger('change');
+        }
+    };
+
+    const controllerDeviceRedundancyGroupUpdated = function() {
+        if (controllerDeviceRedundancyGroup.val()) {
+            controllerDevice.val('');
+            controllerDevice.trigger('change');
+        }
+    };
+
+    controllerDevice.on('select2:select', controllerUpdated);
+    controllerDevice.on('select2:unselect', controllerUpdated);
+    controllerDeviceRedundancyGroup.on('select2:select', controllerDeviceRedundancyGroupUpdated);
+    controllerDeviceRedundancyGroup.on('select2:unselect', controllerDeviceRedundancyGroupUpdated);
+</script>
+{% endblock %}

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -22,10 +22,6 @@
                             <td>Role</td>
                             <td>{{ object.role|hyperlinked_object }}</td>
                         </tr>
-                        <tr>
-                            <td>Description</td>
-                            <td>{{ object.description|placeholder }}</td>
-                        </tr>
                         <tr>
                             <td>Location</td>
                             <td>{{ object.location|hyperlinked_object }}</td>
@@ -35,34 +31,55 @@
                             <td>{{ object.platform|hyperlinked_object }}</td>
                         </tr>
                         <tr>
-                            <td>Role</td>
-                            <td>{{ object.role|hyperlinked_object }}</td>
+                            <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>
                         <tr>
-                            <td>Tenant</td>
-                            <td>{{ object.tenant|hyperlinked_object }}</td>
+                            <td>Description</td>
+                            <td>{{ object.description|placeholder }}</td>
                         </tr>
+                    </table>
+                </div>
+            </div>
+{% endblock content_left_page %}
+
+{% block content_right_page %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Integration</strong>
+                </div>
+                <div class="table-responsive">
+                    <table class="table table-hover panel-body attr-table">
                         <tr>
                             <td>External Integration</td>
                             <td>{{ object.external_integration|hyperlinked_object }}</td>
                         </tr>
-                        <tr>
-                            <td>Deployed Controller Device</td>
-                            <td>{{ object.deployed_controller_device|hyperlinked_object }}</td>
-                        </tr>
-                        <tr>
-                            <td>Deployed Controller Group</td>
-                            <td>{{ object.deployed_controller_group|hyperlinked_object }}</td>
-                        </tr>
+                        {% if object.controller_device %}
+                            <tr>
+                                <td>Controller Device</td>
+                                <td>{{ object.controller_device|hyperlinked_object }}</td>
+                            </tr>
+                        {% endif %}
+                        {% if object.controller_device_redundancy_group %}
+                            <tr>
+                                <td>Controller Device Redundancy Group</td>
+                                <td>{{ object.controller_device_redundancy_group|hyperlinked_object }}</td>
+                            </tr>
+                        {% endif %}
                     </table>
                 </div>
             </div>
-{% endblock content_left_page %}
+{% endblock content_right_page %}
 
 {% block content_full_width_page %}
         <div class="panel panel-default">
             <div class="panel-heading">
-                <strong>Devices</strong>
+                <strong>Managed Devices</strong>
             </div>
             {% include 'responsive_table.html' with table=devices_table %}
         </div>

nautobot/dcim/templates/dcim/controllermanageddevicegroup_create.html

@@ -0,0 +1,88 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+{% load helpers %}
+{% load static %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Controller</strong></div>
+        <div class="panel-body">
+            {% render_field form.controller.as_hidden %}
+            {% render_field form.controller %}
+            {% render_field form.name %}
+            {% render_field form.devices %}
+            {% render_field form.parent %}
+            {% render_field form.weight %}
+        </div>
+    </div>
+    {% include 'inc/extras_features_edit_form_fields.html' %}
+{% endblock form %}
+
+{% block javascript %}
+<script type="text/javascript">
+    const controllerUrl = '{% url 'dcim-api:controller-list' %}';
+    const controllerGroupUrl = '{% url 'dcim-api:controllermanageddevicegroup-list' %}';
+
+    const parentInput = $('select#id_parent');
+    const controllerInput = $('select#id_controller');
+    const hiddenControllerInput = $('input#id_controller');
+
+    const request = (url, calback) => {
+        $.ajax({
+            url,
+            method: "GET",
+            success: calback,
+            error: (error) => {
+                const message = `Error in request. URL: ${url}`;
+                console.error(message, error);
+                alert(message);
+            },
+        });
+    };
+
+    const setController = (uid) => {
+        console.log('Set controller:', uid);
+        if (controllerInput.find(`option[value=${uid}]`).length) {
+            controllerInput.val(uid);
+            hiddenControllerInput.val(uid);
+        } else {
+            request(`${controllerUrl}${uid}/`, (data) => {
+                console.log('Controller data:', data);
+                controllerInput.append(new Option(data.name, uid));
+                setController(uid);
+            });
+        }
+    };
+
+    const updateControllerFromParent = (parentUid) => {
+        request(
+            `${controllerGroupUrl}${parentUid}/`,
+            (data) => data.controller && setController(data.controller.id),
+        );
+    };
+
+    const onParentInput = (event) => {
+        const parentUid = parentInput.val();
+        if (parentUid) {
+            controllerInput.prop("disabled", true);
+            if (event) {
+                updateControllerFromParent(parentUid);
+            }
+        } else {
+            controllerInput.prop("disabled", false);
+        }
+    };
+
+    const onControllerInput = () => {
+        hiddenControllerInput.val(controllerInput.val());
+    };
+
+    parentInput.on('select2:select', onParentInput);
+    parentInput.on('select2:unselect', onParentInput);
+
+    controllerInput.on('select2:select', onControllerInput);
+    controllerInput.on('select2:unselect', onControllerInput);
+
+    onParentInput();
+</script>
+{% endblock %}

nautobot/dcim/templates/dcim/device/lldp_neighbors.html

@@ -15,6 +15,7 @@
                     <th>Interface</th>
                     <th>Configured Device</th>
                     <th>Configured Interface</th>
+                    <th>Configured MAC Address</th>
                     <th>LLDP Device</th>
                     <th>LLDP Interface</th>
                 </tr>
@@ -27,18 +28,21 @@
                             <td class="configured_device" data="{{ iface.connected_endpoint.device }}" data-chassis="{{ iface.connected_endpoint.device.virtual_chassis.name }}">
                                 {{ iface.connected_endpoint.device|hyperlinked_object }}
                             </td>
-                            <td class="configured_interface" data="{{ iface.connected_endpoint }}">
+                            <td class="configured_interface" data-interface-name="{{ iface.connected_endpoint }}">
                                 <span title="{{ iface.connected_endpoint.get_type_display }}">{{ iface.connected_endpoint }}</span>
                             </td>
+                            <td class="configured_mac" data-mac-address="{{ iface.connected_endpoint.mac_address }}">
+                                <span>{{ iface.connected_endpoint.mac_address }}</span>
+                            </td>
                         {% elif iface.connected_endpoint.circuit %}
                             {% with circuit=iface.connected_endpoint.circuit %}
-                                <td colspan="2">
+                                <td colspan="3">
                                     <i class="mdi mdi-lightning-bolt" title="Circuit"></i>
                                     <a href="{{ circuit.get_absolute_url }}">{{ circuit.provider }} {{ circuit }}</a>
                                 </td>
                             {% endwith %}
                         {% else %}
-                            <td colspan="2">None</td>
+                            <td colspan="3">None</td>
                         {% endif %}
                         <td class="device"></td>
                         <td class="interface"></td>
@@ -52,51 +56,79 @@
 {% block javascript %}
 {{ block.super }}
 <script type="text/javascript">
-$(document).ready(function() {
-    $.ajax({
-        url: "{% url 'dcim-api:device-napalm' pk=object.pk %}?method=get_lldp_neighbors_detail",
-        dataType: 'json',
-        success: function(json) {
-            $.each(json['get_lldp_neighbors_detail'], function(iface, neighbors) {
-                var neighbor = neighbors[0];
-                var row = $('*[data-interface-name="' + iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
+var ready = (callback) => {
+    if (document.readyState != "loading") {
+        callback();
+    } else {
+        document.addEventListener("DOMContentLoaded", callback);
+    }
+};
+
+function getAttribute(node, querySelector, attribute) {
+    if (node === null or node.querySelector(querySelector) === null) {
+        return "";
+    }
+    return node.querySelector(querySelector).getAttribute(attribute) || "";
+}
+
+ready(() => {
+    fetch("{% url 'dcim-api:device-napalm' pk=object.pk %}?method=get_lldp_neighbors_detail")
+    .then((response) => {
+        if (!response.ok) {
+            throw Error(response.statusText);
+        }
+        return response.json();
+    })
+    .then((data) => {
+        const interfaces = data["get_lldp_neighbors_detail"];
+        for (var iface of Object.keys(interfaces)) {
+            const neighbor = interfaces[iface][0];
+            const row = document.querySelector('*[data-interface-name="'+ iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
+            // var row = $('*[data-interface-name="' + iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
 
-                // Glean configured hostnames/interfaces from the DOM
-                var configured_device = row.children('td.configured_device').attr('data');
-                var configured_chassis = row.children('td.configured_device').attr('data-chassis');
-                var configured_interface = row.children('td.configured_interface').attr('data');
-                var configured_interface_short = null;
-                if (configured_interface) {
-                    // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
-                    configured_interface_short = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
-                }
+            // Glean configured hostnames/interfaces from the DOM
+            const configured_device = getAttribute(row, 'td.configured_device', 'data');
+            const configured_chassis = getAttribute(row, 'td.configured_device', 'data-chassis');
+            const configured_interface = getAttribute(row, 'td.configured_interface', 'data-interface-name').toLowerCase();
+            const configured_mac_address = getAttribute(row, 'td.configured_mac', 'data-mac-address').toLowerCase();
+            let configured_interface_short = null;
+            if (configured_interface) {
+                // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
+                configured_interface_short = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
+            }
 
-                // Clean up hostnames/interfaces learned via LLDP
-                var neighbor_host = neighbor['remote_system_name'] || ""; // sanitize hostname if it's null to avoid breaking the split func
-                var neighbor_port = neighbor['remote_port'] || ""; // sanitize port if it's null to avoid breaking the split func
-                var lldp_device = neighbor_host.split(".")[0];  // Strip off any trailing domain name
-                var lldp_interface = neighbor_port.split(".")[0];   // Strip off any trailing subinterface ID
+            // Clean up hostnames/interfaces learned via LLDP
+            const neighbor_host = neighbor['remote_system_name'] || ""; // sanitize hostname if it's null to avoid breaking the split func
+            const neighbor_port = neighbor['remote_port'] || ""; // sanitize port if it's null to avoid breaking the split func
+            const lldp_device = neighbor_host.split(".")[0];  // Strip off any trailing domain name
+            const lldp_interface = neighbor_port.split(".")[0].toLowerCase();   // Strip off any trailing subinterface ID
 
-                // Add LLDP neighbors to table
-                row.children('td.device').html(lldp_device);
-                row.children('td.interface').html(lldp_interface);
+            // Add LLDP neighbors to table
+            row.querySelector('td.device').textContent = lldp_device;
+            row.querySelector('td.interface').textContent = lldp_interface;
 
-                // Apply colors to rows
-                if (!configured_device && lldp_device) {
-                    row.addClass('info');
-                } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface == lldp_interface) {
-                    row.addClass('success');
-                } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface_short == lldp_interface) {
-                    row.addClass('success');
-                } else {
-                    row.addClass('danger');
-                }
-            });
-        },
-        error: function(xhr) {
-            alert(xhr.responseText);
+            // Apply colors to rows
+            if (!configured_device && lldp_device) {
+                row.classList.add('info');
+            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface == lldp_interface) {
+                row.classList.add('success');
+            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface_short == lldp_interface) {
+                row.classList.add('success');
+            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_mac_address == lldp_interface) {
+                row.classList.add('success');
+            } else {
+                row.classList.add('danger');
+            }
+        }
+    })
+    .catch((error) => {
+        if (error.responseText) {
+            alert(error.responseText);
+        } else {
+            throw error;
         }
     });
 });
+
 </script>
-{% endblock %}
+{% endblock %}

nautobot/dcim/templates/dcim/device.html

@@ -206,11 +206,19 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td>Controller Device Group</td>
+                                        <td>Controller Managed Device Group</td>
                                         <td>
-                                            {{ object.controller_device_group|hyperlinked_object }}
+                                            {{ object.controller_managed_device_group|hyperlinked_object }}
                                         </td>
                                     </tr>
+                                    {% if object.controller_managed_device_group %}
+                                        <tr>
+                                            <td>Managed by Controller</td>
+                                            <td>
+                                                {{ object.controller_managed_device_group.controller|hyperlinked_object }}
+                                            </td>
+                                        </tr>
+                                    {% endif %}
                                     {% if object.cluster %}
                                         <tr>
                                             <td>Cluster</td>
@@ -352,7 +360,7 @@
         </div>
     </div>
   </div>
-{% if is_contact_associatable_model %}
+{% if object.is_contact_associable_model %}
     <div id="contacts" role="tabpanel" class="tab-pane {% if request.GET.tab == 'contacts' %}active{% else %}fade{% endif %}">
         <div class="row">
             <div class="col-md-12">

nautobot/dcim/templates/dcim/device_edit.html

@@ -90,7 +90,7 @@
             {% render_field form.secrets_group %}
             {% render_field form.device_redundancy_group %}
             {% render_field form.device_redundancy_group_priority %}
-            {% render_field form.controller_device_group %}
+            {% render_field form.controller_managed_device_group %}
         </div>
     </div>
     <div class="panel panel-default">

nautobot/dcim/templates/dcim/devicefamily_retrieve.html

@@ -18,6 +18,10 @@
                     <td>Device Types</td>
                     <td><a href="{% url 'dcim:devicetype_list' %}?device_family={{ object.name }}">{{ object.device_type_count }}</a></td>
                 </tr>
+                <tr>
+                    <td>Total Devices</td>
+                    <td>{{ total_devices }}</td>
+                </tr>
             </table>
         </div>
 {% endblock %}

nautobot/dcim/templates/dcim/softwareimagefile_retrieve.html

@@ -169,7 +169,7 @@
                 </div>
             </div>
         </div>
-        {% if is_contact_associatable_model %}
+        {% if object.is_contact_associable_model %}
             <div id="contacts" role="tabpanel" class="tab-pane {% if request.GET.tab == 'contacts' %}active{% else %}fade{% endif %}">
                 <div class="row">
                     <div class="col-md-12">