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

nautobot/core/utils/module_loading.py

@@ -1,13 +1,30 @@
-from importlib.machinery import FileFinder, SOURCE_SUFFIXES, SourceFileLoader
-from importlib.util import module_from_spec
+from contextlib import contextmanager
+import importlib
+from importlib.util import find_spec, module_from_spec
 from keyword import iskeyword
 import logging
+import os
 import pkgutil
 import sys
 
 logger = logging.getLogger(__name__)
 
 
+@contextmanager
+def _temporarily_add_to_sys_path(path):
+    """
+    Allow loading of modules and packages from within the provided directory by temporarily modifying `sys.path`.
+
+    On exit, it restores the original `sys.path` value.
+    """
+    old_sys_path = sys.path.copy()
+    sys.path.insert(0, path)
+    try:
+        yield
+    finally:
+        sys.path = old_sys_path
+
+
 def clear_module_from_sys_modules(module_name):
     """
     Remove the module and all its submodules from sys.modules.
@@ -39,7 +56,7 @@ def check_name_safe_to_import_privately(name: str) -> tuple[bool, str]:
     return True, "a valid and non-conflicting module name"
 
 
-def import_modules_privately(path, module_path=None, module_prefix="", ignore_import_errors=True):
+def import_modules_privately(path, module_path=None, ignore_import_errors=True):
     """
     Import modules from the filesystem without adding the path permanently to `sys.path`.
 
@@ -55,71 +72,49 @@ def import_modules_privately(path, module_path=None, module_prefix="", ignore_im
         ignore_import_errors (bool): Exceptions raised while importing modules will be caught and logged.
             If this is set as False, they will then be re-raised to be handled by the caller of this function.
     """
-    loaded_modules = []
-    # We formerly used pkgutil.walk_packages() here to handle submodule loading with a multi-entry module_path,
-    # but that has the downside (and risk!) of automatically importing all packages that it finds in the given path,
-    # whether or not we actually want to do so. So instead, for the case where a module_path is provided, we need to
-    # iteratively import each submodule ourselves.
-    if module_path:
-        # Git repository case - e.g. import_modules_privately(settings.GIT_ROOT, module_path=[repository_slug, "jobs"])
-        # Here we want to ONLY auto-load the module sequence identified by module_path.
-        permitted, reason = check_name_safe_to_import_privately(module_path[0])
-        if not permitted:
-            logger.error("Unable to load module %r from %s as it is %s", module_path[0], path, reason)
-        else:
-            module = None
-            module_name = module_path.pop(0)
-            submodule_name = module_name
-            try:
-                while True:
-                    finder = FileFinder(path, (SourceFileLoader, SOURCE_SUFFIXES))
-                    finder.invalidate_caches()
-                    spec = finder.find_spec(module_name)
-                    if spec is None or spec.loader is None:
-                        logger.error("Unable to find module spec and/or loader for %r", submodule_name)
-                        break
-                    spec.name = submodule_name
-                    spec.loader.name = submodule_name
-                    submodule = module_from_spec(spec)
-                    sys.modules[submodule_name] = submodule
-                    spec.loader.exec_module(submodule)
-                    if module is not None:
-                        setattr(module, module_name, submodule)
-                    module = submodule
-                    loaded_modules.append(module)
-                    if module_path:
-                        submodule_name = f"{module_name}.{module_path[0]}"
-                        module_name = module_path.pop(0)
-                        path = module.__path__[0]
-                    else:
-                        break
-            except Exception as exc:
-                logger.error("Unable to load module %s from %s: %s", module_name, path, exc)
-                if not ignore_import_errors:
-                    raise
+    if module_path is None:
+        module_path = []
+        module_prefix = None
     else:
-        # JOBS_ROOT case - import ALL top-level modules/packages that we can find in the given path;
-        # they can implement and import submodules as desired by themselves, but we only autoimport top-level ones.
-        for finder, discovered_module_name, _ in pkgutil.iter_modules([path]):
-            permitted, reason = check_name_safe_to_import_privately(discovered_module_name)
-            if not permitted:
-                logger.error("Unable to load module %r from %s as it is %s", discovered_module_name, path, reason)
+        module_prefix = ".".join(module_path)
+    with _temporarily_add_to_sys_path(path):
+        for finder, discovered_module_name, is_package in pkgutil.walk_packages([path], onerror=logger.error):
+            if module_prefix and not (
+                module_prefix.startswith(f"{discovered_module_name}.")  # my_repo/__init__.py
+                or discovered_module_name == module_prefix  # my_repo/jobs.py
+                or discovered_module_name.startswith(f"{module_prefix}.")  # my_repo/jobs/foobar.py
+            ):
                 continue
-            module_name = discovered_module_name
-            if module_name in sys.modules:
-                clear_module_from_sys_modules(module_name)
-
             try:
-                spec = finder.find_spec(discovered_module_name)
-                if spec is None or spec.loader is None:
-                    logger.error("Unable to find module spec and/or loader for %r", discovered_module_name)
+                existing_module = find_spec(discovered_module_name)
+            except (ModuleNotFoundError, ValueError):
+                existing_module = None
+            if existing_module is not None:
+                existing_module_path = os.path.realpath(existing_module.origin)
+                if not existing_module_path.startswith(path):
+                    logger.error(
+                        "Unable to load module %s from %s as it conflicts with existing module %s",
+                        discovered_module_name,
+                        path,
+                        existing_module_path,
+                    )
                     continue
-                module = module_from_spec(spec)
-                sys.modules[module_name] = module
-                spec.loader.exec_module(module)
-                loaded_modules.append(module)
+
+            if discovered_module_name in sys.modules:
+                clear_module_from_sys_modules(discovered_module_name)
+
+            try:
+                if not is_package:
+                    spec = finder.find_spec(discovered_module_name)
+                    if spec is None:
+                        raise ValueError("Unable to find module spec")
+                    module = module_from_spec(spec)
+                    sys.modules[discovered_module_name] = module
+                    spec.loader.exec_module(module)
+                else:
+                    module = importlib.import_module(discovered_module_name)
+                importlib.reload(module)
             except Exception as exc:
                 logger.error("Unable to load module %s from %s: %s", discovered_module_name, path, exc)
                 if not ignore_import_errors:
                     raise
-    return loaded_modules

nautobot/dcim/filters/__init__.py

@@ -961,6 +961,12 @@ class DeviceFilterSet(
         field_name="controller_managed_device_group__wireless_networks",
         label="Has wireless networks",
     )
+    controller = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="controller_managed_device_group__controller",
+        queryset=Controller.objects.all(),
+        to_field_name="name",
+        label="Controller (name or ID)",
+    )
 
     def filter_ip_addresses(self, queryset, name, value):
         pk_values = set(item for item in value if is_uuid(item))

nautobot/dcim/filters/mixins.py

@@ -39,6 +39,7 @@ from nautobot.dcim.models import (
     RearPortTemplate,
 )
 from nautobot.extras.filters import CustomFieldModelFilterSetMixin
+from nautobot.extras.filters.mixins import RelationshipModelFilterSetMixin
 
 
 class CableTerminationModelFilterSetMixin(django_filters.FilterSet):
@@ -101,7 +102,7 @@ class DeviceComponentModelFilterSetMixin(CustomFieldModelFilterSetMixin):
     )
 
 
-class ModularDeviceComponentModelFilterSetMixin(DeviceComponentModelFilterSetMixin):
+class ModularDeviceComponentModelFilterSetMixin(DeviceComponentModelFilterSetMixin, RelationshipModelFilterSetMixin):
     module = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Module.objects.all(),
         to_field_name="module_type__model",

nautobot/dcim/models/devices.py

@@ -30,6 +30,7 @@ from nautobot.dcim.utils import get_all_network_driver_mappings, get_network_dri
 from nautobot.extras.models import ChangeLoggedModel, ConfigContextModel, RoleField, StatusField
 from nautobot.extras.querysets import ConfigContextModelQuerySet
 from nautobot.extras.utils import extras_features
+from nautobot.wireless.models import ControllerManagedDeviceGroupWirelessNetworkAssignment
 
 from .device_components import (
     ConsolePort,
@@ -1456,6 +1457,15 @@ class Controller(PrimaryModel):
             return format_html('<span class="text-muted">&mdash;</span>')
         return format_html_join(" ", '<span class="label label-default">{}</span>', ((v,) for v in self.capabilities))
 
+    @property
+    def wireless_network_assignments(self):
+        """
+        Returns all Controller Managed Device Group Wireless Network Assignment linked to this controller.
+        """
+        return ControllerManagedDeviceGroupWirelessNetworkAssignment.objects.filter(
+            controller_managed_device_group__controller=self
+        )
+
 
 @extras_features(
     "custom_links",

nautobot/dcim/tables/devices.py

@@ -181,6 +181,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     software_version = tables.Column(linkify=True, verbose_name="Software Version")
     secrets_group = tables.Column(linkify=True)
     capabilities = tables.Column(orderable=False, accessor="controller_managed_device_group.capabilities")
+    manufacturer = tables.Column(orderable=False, accessor="device_type.manufacturer")
     tags = TagColumn(url_name="dcim:device_list")
     actions = ButtonsColumn(Device)
 
@@ -213,6 +214,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "controller_managed_device_group",
             "secrets_group",
             "capabilities",
+            "manufacturer",
             "tags",
             "actions",
         )

nautobot/dcim/templates/dcim/controller/base.html

@@ -1,10 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_nav_tabs %}
-    {% if 'wireless' in object.capabilities %}
-        <li role="presentation" {% if active_tab == 'wireless-networks' %} class="active"{% endif %}>
-            <a href="{% url 'dcim:controller_wirelessnetworks' pk=object.pk %}">Wireless Networks</a>
-        </li>
-    {% endif %}
-{% endblock extra_nav_tabs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -1,83 +1,2 @@
-{% extends 'dcim/controller/base.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Controller</strong>
-                </div>
-                <div class="table-responsive">
-                    <table class="table table-hover panel-body attr-table">
-                        <tr>
-                            <td>Name</td>
-                            <td>{{ object.name|placeholder }}</td>
-                        </tr>
-                        <tr>
-                            <td>Status</td>
-                            <td>
-                                {{ object.status|hyperlinked_object_with_color }}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Role</td>
-                            <td>{{ object.role|hyperlinked_object_with_color }}</td>
-                        </tr>
-                        <tr>
-                            <td>Capabilities</td>
-                            <td>{{ object.get_capabilities_display }}</td>
-                        </tr>
-                        <tr>
-                            <td>Location</td>
-                            <td>{{ object.location|hyperlinked_object }}</td>
-                        </tr>
-                        <tr>
-                            <td>Platform</td>
-                            <td>{{ object.platform|hyperlinked_object }}</td>
-                        </tr>
-                        {% include 'inc/tenant_table_row.html' %}
-                        <tr>
-                            <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>
-                        {% 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_right_page %}
-
-{% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Managed Devices</strong>
-            </div>
-            {% include 'responsive_table.html' with table=devices_table %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=devices_table.paginator page=devices_table.page %}
-{% endblock content_full_width_page %}
+{% extends 'generic/object_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/controller_wirelessnetworks.html

@@ -1,25 +1,2 @@
-{% extends 'dcim/controller/base.html' %}
-{% load helpers %}
-
-{% block content %}
-<form method="post">
-    {% csrf_token %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Wireless Networks</strong>
-            <div class="pull-right noprint">
-                {% if request.user.is_authenticated %}
-                    {% table_config_button_small wireless_networks_table %}
-                {% endif %}
-            </div>
-        </div>
-        {% include 'responsive_table.html' with table=wireless_networks_table %}
-    </div>
-</form>
-{% table_config_form wireless_networks_table %}
-{% endblock content %}
-
-{% block javascript %}
-    {{ block.super }}
-    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
-{% endblock javascript %}
+{% extends 'generic/object_retrieve.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.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 %}
+{% extends 'dcim/virtualchassis_retrieve.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_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 %}