nautobot 2.4.21__py3-none-any.whl → 2.4.22__py3-none-any.whl

nautobot/dcim/views.py

@@ -485,25 +485,31 @@ class LocationUIViewSet(NautobotUIViewSet):
     )
 
     def get_extra_context(self, request, instance):
-        if instance is None:
-            return super().get_extra_context(request, instance)
+        context = super().get_extra_context(request, instance)
 
-        # This query can get really expensive when there are big location trees in the DB. By casting it to a list we
-        # ensure it is only performed once rather than as a subquery for each of the different count stats.
-        related_locations = list(
-            instance.descendants(include_self=True).restrict(request.user, "view").values_list("pk", flat=True)
-        )
+        if self.action == "retrieve":
+            # This query can get really expensive when there are big location trees in the DB. By casting it to a list we
+            # ensure it is only performed once rather than as a subquery for each of the different count stats.
+            related_locations = list(
+                instance.descendants(include_self=True).restrict(request.user, "view").values_list("pk", flat=True)
+            )
 
-        rack_groups = (
-            RackGroup.objects.annotate(rack_count=count_related(Rack, "rack_group"))
-            .restrict(request.user, "view")
-            .filter(location__in=related_locations)
-        )
+            rack_groups = (
+                RackGroup.objects.annotate(rack_count=count_related(Rack, "rack_group"))
+                .restrict(request.user, "view")
+                .filter(location__in=related_locations)
+            )
 
-        return {
-            "rack_groups": rack_groups,
-            "rack_count": Rack.objects.restrict(request.user, "view").filter(location__in=related_locations).count(),
-        }
+            context.update(
+                {
+                    "rack_groups": rack_groups,
+                    "rack_count": Rack.objects.restrict(request.user, "view")
+                    .filter(location__in=related_locations)
+                    .count(),
+                }
+            )
+
+        return context
 
 
 class MigrateLocationDataToContactView(generic.ObjectEditView):
@@ -1480,65 +1486,68 @@ class ModuleTypeUIViewSet(
         return super().get_required_permission()
 
     def get_extra_context(self, request, instance):
-        if not instance:
-            return {}
+        context = super().get_extra_context(request, instance)
+        if self.action == "retrieve":
+            instance_count = Module.objects.restrict(request.user).filter(module_type=instance).count()
 
-        instance_count = Module.objects.restrict(request.user).filter(module_type=instance).count()
+            # Component tables
+            consoleport_table = tables.ConsolePortTemplateTable(
+                ConsolePortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
+                orderable=False,
+            )
+            consoleserverport_table = tables.ConsoleServerPortTemplateTable(
+                ConsoleServerPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
+                orderable=False,
+            )
+            powerport_table = tables.PowerPortTemplateTable(
+                PowerPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
+                orderable=False,
+            )
+            poweroutlet_table = tables.PowerOutletTemplateTable(
+                PowerOutletTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
+                orderable=False,
+            )
+            interface_table = tables.InterfaceTemplateTable(
+                list(InterfaceTemplate.objects.restrict(request.user, "view").filter(module_type=instance)),
+                orderable=False,
+            )
+            front_port_table = tables.FrontPortTemplateTable(
+                FrontPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
+                orderable=False,
+            )
+            rear_port_table = tables.RearPortTemplateTable(
+                RearPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
+                orderable=False,
+            )
+            modulebay_table = tables.ModuleBayTemplateTable(
+                ModuleBayTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
+                orderable=False,
+            )
+            if request.user.has_perm("dcim.change_moduletype"):
+                consoleport_table.columns.show("pk")
+                consoleserverport_table.columns.show("pk")
+                powerport_table.columns.show("pk")
+                poweroutlet_table.columns.show("pk")
+                interface_table.columns.show("pk")
+                front_port_table.columns.show("pk")
+                rear_port_table.columns.show("pk")
+                modulebay_table.columns.show("pk")
 
-        # Component tables
-        consoleport_table = tables.ConsolePortTemplateTable(
-            ConsolePortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
-            orderable=False,
-        )
-        consoleserverport_table = tables.ConsoleServerPortTemplateTable(
-            ConsoleServerPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
-            orderable=False,
-        )
-        powerport_table = tables.PowerPortTemplateTable(
-            PowerPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
-            orderable=False,
-        )
-        poweroutlet_table = tables.PowerOutletTemplateTable(
-            PowerOutletTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
-            orderable=False,
-        )
-        interface_table = tables.InterfaceTemplateTable(
-            list(InterfaceTemplate.objects.restrict(request.user, "view").filter(module_type=instance)),
-            orderable=False,
-        )
-        front_port_table = tables.FrontPortTemplateTable(
-            FrontPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
-            orderable=False,
-        )
-        rear_port_table = tables.RearPortTemplateTable(
-            RearPortTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
-            orderable=False,
-        )
-        modulebay_table = tables.ModuleBayTemplateTable(
-            ModuleBayTemplate.objects.restrict(request.user, "view").filter(module_type=instance),
-            orderable=False,
-        )
-        if request.user.has_perm("dcim.change_moduletype"):
-            consoleport_table.columns.show("pk")
-            consoleserverport_table.columns.show("pk")
-            powerport_table.columns.show("pk")
-            poweroutlet_table.columns.show("pk")
-            interface_table.columns.show("pk")
-            front_port_table.columns.show("pk")
-            rear_port_table.columns.show("pk")
-            modulebay_table.columns.show("pk")
+            context.update(
+                {
+                    "instance_count": instance_count,
+                    "consoleport_table": consoleport_table,
+                    "consoleserverport_table": consoleserverport_table,
+                    "powerport_table": powerport_table,
+                    "poweroutlet_table": poweroutlet_table,
+                    "interface_table": interface_table,
+                    "front_port_table": front_port_table,
+                    "rear_port_table": rear_port_table,
+                    "modulebay_table": modulebay_table,
+                }
+            )
 
-        return {
-            "instance_count": instance_count,
-            "consoleport_table": consoleport_table,
-            "consoleserverport_table": consoleserverport_table,
-            "powerport_table": powerport_table,
-            "poweroutlet_table": poweroutlet_table,
-            "interface_table": interface_table,
-            "front_port_table": front_port_table,
-            "rear_port_table": rear_port_table,
-            "modulebay_table": modulebay_table,
-        }
+        return context
 
     @action(
         detail=False,
@@ -2302,7 +2311,7 @@ class DeviceUIViewSet(NautobotUIViewSet):
 
     def get_queryset(self):
         queryset = super().get_queryset()
-        if self.detail:  # TODO: change to self.action == "retrieve" as a part of addressing NAUTOBOT-1051
+        if self.action == "retrieve":
             queryset = queryset.select_related(
                 "cluster__cluster_group",
                 "controller_managed_device_group__controller",
@@ -3062,7 +3071,7 @@ class DeviceUIViewSet(NautobotUIViewSet):
     def get_extra_context(self, request, instance):
         extra_context = super().get_extra_context(request, instance)
 
-        if self.detail:  # TODO: change to `if self.action == "retrieve"` as a part of addressing NAUTOBOT-1051
+        if self.action == "retrieve":
             # VirtualChassis members
             if instance.virtual_chassis is not None:
                 vc_members = (
@@ -5816,7 +5825,7 @@ class ControllerUIViewSet(NautobotUIViewSet):
             object_detail.DistinctViewTab(
                 weight=700,
                 tab_id="wireless_networks",
-                url_name="dcim:controller_wirelessnetworks",
+                url_name="dcim:controller_wireless_networks",
                 label="Wireless Networks",
                 related_object_attribute="wireless_network_assignments",
                 panels=(
@@ -5840,12 +5849,12 @@ class ControllerUIViewSet(NautobotUIViewSet):
     @action(
         detail=True,
         url_path="wireless-networks",
-        url_name="wirelessnetworks",
+        url_name="wireless_networks",
         methods=["get"],
         custom_view_base_action="view",
         custom_view_additional_permissions=["wireless.view_controllermanageddevicegroupwirelessnetworkassignment"],
     )
-    def wirelessnetworks(self, request, *args, **kwargs):
+    def wireless_networks(self, request, *args, **kwargs):
         return Response({})
 
 

nautobot/extras/forms/forms.py

@@ -386,7 +386,9 @@ class ConfigContextFilterForm(BootstrapMixin, forms.Form):
     role = DynamicModelMultipleChoiceField(
         queryset=Role.objects.get_for_models([Device, VirtualMachine]), to_field_name="name", required=False
     )
-    type = DynamicModelMultipleChoiceField(queryset=DeviceType.objects.all(), to_field_name="model", required=False)
+    device_type = DynamicModelMultipleChoiceField(
+        queryset=DeviceType.objects.all(), to_field_name="model", required=False
+    )
     platform = DynamicModelMultipleChoiceField(queryset=Platform.objects.all(), to_field_name="name", required=False)
     cluster_group = DynamicModelMultipleChoiceField(
         queryset=ClusterGroup.objects.all(), to_field_name="name", required=False

nautobot/extras/templates/extras/plugin_detail.html

@@ -83,11 +83,11 @@
                     <table class="table table-hover panel-body attr-table">
                         <tr>
                             <td>Min Nautobot Version</td>
-                            <td>v{{ object.min_version | placeholder }}</td>
+                            <td>{% if object.min_version %}v{{ object.min_version }}{% else %}{{ None|placeholder }}{% endif %}</td>
                         </tr>
                         <tr>
                             <td>Max Nautobot Version</td>
-                            <td>v{{ object.max_version | placeholder }}</td>
+                            <td>{% if object.max_version %}v{{ object.max_version }}{% else %}{{ None|placeholder }}{% endif %}</td>
                         </tr>
                     </table>
                 </div>

nautobot/extras/urls.py

@@ -4,7 +4,6 @@ from nautobot.core.views.routers import NautobotUIViewSetRouter
 from nautobot.extras import views
 from nautobot.extras.models import (
     Job,
-    Relationship,
 )
 
 app_name = "extras"
@@ -111,19 +110,6 @@ urlpatterns = [
     path("jobs/<str:class_path>/run/", views.JobRunView.as_view(), name="job_run_by_class_path"),
     path("jobs/edit/", views.JobBulkEditView.as_view(), name="job_bulk_edit"),
     path("jobs/delete/", views.JobBulkDeleteView.as_view(), name="job_bulk_delete"),
-    # Custom relationships
-    path(
-        "relationships/<uuid:pk>/changelog/",
-        views.ObjectChangeLogView.as_view(),
-        name="relationship_changelog",
-        kwargs={"model": Relationship},
-    ),
-    path(
-        "relationships/<uuid:pk>/notes/",
-        views.ObjectNotesView.as_view(),
-        name="relationship_notes",
-        kwargs={"model": Relationship},
-    ),
     # Secrets
     path(
         "secrets/provider/<str:provider_slug>/form/",

nautobot/extras/views.py

@@ -1194,7 +1194,7 @@ class GitRepositoryUIViewSet(NautobotUIViewSet):
         context = {
             **super().get_extra_context(request, instance),
             "result": job_result or {},
-            "base_template": "extras/configcontextschema_retrieve.html",
+            "base_template": "extras/gitrepository_retrieve.html",
             "object": instance,
             "active_tab": "result",
             "verbose_name": instance._meta.verbose_name,

nautobot/ipam/ui.py

@@ -10,29 +10,12 @@ from nautobot.core.ui.object_detail import (
     Button,
     KeyValueTablePanel,
     ObjectFieldsPanel,
-    ObjectsTablePanel,
 )
 from nautobot.core.views.utils import get_obj_from_context
 
 logger = logging.getLogger(__name__)
 
 
-# TODO: can be removed as a part of NAUTOBOT-1051
-class PrefixChildTablePanel(ObjectsTablePanel):
-    def should_render(self, context: Context):
-        if not super().should_render(context):
-            return False
-        return context.get("active_tab") == "prefixes"
-
-
-# TODO: can be removed as a part of NAUTOBOT-1051
-class IPAddressTablePanel(ObjectsTablePanel):
-    def should_render(self, context: Context):
-        if not super().should_render(context):
-            return False
-        return context.get("active_tab") == "ip-addresses"
-
-
 class AddChildPrefixButton(Button):
     """Custom button to add a child prefix inside a Prefix detail view."""
 

nautobot/ipam/views.py

@@ -432,7 +432,7 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 related_object_attribute="default_descendants",
                 url_name="ipam:prefix_prefixes",
                 panels=(
-                    ui.PrefixChildTablePanel(
+                    object_detail.ObjectsTablePanel(
                         section=SectionChoices.FULL_WIDTH,
                         weight=100,
                         context_table_key="prefix_table",
@@ -449,7 +449,7 @@ class PrefixUIViewSet(NautobotUIViewSet):
                 related_object_attribute="all_ips",
                 url_name="ipam:prefix_ipaddresses",
                 panels=[
-                    ui.IPAddressTablePanel(
+                    object_detail.ObjectsTablePanel(
                         section=SectionChoices.FULL_WIDTH,
                         weight=100,
                         context_table_key="ip_table",

nautobot/project-static/js/forms.js

@@ -223,6 +223,19 @@ function initializeFormActionClick(context){
 function initializeBulkEditNullification(context){
     this_context = $(context);
     this_context.find('input:checkbox[name=_nullify]').click(function() {
+        var $field = $('#id_' + this.value);
+
+        // If this is a NumberWithSelect (input-group + caret menu), don't hide the
+        // field. Some other fields (e.g.Interface: LAG, Bridge) currently do nothing
+        // when _nullify is checked, so this is consistent.
+        var $group = $field.closest('.input-group');
+        var isNumberWithSelect = $group.length &&
+            $group.find('.input-group-btn .dropdown-menu a.set_value').length > 0;
+        if (isNumberWithSelect) {
+            return; // no UI change; _nullify still submitted
+        }
+
+        // Existing behavior for other fields
         $('#id_' + this.value).toggle('disabled');
     });
 }
@@ -590,19 +603,57 @@ function initializeVLANModeSelection(context){
 
 function initializeMultiValueChar(context, dropdownParent=null){
     this_context = $(context);
-    this_context.find('.nautobot-select2-multi-value-char').select2({
-        allowClear: true,
-        tags: true,
-        theme: "bootstrap",
-        placeholder: "---------",
-        multiple: true,
-        dropdownParent: dropdownParent,
-        width: "off",
-        "language": {
-            "noResults": function(){
-                return "Type something to add it as an option";
-            }
-        },
+    this_context.find('.nautobot-select2-multi-value-char').each(function(){
+        var $el = $(this);
+        $el.select2({
+            allowClear: true,
+            tags: true,
+            theme: "bootstrap",
+            placeholder: "---------",
+            multiple: true,
+            dropdownParent: dropdownParent,
+            width: "off",
+            tokenSeparators: [',', ' '],
+            "language": {
+                "noResults": function(){
+                    return "Type something to add it as an option";
+                }
+            },
+        });
+
+        // Ensure pressing Enter in the Select2 search adds the current token instead of submitting the form
+        $el.on('select2:open', function(){
+            const container = document.querySelector('.select2-container--open');
+            if (!container) return;
+            const search = container.querySelector('input.select2-search__field');
+            if (!search) return;
+
+            // Avoid stacking multiple handlers
+            if (search.getAttribute('data-enter-binds')) return;
+            search.setAttribute('data-enter-binds', '1');
+
+            search.addEventListener('keydown', function(e){
+                if (e.key === 'Enter'){
+                    e.preventDefault();
+                    e.stopPropagation();
+                    const val = this.value.trim();
+                    if (!val) return;
+                    const sel = $el.get(0);
+                    // If option doesn't exist, create it; otherwise select it
+                    let found = Array.prototype.find.call(sel.options, function(opt){ return String(opt.value) === String(val); });
+                    if (!found) {
+                        sel.add(new Option(val, val, true, true));
+                    } else {
+                        found.selected = true;
+                    }
+                    // Clear the search box and notify Select2
+                    this.value = '';
+                    $($el).trigger('change');
+                    // Close the dropdown so it doesn't linger after add
+                    try { $el.select2('close'); } catch (e) {}
+                }
+            });
+        });
     });
 }
 
@@ -714,7 +765,34 @@ function initializeDynamicFilterForm(context){
         lookup_type_value = $(this).find(".lookup_type-select").val();
         lookup_value = $(this).find(".lookup_value-input");
         lookup_value.attr("name", lookup_type_value);
-    })
+    });
+
+    // Pre-populate filter selects (default + advanced) from current URL query params,
+    // including free-form values that are not part of the preset choices.
+    (function prepopulateFilterSelectsFromURL(){
+        const urlParams = new URLSearchParams(window.location.search);
+        // Only target Select2 tag controls inside the filter UI (default sidebar and advanced modal).
+        // Avoids touching unrelated Select2 tagging fields elsewhere on the page (e.g., tags inputs).
+        const selector = '#default-filter form select.nautobot-select2-multi-value-char, #advanced-filter select.nautobot-select2-multi-value-char';
+        this_context.find(selector).each(function(){
+            const sel = this;
+            const name = sel.getAttribute('name');
+            if (!name) { return; }
+            const values = urlParams.getAll(name);
+            if (!values.length) { return; }
+            values.forEach(function(v){
+                let found = Array.prototype.find.call(sel.options, function(opt){ return String(opt.value) === String(v); });
+                if (!found) {
+                    sel.add(new Option(v, v, true, true));
+                } else {
+                    found.selected = true;
+                }
+            });
+            if (window.jQuery && $(sel).data('select2')) {
+                $(sel).trigger('change');
+            }
+        });
+    })();
 
     // Remove applied filters
     this_context.find(".remove-filter-param").on("click", function(){

nautobot/virtualization/tests/test_models.py

@@ -131,6 +131,7 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
             name="Int1", virtual_machine=self.virtualmachine, status=self.int_status
         )
         ips = list(IPAddress.objects.all()[:10])
+        self.assertEqual(len(ips), 10)
 
         # baseline (no vm_interface to ip address relationships exists)
         self.assertFalse(IPAddressToInterface.objects.filter(vm_interface=vm_interface).exists())
@@ -171,7 +172,8 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
         vm_interface = VMInterface.objects.create(
             name="Int1", virtual_machine=self.virtualmachine, status=self.int_status
         )
-        ips = list(IPAddress.objects.all()[:10])
+        ips = list(IPAddress.objects.filter(ip_version=4)[:10])
+        self.assertEqual(len(ips), 10)
 
         # baseline (no vm_interface to ip address relationships exists)
         self.assertFalse(IPAddressToInterface.objects.filter(vm_interface=vm_interface).exists())
@@ -219,7 +221,7 @@ class VMInterfaceTestCase(TestCase):  # TODO: change to BaseModelTestCase
         self.virtualmachine.refresh_from_db()
         self.assertEqual(self.virtualmachine.primary_ip4, None)
         # NOTE: This effectively tests what happens when you pass remove_ip_addresses None; it
-        # NOTE: does not remove a v6 address, because there are no v6 IPs created in this test
+        # NOTE: does not remove a v6 address, because there are no v6 IPs used in this test
         # NOTE: class.
         count = vm_interface.remove_ip_addresses(self.virtualmachine.primary_ip6)
         self.assertEqual(count, 0)

nautobot/virtualization/views.py

@@ -379,6 +379,7 @@ class VirtualMachineUIViewSet(NautobotUIViewSet):
         detail=True,
         url_path="config-context",
         url_name="configcontext",
+        custom_view_base_action="view",
         custom_view_additional_permissions=["extras.view_configcontext"],
     )
     def config_context(self, request, pk):

{nautobot-2.4.21.dist-info → nautobot-2.4.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nautobot
-Version: 2.4.21
+Version: 2.4.22
 Summary: Source of truth and network automation platform.
 License: Apache-2.0
 Keywords: Nautobot
@@ -20,7 +20,7 @@ Provides-Extra: mysql
 Provides-Extra: napalm
 Provides-Extra: remote-storage
 Provides-Extra: sso
-Requires-Dist: Django (>=4.2.25,<4.3.0)
+Requires-Dist: Django (>=4.2.26,<4.3.0)
 Requires-Dist: GitPython (>=3.1.45,<3.2.0)
 Requires-Dist: Jinja2 (>=3.1.6,<3.2.0)
 Requires-Dist: Markdown (>=3.8.2,<3.9.0)
@@ -32,7 +32,7 @@ Requires-Dist: django-ajax-tables (>=1.1.1,<1.2.0)
 Requires-Dist: django-auth-ldap (>=5.2.0,<5.3.0) ; extra == "all" or extra == "ldap"
 Requires-Dist: django-celery-beat (>=2.7.0,<2.8.0)
 Requires-Dist: django-celery-results (>=2.6.0,<2.7.0)
-Requires-Dist: django-constance (>=4.3.2,<4.4.0)
+Requires-Dist: django-constance (>=4.3.3,<4.4.0)
 Requires-Dist: django-cors-headers (>=4.9.0,<4.10.0)
 Requires-Dist: django-db-file-storage (>=0.5.6.1,<0.6.0.0)
 Requires-Dist: django-extensions (>=4.1,<4.2)
@@ -60,7 +60,7 @@ Requires-Dist: mysqlclient (>=2.2.7,<2.3.0) ; extra == "all" or extra == "mysql"
 Requires-Dist: napalm (>=4.1.0,<6.0.0) ; extra == "all" or extra == "napalm"
 Requires-Dist: netaddr (>=1.3.0,<1.4.0)
 Requires-Dist: netutils (>=1.14.0,<2.0.0)
-Requires-Dist: nh3 (>=0.3.1,<0.4.0)
+Requires-Dist: nh3 (>=0.3.2,<0.4.0)
 Requires-Dist: packaging (>=23.1)
 Requires-Dist: prometheus-client (>=0.23.1,<0.24.0)
 Requires-Dist: psycopg2-binary (>=2.9.11,<2.10.0)