nautobot 2.4.17__py3-none-any.whl → 2.4.19__py3-none-any.whl

nautobot/ipam/filters.py

@@ -144,7 +144,7 @@ class VRFFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyModelFil
 
     class Meta:
         model = VRF
-        fields = ["id", "name", "rd", "tags"]
+        fields = ["id", "name", "rd", "tags", "description"]
 
 
 class VRFDeviceAssignmentFilterSet(NautobotFilterSet):
@@ -503,7 +503,7 @@ class IPAddressFilterSet(
 
     class Meta:
         model = IPAddress
-        fields = ["id", "dns_name", "type", "tags", "mask_length", "nat_inside"]
+        fields = ["id", "dns_name", "type", "tags", "mask_length", "nat_inside", "description"]
 
     def generate_query__has_interface_assignments(self, value):
         """Helper method used by DynamicGroups and by _assigned_to_interface method."""

nautobot/ipam/migrations/0053_alter_vrfdeviceassignment_options_and_more.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.23 on 2025-09-17 16:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipam", "0052_alter_ipaddress_index_together_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="vrfdeviceassignment",
+            options={"verbose_name": "VRF-device assignment"},
+        ),
+        migrations.AlterModelOptions(
+            name="vrfprefixassignment",
+            options={"verbose_name": "VRF-prefix assignment"},
+        ),
+    ]

nautobot/ipam/models.py

@@ -350,6 +350,7 @@ class VRFDeviceAssignment(BaseModel):
     is_metadata_associable_model = False
 
     class Meta:
+        verbose_name = "VRF-device assignment"
         unique_together = [
             ["vrf", "device"],
             ["vrf", "virtual_machine"],
@@ -404,6 +405,7 @@ class VRFPrefixAssignment(BaseModel):
     is_metadata_associable_model = False
 
     class Meta:
+        verbose_name = "VRF-prefix assignment"
         unique_together = ["vrf", "prefix"]
 
     def __str__(self):
@@ -882,6 +884,38 @@ class Prefix(PrimaryModel):
             )
         self.locations.set([value])
 
+    @property
+    def default_ancestors(self):
+        """
+        Return this prefix's ancestors in default order.
+
+        This is equivalent to calling `ancestors()` with default
+        arguments: ordered from larger to smaller prefix lengths,
+        excluding the prefix itself.
+        """
+        return self.ancestors()
+
+    @property
+    def default_descendants(self):
+        """
+        Return this prefix's descendants in default order.
+
+        This is equivalent to calling `descendants()` with
+        default arguments: all subnets, excluding the prefix itself.
+        """
+        return self.descendants()
+
+    @property
+    def all_ips(self):
+        """
+        All IP addresses contained within this prefix, including
+        those in descendant prefixes.
+
+        This is a property alias for `get_all_ips()` and may be
+        preferred in new code for readability.
+        """
+        return self.get_all_ips()
+
     def reparent_subnets(self):
         """
         Handle changes to the parentage of other Prefixes as a consequence of this Prefix's creation or update.

nautobot/ipam/querysets.py

@@ -356,7 +356,7 @@ class PrefixQuerySet(LocationToLocationsQuerySetMixin, BaseNetworkQuerySet):
         """
         # Validate that it's a real CIDR
         cidr = self._validate_cidr(cidr)
-        broadcast = str(cidr.broadcast or cidr.ip)
+        broadcast = str(cidr.broadcast or cidr[-1])
         ip_version = cidr.version
 
         try:
@@ -366,7 +366,7 @@ class PrefixQuerySet(LocationToLocationsQuerySetMixin, BaseNetworkQuerySet):
 
         # Prepare the queryset filter
         lookup_kwargs = {
-            "network__lte": cidr.value,
+            "network__lte": cidr.network,
             "prefix_length__gte": shortest_prefix_length,
             "broadcast__gte": broadcast,
             "ip_version": ip_version,
@@ -376,7 +376,7 @@ class PrefixQuerySet(LocationToLocationsQuerySetMixin, BaseNetworkQuerySet):
         # we can choose the first one.
         possible_ancestors = self.filter(**lookup_kwargs).order_by("-prefix_length")
         if not include_self:
-            possible_ancestors = possible_ancestors.exclude(network=cidr.value, prefix_length=cidr.prefixlen)
+            possible_ancestors = possible_ancestors.exclude(network=cidr.network, prefix_length=cidr.prefixlen)
 
         # If we've got any matches, the first one is our closest parent.
         try:

nautobot/ipam/signals.py

@@ -80,11 +80,16 @@ def ip_address_to_interface_pre_delete(instance, raw=False, **kwargs):
         )
 
     # Only nullify the primary_ip field if no other interfaces/vm_interfaces have the ip_address
+    host_needs_save = False
     if not other_assignments_exist and instance.ip_address == host.primary_ip4:
         host.primary_ip4 = None
+        host_needs_save = True
     elif not other_assignments_exist and instance.ip_address == host.primary_ip6:
         host.primary_ip6 = None
-    host.save()
+        host_needs_save = True
+
+    if host_needs_save:
+        host.save()
 
 
 @receiver(pre_save, sender=IPAddressToInterface)

nautobot/ipam/tables.py

@@ -854,6 +854,7 @@ class ServiceTable(BaseTable):
     parent = tables.LinkColumn(order_by=("device", "virtual_machine"))
     ports = tables.TemplateColumn(template_code="{{ record.port_list }}", verbose_name="Ports")
     tags = TagColumn(url_name="ipam:service_list")
+    actions = ButtonsColumn(Service, buttons=["changelog", "edit", "delete"])
 
     class Meta(BaseTable.Meta):
         model = Service
@@ -866,5 +867,6 @@ class ServiceTable(BaseTable):
             "ip_addresses",
             "description",
             "tags",
+            "actions",
         )
-        default_columns = ("pk", "name", "parent", "protocol", "ports", "description")
+        default_columns = ("pk", "name", "parent", "protocol", "ports", "description", "actions")

nautobot/ipam/templates/ipam/inc/prefix_header_extra_content_table.html

@@ -0,0 +1,4 @@
+{% extends "components/panel/header_extra_content_table.html" %}
+{% block panel_buttons %}
+    {% include "ipam/inc/toggle_available.html" %}
+{% endblock panel_buttons %}

nautobot/ipam/templates/ipam/inc/toggle_available.html

@@ -1,11 +1,11 @@
 {% load helpers %}
 {% if show_available is not None %}
-        <div class="btn-group" role="group">
-            <a href="{{ request.path }}{% legacy_querystring request show_available='true' %}" class="btn btn-default{% if show_available %} active disabled{% endif %}">
-              <i class="mdi mdi-eye-outline"></i> Show available
-            </a>
-            <a href="{{ request.path }}{% legacy_querystring request show_available='false' %}" class="btn btn-default{% if not show_available %} active disabled{% endif %}">
-              <i class="mdi mdi-eye-off-outline"></i> Hide available
-            </a>
-        </div>
+    <div class="btn-group" role="group">
+        <a href="{{ request.path }}{% legacy_querystring request show_available='true' %}" class="btn btn-default btn-xs{% if show_available %} active disabled{% endif %}">
+            <i class="mdi mdi-eye-outline"></i> Show available
+        </a>
+        <a href="{{ request.path }}{% legacy_querystring request show_available='false' %}" class="btn btn-default btn-xs{% if not show_available %} active disabled{% endif %}">
+            <i class="mdi mdi-eye-off-outline"></i> Hide available
+        </a>
+    </div>
 {% endif %}

nautobot/ipam/templates/ipam/inc/vlangroup_header.html

@@ -5,10 +5,10 @@
         </a>
     {% endif %}
     {% if perms.ipam.change_vlangroup %}
-               <a href="{% url 'ipam:vlangroup_edit' pk=object.pk %}" class="btn btn-warning">
-                       <span class="mdi mdi-pencil" aria-hidden="true"></span>
-                       Edit this VLAN Group
-               </a>
+        <a href="{% url 'ipam:vlangroup_edit' pk=object.pk %}" class="btn btn-warning">
+            <span class="mdi mdi-pencil" aria-hidden="true"></span>
+            Edit this VLAN Group
+        </a>
     {% endif %}
 </div>
 <h1>{{ object }}</h1>

nautobot/ipam/templates/ipam/ipaddress.html

@@ -2,146 +2,142 @@
 {% load helpers %}
 {% load render_table from django_tables2 %}
 
-{% block extra_breadcrumbs %}
-                    <li>{{ object.parent.namespace|hyperlinked_object }}</li>
-{% endblock extra_breadcrumbs %}
-
 {% block extra_nav_tabs %}
-        {% with interface_count=object.interfaces.count %}
-            {% if interface_count %}
-                <li role="presentation" {% if active_tab == 'interfaces' %} class="active"{% endif %}>
-                    <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}">Interfaces {% badge interface_count %}</a>
-                </li>
-            {% endif %}
-        {% endwith %}
-        {% with vm_interface_count=object.vm_interfaces.count %}
-            {% if vm_interface_count %}
-                <li role="presentation" {% if active_tab == 'vm_interfaces' %} class="active"{% endif %}>
-                    <a href="{% url 'ipam:ipaddress_vm_interfaces' pk=object.pk %}">VM Interfaces {% badge vm_interface_count %}</a>
-                </li>
-            {% endif %}
-        {% endwith %}
+    {% with interface_count=object.interfaces.count %}
+        {% if interface_count %}
+            <li role="presentation" {% if active_tab == 'interfaces' %} class="active"{% endif %}>
+                <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}">Interfaces {% badge interface_count %}</a>
+            </li>
+        {% endif %}
+    {% endwith %}
+    {% with vm_interface_count=object.vm_interfaces.count %}
+        {% if vm_interface_count %}
+            <li role="presentation" {% if active_tab == 'vm_interfaces' %} class="active"{% endif %}>
+                <a href="{% url 'ipam:ipaddress_vm_interfaces' pk=object.pk %}">VM Interfaces {% badge vm_interface_count %}</a>
+            </li>
+        {% endif %}
+    {% endwith %}
 {% endblock extra_nav_tabs %}
 
 {% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>IP Address</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Namespace</td>
-                    <td>{{ object.parent.namespace|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>IP Version</td>
-                    <td>IPv{{ object.ip_version }}</td>
-                </tr>
-                <tr>
-                    <td>Type</td>
-                    <td>{{ object.type|hyperlinked_object }}</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>VRFs</td>
-                    <td>
-                        {% if object.parent.vrfs.exists %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>IP Address</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            <tr>
+                <td>Namespace</td>
+                <td>{{ object.parent.namespace|hyperlinked_object }}</td>
+            </tr>
+            <tr>
+                <td>IP Version</td>
+                <td>IPv{{ object.ip_version }}</td>
+            </tr>
+            <tr>
+                <td>Type</td>
+                <td>{{ object.type|hyperlinked_object }}</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>VRFs</td>
+                <td>
+                    {% if object.parent.vrfs.exists %}
                         <ul class="list-unstyled">
                             {% for vrf in object.parent.vrfs.all %}
-                            <li>{{ vrf|hyperlinked_object }}</li>
+                                <li>{{ vrf|hyperlinked_object }}</li>
                             {% endfor %}
                         </ul>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>DNS Name</td>
-                    <td>{{ object.dns_name|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <td>DNS Name</td>
+                <td>{{ object.dns_name|placeholder }}</td>
+            </tr>
+            <tr>
+                <td>Description</td>
+                <td>{{ object.description|placeholder }}</td>
+            </tr>
+        </table>
+    </div>
 {% endblock content_left_page %}
 
 {% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Operational Details</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                {% include 'inc/tenant_table_row.html' %}
-                <tr>
-                    <td>Assignment</td>
-                    <td>
-                        {% with interface_count=object.interfaces.count vm_interface_count=object.vm_interfaces.count %}
-                            {% if interface_count == 1 and vm_interface_count == 0 %}
-                                {{ object.interfaces.first.parent|hyperlinked_object }} ({{ object.interfaces.first|hyperlinked_object }})
-                            {% elif interface_count == 0 and vm_interface_count == 1 %}
-                                {{ object.vm_interfaces.first.parent|hyperlinked_object }} ({{ object.vm_interfaces.first|hyperlinked_object }})
-                            {% elif interface_count == 0 and vm_interface_count == 0 %}
-                                <span class="text-muted">&mdash;</span>
-                            {% else %}
-                                {% if interface_count > 0 %}
-                                    <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}">
-                                        {{ interface_count }} interface{{ interface_count|pluralize }}
-                                    </a>
-                                    {% if vm_interface_count > 0 %}
-                                        <br>
-                                    {% endif %}
-                                {% endif %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Operational Details</strong>
+        </div>
+        <table class="table table-hover panel-body attr-table">
+            {% include 'inc/tenant_table_row.html' %}
+            <tr>
+                <td>Assignment</td>
+                <td>
+                    {% with interface_count=object.interfaces.count vm_interface_count=object.vm_interfaces.count %}
+                        {% if interface_count == 1 and vm_interface_count == 0 %}
+                            {{ object.interfaces.first.parent|hyperlinked_object }} ({{ object.interfaces.first|hyperlinked_object }})
+                        {% elif interface_count == 0 and vm_interface_count == 1 %}
+                            {{ object.vm_interfaces.first.parent|hyperlinked_object }} ({{ object.vm_interfaces.first|hyperlinked_object }})
+                        {% elif interface_count == 0 and vm_interface_count == 0 %}
+                            <span class="text-muted">&mdash;</span>
+                        {% else %}
+                            {% if interface_count > 0 %}
+                                <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}">
+                                    {{ interface_count }} interface{{ interface_count|pluralize }}
+                                </a>
                                 {% if vm_interface_count > 0 %}
-                                    <a href="{% url 'ipam:ipaddress_vm_interfaces' pk=object.pk %}">
-                                        {{ vm_interface_count }} VM interface{{ vm_interface_count|pluralize }}
-                                    </a>
+                                    <br>
                                 {% endif %}
                             {% endif %}
-                        {% endwith %}
-                    </td>
-                </tr>
-                <tr>
-                    <!-- TODO: update to work with interface M2M -->
-                    <td>NAT (inside)</td>
-                    <td>
-                        {% if object.nat_inside %}
-                            {{ object.nat_inside|hyperlinked_object }}
-                            {% if object.nat_inside.assigned_object %}
-                                ({{ object.nat_inside.assigned_object.parent|hyperlinked_object }})
+                            {% if vm_interface_count > 0 %}
+                                <a href="{% url 'ipam:ipaddress_vm_interfaces' pk=object.pk %}">
+                                    {{ vm_interface_count }} VM interface{{ vm_interface_count|pluralize }}
+                                </a>
                             {% endif %}
-                        {% else %}
-                            <span class="text-muted">None</span>
                         {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>NAT (outside)</td>
-                    <td>
-                        {% if object.nat_outside_list.exists %}
-                            <ul class="list-unstyled">
-                                {% for nat in object.nat_outside_list.all %}
-                                    <li>{{ nat|hyperlinked_object }}</li>
-                                {% endfor %}
-                            </ul>
-                        {% else %}
-                            <span class="text-muted">None</span>
+                    {% endwith %}
+                </td>
+            </tr>
+            <tr>
+                    <!-- TODO: update to work with interface M2M -->
+                <td>NAT (inside)</td>
+                <td>
+                    {% if object.nat_inside %}
+                        {{ object.nat_inside|hyperlinked_object }}
+                        {% if object.nat_inside.assigned_object %}
+                            ({{ object.nat_inside.assigned_object.parent|hyperlinked_object }})
                         {% endif %}
-                    </td>
-                </tr>
-            </table>
-        </div>
+                    {% else %}
+                        <span class="text-muted">None</span>
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <td>NAT (outside)</td>
+                <td>
+                    {% if object.nat_outside_list.exists %}
+                        <ul class="list-unstyled">
+                            {% for nat in object.nat_outside_list.all %}
+                                <li>{{ nat|hyperlinked_object }}</li>
+                            {% endfor %}
+                        </ul>
+                    {% else %}
+                        <span class="text-muted">None</span>
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+    </div>
 {% endblock content_right_page %}
 
 {% block content_full_width_page %}

nautobot/ipam/templates/ipam/ipaddress_assign.html

@@ -29,13 +29,13 @@
                         </div>
                     </div>
                 {% endif %}
-            <div class="panel panel-default">
-                <div class="panel-heading"><strong>Select IP Address</strong></div>
-                <div class="panel-body">
-                    {% render_field form.q %}
+                <div class="panel panel-default">
+                    <div class="panel-heading"><strong>Select IP Address</strong></div>
+                    <div class="panel-body">
+                        {% render_field form.q %}
+                    </div>
                 </div>
             </div>
-            </div>
         </div>
         <div class="row">
             <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
@@ -66,11 +66,11 @@
 {% endblock %}
 
 {% block javascript %}
-<script>
-    var clipboard = new ClipboardJS('.btn');
+    <script>
+        var clipboard = new ClipboardJS('.btn');
 
-    clipboard.on('success', function (e) {console.log("success")});
+        clipboard.on('success', function (e) {console.log("success")});
 
-    clipboard.on('error', function (e) {console.log("failed")});
-</script>
+        clipboard.on('error', function (e) {console.log("failed")});
+    </script>
 {% endblock %}

nautobot/ipam/templates/ipam/ipaddress_edit.html

@@ -42,7 +42,7 @@
                     {% render_field form.nat_virtual_machine %}
                 </div>
                 <div class="tab-pane" id="by_vrf">
-                  {% render_field form.nat_vrf %}
+                    {% render_field form.nat_vrf %}
                 </div>
             </div>
             {% render_field form.nat_inside %}