nautobot 2.3.15b1__py3-none-any.whl → 2.4.0__py3-none-any.whl

nautobot/ipam/filters.py

@@ -1,4 +1,5 @@
 import contextlib
+import uuid
 
 from django.core.exceptions import ValidationError
 from django.db.models import Q
@@ -323,7 +324,7 @@ class PrefixFilterSet(
         return prefixes_queryset
 
     def generate_query_filter_present_in_vrf(self, value):
-        if isinstance(value, str):
+        if isinstance(value, (str, uuid.UUID)):
             value = VRF.objects.get(pk=value)
 
         query = Q(vrfs=value) | Q(vrfs__export_targets__in=value.import_targets.all())
@@ -485,7 +486,7 @@ class IPAddressFilterSet(
             return queryset.none()
 
     def generate_query_filter_present_in_vrf(self, value):
-        if isinstance(value, str):
+        if isinstance(value, (str, uuid.UUID)):
             value = VRF.objects.get(pk=value)
 
         query = Q(parent__vrfs=value) | Q(parent__vrfs__export_targets__in=value.import_targets.all())

nautobot/ipam/models.py

@@ -27,18 +27,18 @@ from .querysets import IPAddressQuerySet, PrefixQuerySet, RIRQuerySet, VLANQuery
 from .validators import DNSValidator
 
 __all__ = (
+    "RIR",
+    "VLAN",
+    "VRF",
     "IPAddress",
     "IPAddressToInterface",
     "Namespace",
     "Prefix",
     "PrefixLocationAssignment",
-    "RIR",
     "RouteTarget",
     "Service",
-    "VLAN",
     "VLANGroup",
     "VLANLocationAssignment",
-    "VRF",
     "VRFDeviceAssignment",
     "VRFPrefixAssignment",
 )
@@ -648,19 +648,18 @@ class Prefix(PrimaryModel):
         return None
 
     def clean(self):
-        if self.prefix:
-            # self.parent depends on self.prefix having a value
-            self.parent = self.get_parent()
-        super().clean()
-
-    def save(self, *args, **kwargs):
-        if isinstance(self.prefix, netaddr.IPNetwork):
+        if self.prefix is not None:  # missing network/prefix_length will be caught by super().clean()
             # Clear host bits from prefix
             # This also has the subtle side effect of calling self._deconstruct_prefix(),
             # which will (re)set the broadcast and ip_version values of this instance to their correct values.
             self.prefix = self.prefix.cidr
 
-        self.parent = self.get_parent()
+            self.parent = self.get_parent()
+
+        super().clean()
+
+    def save(self, *args, **kwargs):
+        self.clean()
 
         # Validate that creation of this prefix does not create an invalid parent/child relationship
         # 3.0 TODO: uncomment this to enforce this constraint
@@ -1408,7 +1407,6 @@ class VLANGroup(PrimaryModel):
 
     def clean(self):
         super().clean()
-
         # Validate location
         if self.location is not None:
             if ContentType.objects.get_for_model(self) not in self.location.location_type.content_types.all():

nautobot/ipam/navigation.py

@@ -1,7 +1,4 @@
 from nautobot.core.apps import (
-    NavContext,
-    NavGrouping,
-    NavItem,
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
@@ -205,90 +202,3 @@ menu_items = (
         ),
     ),
 )
-
-
-navigation = (
-    NavContext(
-        name="Networks",
-        groups=(
-            NavGrouping(
-                name="IP Management",
-                weight=100,
-                items=(
-                    NavItem(
-                        name="IP Addresses",
-                        weight=100,
-                        link="ipam:ipaddress_list",
-                        permissions=["ipam.view_ipaddress"],
-                    ),
-                    NavItem(
-                        name="Prefixes",
-                        weight=200,
-                        link="ipam:prefix_list",
-                        permissions=["ipam.view_prefix"],
-                    ),
-                    NavItem(
-                        name="RIRs",
-                        weight=300,
-                        link="ipam:rir_list",
-                        permissions=["ipam.view_rir"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Layer 2 / Switching",
-                weight=200,
-                items=(
-                    NavItem(
-                        name="VLANs",
-                        weight=100,
-                        link="ipam:vlan_list",
-                        permissions=["ipam.view_vlan"],
-                    ),
-                    NavItem(
-                        name="VLAN Groups",
-                        weight=200,
-                        link="ipam:vlangroup_list",
-                        permissions=["ipam.view_vlangroup"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Layer 3 / Routing",
-                weight=300,
-                items=(
-                    NavItem(
-                        name="Namespaces",
-                        weight=100,
-                        link="ipam:namespace_list",
-                        permissions=["ipam.view_namespace"],
-                    ),
-                    NavItem(
-                        name="VRFs",
-                        weight=200,
-                        link="ipam:vrf_list",
-                        permissions=["ipam.view_vrf"],
-                    ),
-                    NavItem(
-                        name="Route Targets",
-                        weight=300,
-                        link="ipam:routetarget_list",
-                        permissions=["ipam.view_routetarget"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Services",
-                weight=400,
-                items=(
-                    NavItem(
-                        name="Services",
-                        weight=100,
-                        link="ipam:service_list",
-                        permissions=["ipam.view_service"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-)

nautobot/ipam/querysets.py

@@ -398,7 +398,7 @@ class IPAddressQuerySet(BaseNetworkQuerySet):
         """
         return super().order_by("host")
 
-    def get_or_create(self, **kwargs):
+    def get_or_create(self, defaults=None, **kwargs):
         from nautobot.ipam.models import get_default_namespace, Prefix
 
         parent = kwargs.get("parent")
@@ -421,7 +421,7 @@ class IPAddressQuerySet(BaseNetworkQuerySet):
                 raise ValidationError(f"{cidr} does not appear to be an IPv4 or IPv6 network.") from err
             parent = Prefix.objects.filter(namespace=namespace).get_closest_parent(cidr=cidr, include_self=True)
             kwargs["parent"] = parent
-        return super().get_or_create(**kwargs)
+        return super().get_or_create(defaults=defaults, **kwargs)
 
     def string_search(self, search):
         """

nautobot/ipam/tables.py

@@ -43,9 +43,11 @@ UTILIZATION_GRAPH = """
 """
 
 
+# record: the Prefix being rendered in this row
+# object: the base ancestor Prefix, in the case of PrefixDetailTable, else None
 PREFIX_COPY_LINK = """
 {% load helpers %}
-{% tree_hierarchy_ui_representation record.ancestors.count|as_range table.hide_hierarchy_ui%}
+{% tree_hierarchy_ui_representation record.ancestors.count|as_range table.hide_hierarchy_ui base_tree_depth|default:0 %}
 <span class="hover_copy">
   <a href="\
 {% if record.present_in_database %}\

nautobot/ipam/templates/ipam/ipaddress.html

@@ -83,15 +83,7 @@
                 <strong>Operational Details</strong>
             </div>
             <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <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>
+                {% include 'inc/tenant_table_row.html' %}
                 <tr>
                     <td>Assignment</td>
                     <td>

nautobot/ipam/templates/ipam/ipaddress_bulk_add.html

@@ -21,12 +21,6 @@
             {% render_field model_form.description %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field model_form.tenant_group %}
-            {% render_field model_form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' with form=model_form %}
 {% endblock %}

nautobot/ipam/templates/ipam/ipaddress_edit.html

@@ -22,13 +22,7 @@
             {% render_field form.description %}
         </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/tenancy_form_panel.html' %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>NAT IP (Inside)</strong></div>
         <div class="panel-body">

nautobot/ipam/templates/ipam/prefix.html

@@ -68,15 +68,7 @@
                             {{ object.get_type_display }}
                         </td>
                     </tr>
-                    <tr>
-                        <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>
+                    {% include 'inc/tenant_table_row.html' %}
                     <tr>
                         <td>Locations</td>
                         <td>

nautobot/ipam/templates/ipam/prefix_edit.html

@@ -29,12 +29,6 @@
             {% render_field form.vlan %}
         </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/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/ipam/templates/ipam/routetarget.html

@@ -1,29 +1 @@
 {% extends 'generic/object_detail.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Route Target</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td>{{ object.name }}</td>
-                </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>{{ object.tenant|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    {% include 'utilities/obj_table.html' with table=importing_vrfs_table table_template='panel_table.html' heading="Importing VRFs" %}
-    {% include 'utilities/obj_table.html' with table=exporting_vrfs_table table_template='panel_table.html' heading="Exporting VRFs" %}
-{% endblock content_right_page %}

nautobot/ipam/templates/ipam/vlan.html

@@ -44,15 +44,7 @@
                         <td>Name</td>
                         <td>{{ object.name }}</td>
                     </tr>
-                    <tr>
-                        <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>
+                    {% include 'inc/tenant_table_row.html' %}
                     <tr>
                         <td>Status</td>
                         <td>

nautobot/ipam/templates/ipam/vlan_edit.html

@@ -19,12 +19,6 @@
             {% render_field form.vlan_group %}
         </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/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/ipam/templates/ipam/vrf.html

@@ -1,48 +1 @@
 {% extends 'generic/object_detail.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>VRF</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Namespace</td>
-                    <td>{{ object.namespace|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Route Distinguisher</td>
-                    <td>{{ object.rd }}</td>
-                </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>{{ object.tenant|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Status</td>
-                    <td>{{ object.status|hyperlinked_object_with_color }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Prefixes</td>
-                    <td>
-                        <a href="{% url 'ipam:prefix_list' %}?vrfs={{ object.pk }}">{{ prefix_count }}</a>
-                    </td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    {% include 'utilities/obj_table.html' with table=import_targets_table table_template='panel_table.html' heading="Import Route Targets" %}
-    {% include 'utilities/obj_table.html' with table=export_targets_table table_template='panel_table.html' heading="Export Route Targets" %}
-{% endblock content_right_page %}
-
-{% block content_full_width_page %}
-	{% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading="Assigned Prefixes" %}
-	{% include 'utilities/obj_table.html' with table=device_table table_template='panel_table.html' heading="Assigned Devices" %}
-{% endblock content_full_width_page %}

nautobot/ipam/templates/ipam/vrf_edit.html

@@ -37,12 +37,6 @@
             {% render_field form.export_targets %}
         </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/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}

nautobot/ipam/tests/test_api.py

@@ -2,6 +2,7 @@ from concurrent.futures.thread import ThreadPoolExecutor
 import json
 from random import shuffle
 from unittest import skip
+import uuid
 
 from django.contrib.contenttypes.models import ContentType
 from django.db import connection
@@ -348,6 +349,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         cls.create_data = [
             {
                 "prefix": "192.168.4.0/24",
+                "network": "192.168.4.0",  # not required, but possible to specify
+                "broadcast": "192.168.4.255",  # not required, but possible to specify
                 "status": cls.status.pk,
                 "rir": rir.pk,
                 "type": choices.PrefixTypeChoices.TYPE_POOL,
@@ -506,7 +509,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
             url, {"prefix_length": "hello", "status": self.status.pk}, format="json", **self.header
         )
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
-        self.assertIn("prefix_length", response.data[0])
+        self.assertIn("prefix_length", response.data)
+        self.assertEqual(response.data["prefix_length"], "This field must be an integer.")
 
     def test_create_multiple_available_prefixes(self):
         """
@@ -1482,6 +1486,15 @@ class VLANGroupTest(APIViewTestCases.APIViewTestCase):
             f"Invalid VLAN Group requested: {some_other_vlan_group}. Only VLAN Group {self.vlan_group} is permitted.",
             response.data["detail"],
         )
+        invalid_id = uuid.uuid4()
+        data[0]["vlan_group"] = invalid_id  # Invalid UUID
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
+        self.assertIn("detail", response.data)
+        self.assertEqual(
+            f"VLAN Group with pk {invalid_id} does not exist.",
+            response.data["detail"],
+        )
 
     def test_create_available_vlans_with_permissions_constraint(self):
         url = reverse("ipam-api:vlangroup-available-vlans", kwargs={"pk": self.vlan_group.pk})
@@ -1703,24 +1716,24 @@ class VLANLocationAssignmentTest(APIViewTestCases.APIViewTestCase):
         # make sure there are 4 locations without vlans 1 and 2 for the create_data below
         for i in range(4):
             cls.locations[i].vlans.set([])
-        locations_without_vlans = cls.locations.exclude(vlans__in=[cls.vlans[0], cls.vlans[1]])
+        locations_without_vlans = cls.locations.filter(vlans__isnull=True)
 
         cls.create_data = [
             {
                 "vlan": cls.vlans[0].pk,
-                "location": locations_without_vlans[1].pk,
+                "location": locations_without_vlans[0].pk,
             },
             {
                 "vlan": cls.vlans[0].pk,
-                "location": locations_without_vlans[2].pk,
+                "location": locations_without_vlans[1].pk,
             },
             {
                 "vlan": cls.vlans[1].pk,
-                "location": locations_without_vlans[3].pk,
+                "location": locations_without_vlans[2].pk,
             },
             {
                 "vlan": cls.vlans[1].pk,
-                "location": locations_without_vlans[4].pk,
+                "location": locations_without_vlans[3].pk,
             },
         ]