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

nautobot/ipam/templates/ipam/prefix_create.html

@@ -0,0 +1,34 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Prefix</strong></div>
+        <div class="panel-body">
+            {% render_field form.prefix %}
+            {% render_field form.namespace %}
+            {% render_field form.type %}
+            {% render_field form.status %}
+            {% render_field form.role %}
+            {% render_field form.rir %}
+            {% render_field form.date_allocated %}
+            {% render_field form.description %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>VRF Assignment</strong></div>
+        <div class="panel-body">
+            {% render_field form.vrfs %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Location/VLAN Assignment</strong></div>
+        <div class="panel-body">
+            {% render_field form.locations %}
+            {% render_field form.vlan_group %}
+            {% render_field form.vlan %}
+        </div>
+    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
+    {% include 'inc/extras_features_edit_form_fields.html' %}
+{% endblock %}

nautobot/ipam/templates/ipam/prefix_edit.html

@@ -1,34 +1 @@
-{% extends 'generic/object_create.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Prefix</strong></div>
-        <div class="panel-body">
-            {% render_field form.prefix %}
-            {% render_field form.namespace %}
-            {% render_field form.type %}
-            {% render_field form.status %}
-            {% render_field form.role %}
-            {% render_field form.rir %}
-            {% render_field form.date_allocated %}
-            {% render_field form.description %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>VRF Assignment</strong></div>
-        <div class="panel-body">
-            {% render_field form.vrfs %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Location/VLAN Assignment</strong></div>
-        <div class="panel-body">
-            {% render_field form.locations %}
-            {% render_field form.vlan_group %}
-            {% render_field form.vlan %}
-        </div>
-    </div>
-    {% include 'inc/tenancy_form_panel.html' %}
-    {% include 'inc/extras_features_edit_form_fields.html' %}
-{% endblock %}
+{% extends 'ipam/prefix_create.html' %}

nautobot/ipam/templates/ipam/prefix_retrieve.html

@@ -0,0 +1,3 @@
+
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}

nautobot/ipam/templates/ipam/service_retrieve.html

@@ -1,7 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-            <li>{{ object.parent|hyperlinked_object }}</li>
-{% endblock extra_breadcrumbs %}
-
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/vlan_retrieve.html

@@ -1,8 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-    {% if object.vlan_group %}
-        <li><a href="{% url 'ipam:vlan_list' %}?vlan_group={{ object.vlan_group.name }}">{{ object.vlan_group }}</a></li>
-    {% endif %}
-{% endblock extra_breadcrumbs %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/vrf_edit.html

@@ -7,7 +7,7 @@
         <div class="panel-body">
             {% render_field form.name %}
             {% render_field form.namespace %}
-	        {% render_field form.rd %}
+            {% render_field form.rd %}
             {% render_field form.status %}
             {% render_field form.description %}
         </div>

nautobot/ipam/tests/test_views.py

@@ -303,6 +303,8 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
             status=ip_status,
             namespace=self.namespace,
         )
+        # add this permission to can test button Add an IP Address
+        self.add_permissions("ipam.add_ipaddress")
         url = reverse("ipam:prefix_ipaddresses", args=(instance.pk,))
         response = self.client.get(url)
         self.assertHttpStatus(response, 200)
@@ -314,6 +316,35 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.List
             f'<li role="presentation" class="active"><a href="{url}">IP Addresses <span class="badge">2</span></a></li>'
         )
         self.assertInHTML(ip_address_tab, content)
+        # Checks if the button is in the content.
+        self.assertInHTML("""<span class="mdi mdi-plus-thick" aria-hidden="true"></span>Add an IP Address""", content)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    def test_prefix_child_prefixes_table_list(self):
+        instance = Prefix.objects.create(
+            prefix="5.5.10.0/23",
+            namespace=self.namespace,
+            type=PrefixTypeChoices.TYPE_NETWORK,
+            status=self.statuses[1],
+        )
+        Prefix.objects.create(
+            prefix="5.5.10.0/30",
+            namespace=self.namespace,
+            type=PrefixTypeChoices.TYPE_POOL,
+            status=self.statuses[1],
+        )
+        # add this permission to can test button Add Child Prefix
+        self.add_permissions("ipam.add_prefix")
+        url = reverse("ipam:prefix_prefixes", args=(instance.pk,))
+        response = self.client.get(url)
+        self.assertHttpStatus(response, 200)
+        content = extract_page_body(response.content.decode(response.charset))
+        # This validates that both parent prefix and child prefix IPAddresses are present in parent prefix IPAddresses list
+        self.assertIn("5.5.10.0/30", strip_tags(content))
+        ip_address_tab = f'<li role="presentation" class="active"><a href="{url}">Child Prefixes <span class="badge">1</span></a></li>'
+        self.assertInHTML(ip_address_tab, content)
+        # Checks if the button is in the content.
+        self.assertInHTML("""<span class="mdi mdi-plus-thick" aria-hidden="true"></span>Add Child Prefix""", content)
 
 
 class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
@@ -1036,6 +1067,9 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 class ServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Service
+    allowed_number_of_tree_queries_per_view_type = {
+        "retrieve": 1,
+    }
 
     @classmethod
     def setUpTestData(cls):

nautobot/ipam/ui.py

@@ -0,0 +1,145 @@
+import logging
+from urllib.parse import urlencode
+
+from django.template import Context
+from django.template.loader import render_to_string
+from django.urls import reverse
+
+from nautobot.core.templatetags import helpers
+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."""
+
+    def should_render(self, context: Context):
+        if not super().should_render(context):
+            return False
+        return context.get("first_available_prefix") is not None
+
+    def get_link(self, context):
+        first_available_prefix = context.get("first_available_prefix")
+        obj = get_obj_from_context(context)
+        if not first_available_prefix:
+            return None
+
+        params = {
+            "prefix": str(first_available_prefix),
+            "namespace": obj.namespace.pk,
+        }
+        if obj.tenant:
+            params["tenant"] = obj.tenant.pk
+            if obj.tenant.tenant_group:
+                params["tenant_group"] = obj.tenant.tenant_group.pk
+        if obj.locations.exists():
+            params["locations"] = [loc.pk for loc in obj.locations.all()]
+
+        return f"{reverse(self.link_name)}?{urlencode(params)}"
+
+
+class AddIPAddressButton(Button):
+    """Custom button to add an IP address inside a Prefix detail view."""
+
+    def should_render(self, context: Context):
+        if not super().should_render(context):
+            return False
+        return context.get("first_available_ip") is not None
+
+    def get_link(self, context: Context):
+        first_available_ip = context.get("first_available_ip")
+        obj = get_obj_from_context(context)
+        if not first_available_ip:
+            return None
+
+        params = {
+            "address": first_available_ip,
+            "namespace": obj.namespace.pk,
+        }
+        if obj.tenant:
+            params["tenant"] = obj.tenant.pk
+            if obj.tenant.tenant_group:
+                params["tenant_group"] = obj.tenant.tenant_group.pk
+        return f"{reverse(self.link_name)}?{urlencode(params)}"
+
+
+class PrefixKeyValueOverrideValueTablePanel(KeyValueTablePanel):
+    """A table panel for displaying key-value pairs of prefix-related attributes, along with any override values defined on the prefix object."""
+
+    def render_locations_list(self, key, value, instance):
+        """Renders a <ul> HTML list of locations with hyperlinks, or a placeholder if none exist."""
+        if not value or not value.exists():
+            return helpers.placeholder(None)
+
+        base_url = reverse("dcim:location_list")
+        full_listing_link = f"{base_url}?prefixes={instance.pk}"
+
+        return helpers.render_m2m(
+            value.all(),
+            full_listing_link=full_listing_link,
+            verbose_name_plural=key,
+        )
+
+    def render_utilization(self, value):
+        """Renders a utilization graph, or a placeholder if none exist."""
+        if value is None:
+            return helpers.placeholder(None)
+        return render_to_string(
+            "utilities/templatetags/utilization_graph.html",
+            helpers.utilization_graph(value),
+        )
+
+
+class PrefixObjectFieldsPanel(ObjectFieldsPanel, PrefixKeyValueOverrideValueTablePanel):
+    """
+    A panel that combines field rendering from ObjectFieldsPanel with the
+    key/value rendering style of PrefixKeyValueOverrideValueTablePanel.
+
+    - Adds custom handling for specific fields such as:
+      - "utilization": retrieved from the instance via get_utilization().
+      - "locations": rendered as a locations list.
+    Falls back to the parent class rendering for all other fields.
+    """
+
+    def get_data(self, context):
+        data = super().get_data(context)
+        fields = self.fields
+        instance = get_obj_from_context(context, self.context_object_key)
+
+        if instance and "utilization" in fields:
+            data["utilization"] = instance.get_utilization()
+
+        return data
+
+    # TODO: can be removed as a part of NAUTOBOT-1052
+    def render_value(self, key, value, context):
+        instance = get_obj_from_context(context)
+        if key == "utilization":
+            return self.render_utilization(value)
+        if key == "locations":
+            return self.render_locations_list(key, value, instance)
+
+        return super().render_value(key, value, context)

nautobot/ipam/urls.py

@@ -6,7 +6,6 @@ from nautobot.extras.views import ObjectChangeLogView, ObjectDynamicGroupsView,
 from . import views
 from .models import (
     IPAddress,
-    Prefix,
 )
 
 app_name = "ipam"
@@ -14,6 +13,7 @@ app_name = "ipam"
 router = NautobotUIViewSetRouter()
 router.register("ip-address-to-interface", views.IPAddressToInterfaceUIViewSet)
 router.register("namespaces", views.NamespaceUIViewSet)
+router.register("prefixes", views.PrefixUIViewSet)
 router.register("rirs", views.RIRUIViewSet)
 router.register("route-targets", views.RouteTargetUIViewSet)
 router.register("services", views.ServiceUIViewSet)
@@ -22,51 +22,6 @@ router.register("vlan-groups", views.VLANGroupUIViewSet)
 router.register("vrfs", views.VRFUIViewSet)
 
 urlpatterns = [
-    # Prefixes
-    path("prefixes/", views.PrefixListView.as_view(), name="prefix_list"),
-    path("prefixes/add/", views.PrefixEditView.as_view(), name="prefix_add"),
-    path("prefixes/import/", views.PrefixBulkImportView.as_view(), name="prefix_import"),  # 3.0 TODO: remove, unused
-    path("prefixes/edit/", views.PrefixBulkEditView.as_view(), name="prefix_bulk_edit"),
-    path(
-        "prefixes/delete/",
-        views.PrefixBulkDeleteView.as_view(),
-        name="prefix_bulk_delete",
-    ),
-    path("prefixes/<uuid:pk>/", views.PrefixView.as_view(), name="prefix"),
-    path("prefixes/<uuid:pk>/edit/", views.PrefixEditView.as_view(), name="prefix_edit"),
-    path(
-        "prefixes/<uuid:pk>/delete/",
-        views.PrefixDeleteView.as_view(),
-        name="prefix_delete",
-    ),
-    path(
-        "prefixes/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="prefix_changelog",
-        kwargs={"model": Prefix},
-    ),
-    path(  # 3.0 TODO: remove, no longer needed/used since 2.3
-        "prefixes/<uuid:pk>/dynamic-groups/",
-        ObjectDynamicGroupsView.as_view(),
-        name="prefix_dynamicgroups",
-        kwargs={"model": Prefix},
-    ),
-    path(
-        "prefixes/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="prefix_notes",
-        kwargs={"model": Prefix},
-    ),
-    path(
-        "prefixes/<uuid:pk>/prefixes/",
-        views.PrefixPrefixesView.as_view(),
-        name="prefix_prefixes",
-    ),
-    path(
-        "prefixes/<uuid:pk>/ip-addresses/",
-        views.PrefixIPAddressesView.as_view(),
-        name="prefix_ipaddresses",
-    ),
     # IP addresses
     path("ip-addresses/", views.IPAddressListView.as_view(), name="ipaddress_list"),
     path("ip-addresses/add/", views.IPAddressEditView.as_view(), name="ipaddress_add"),

nautobot/ipam/utils/__init__.py

@@ -1,9 +1,11 @@
 from collections.abc import Iterable
 
 from django.core.exceptions import ValidationError
+from django.utils.html import format_html, format_html_join
 import netaddr
 
 from nautobot.core.forms.utils import compress_range
+from nautobot.core.templatetags.helpers import add_html_id, HTML_NONE, hyperlinked_object
 from nautobot.dcim.models import Interface
 from nautobot.extras.models import RelationshipAssociation
 from nautobot.ipam.choices import PrefixTypeChoices
@@ -304,3 +306,27 @@ def retrieve_interface_or_vminterface_from_request(request):
         return obj, None
     except (interface_model.DoesNotExist, ValidationError):
         return None, f'{interface_model.__name__} with id "{interface_id}" not found.'
+
+
+def render_ip_with_nat(ip):
+    """Render an IP address plus its NAT inside/outside information if any."""
+    if ip is None:
+        return HTML_NONE
+
+    if ip.nat_inside is not None:
+        nat = format_html("(NAT for {})", hyperlinked_object(ip.nat_inside))
+    elif ip.nat_outside_list.exists():
+        nat = format_html(
+            "<br>NAT:<ul>{}</ul>",
+            format_html_join("\n", "<li>{}</li>", [[hyperlinked_object(nato)] for nato in ip.nat_outside_list.all()]),
+        )
+    else:
+        nat = ""
+
+    # TODO: replace auto-added "copy" button for this entire string with a button that just copies the host address
+    return format_html(
+        "{display} ({namespace}) {nat}",
+        display=add_html_id(hyperlinked_object(ip), f"ipv{ip.ip_version}"),
+        namespace=hyperlinked_object(ip.parent.namespace if ip.parent else None),
+        nat=nat,
+    )