nautobot 2.2.0b1__py3-none-any.whl → 2.2.1__py3-none-any.whl

nautobot/ipam/api/views.py

@@ -6,7 +6,6 @@ from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.exceptions import APIException
 from rest_framework.response import Response
-from rest_framework.routers import APIRootView
 
 from nautobot.core.models.querysets import count_related
 from nautobot.core.utils.config import get_settings_or_config
@@ -32,16 +31,6 @@ from nautobot.ipam.models import (
 
 from . import serializers
 
-
-class IPAMRootView(APIRootView):
-    """
-    IPAM API root view
-    """
-
-    def get_view_name(self):
-        return "IPAM"
-
-
 #
 # Namespace
 #

nautobot/ipam/apps.py

@@ -5,10 +5,11 @@ class IPAMConfig(NautobotConfig):
     name = "nautobot.ipam"
     verbose_name = "IPAM"
     searchable_models = [
-        "vrf",
-        "prefix",
         "ipaddress",
+        "namespace",
+        "prefix",
         "vlan",
+        "vrf",
     ]
 
     def ready(self):

nautobot/ipam/tables.py

@@ -42,28 +42,10 @@ UTILIZATION_GRAPH = """
 {% if record.present_in_database %}{% utilization_graph record.get_utilization %}{% else %}—{% endif %}
 """
 
-PREFIX_LINK = """
-{% load helpers %}
-{% for i in record.ancestors.count|as_range %}
-    <i class="mdi mdi-circle-small"></i>
-{% endfor %}
-    <a href="\
-{% if record.present_in_database %}\
-{% url 'ipam:prefix' pk=record.pk %}\
-{% else %}\
-{% url 'ipam:prefix_add' %}\
-?prefix={{ record }}&namespace={{ object.namespace.pk }}\
-{% for loc in object.locations.all %}&locations={{ loc.pk }}{% endfor %}\
-{% if object.tenant %}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}{% endif %}\
-{% endif %}\
-">{{ record.prefix }}</a>
-"""
 
 PREFIX_COPY_LINK = """
 {% load helpers %}
-{% for i in record.ancestors.count|as_range %}
-    <i class="mdi mdi-circle-small"></i>
-{% endfor %}
+{% tree_hierarchy_ui_representation record.ancestors.count|as_range table.hide_hierarchy_ui%}
 <span class="hover_copy">
   <a href="\
 {% if record.present_in_database %}\
@@ -179,7 +161,6 @@ VLAN_LINK = """
 {% url 'ipam:vlan_add' %}\
 ?vid={{ record.vid }}&vlan_group={{ vlan_group.pk }}\
 {% if vlan_group.location %}&location={{ vlan_group.location.pk }}{% endif %}\
-{% if vlan_group.location %}&location={{ vlan_group.location.pk }}{% endif %}\
 " class="btn btn-xs btn-success">{{ record.available }} VLAN{{ record.available|pluralize }} available</a>\
 {% else %}
     {{ record.available }} VLAN{{ record.available|pluralize }} available
@@ -369,7 +350,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     namespace = tables.Column(linkify=True)
     vlan = tables.Column(linkify=True, verbose_name="VLAN")
     rir = tables.Column(linkify=True)
-    children = tables.Column(accessor="descendants_count")
+    children = tables.Column(accessor="descendants_count", orderable=False)
     date_allocated = tables.DateTimeColumn()
     location_count = LinkedCountColumn(
         viewname="dcim:location_list", url_params={"prefixes": "pk"}, verbose_name="Locations"
@@ -377,7 +358,6 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Prefix
-        orderable = False
         fields = (
             "pk",
             "prefix",

nautobot/ipam/tests/test_graphql.py

@@ -1,4 +1,3 @@
-from django.test import override_settings
 from django.urls import reverse
 from rest_framework import status
 
@@ -9,8 +8,8 @@ class TestPrefix(APITestCase):
     def setUp(self):
         super().setUp()
         self.api_url = reverse("graphql-api")
+        self.add_permissions("ipam.view_prefix")
 
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_prefix_ip_version(self):
         """Test ip_version is available for a Prefix via GraphQL."""
         get_prefixes_query = """
@@ -23,7 +22,7 @@ class TestPrefix(APITestCase):
         }
         """
         payload = {"query": get_prefixes_query}
-        response = self.client.post(self.api_url, payload, format="json")
+        response = self.client.post(self.api_url, payload, format="json", **self.header)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         prefixes = response.data["data"]["prefixes"]
         self.assertIsInstance(prefixes, list)

nautobot/ipam/tests/test_tables.py

@@ -0,0 +1,42 @@
+from django.test import TestCase
+
+from nautobot.core.models.querysets import count_related
+from nautobot.dcim.models.locations import Location
+from nautobot.ipam.models import Prefix
+from nautobot.ipam.tables import PrefixTable
+
+
+class PrefixTableTestCase(TestCase):
+    def _validate_sorted_queryset_same_with_table_queryset(self, queryset, table_class, field_name):
+        with self.subTest(f"Assert sorting {table_class.__name__} on '{field_name}'"):
+            table = table_class(queryset, order_by=field_name)
+            table_queryset_data = table.data.data.values_list("pk", flat=True)
+            sorted_queryset = queryset.order_by(field_name).values_list("pk", flat=True)
+            self.assertEqual(list(table_queryset_data), list(sorted_queryset))
+
+    def test_prefix_table_sort(self):
+        """Assert TreeNode model table are orderable."""
+        # Due to MySQL's lack of support for combining 'LIMIT' and 'ORDER BY' in a single query,
+        # hence this approach.
+        pk_list = Prefix.objects.all().values_list("pk", flat=True)[:20]
+        pk_list = [str(pk) for pk in pk_list]
+        queryset = Prefix.objects.filter(pk__in=pk_list)
+
+        # Assets model names
+        table_avail_fields = ["tenant", "vlan", "namespace"]
+        for table_field_name in table_avail_fields:
+            self._validate_sorted_queryset_same_with_table_queryset(queryset, PrefixTable, table_field_name)
+            self._validate_sorted_queryset_same_with_table_queryset(queryset, PrefixTable, f"-{table_field_name}")
+
+        # Assert `prefix`
+        table_queryset_data = PrefixTable(queryset, order_by="prefix").data.data.values_list("pk", flat=True)
+        prefix_queryset = queryset.order_by("network", "prefix_length").values_list("pk", flat=True)
+        self.assertEqual(list(table_queryset_data), list(prefix_queryset))
+        table_queryset_data = PrefixTable(queryset, order_by="-prefix").data.data.values_list("pk", flat=True)
+        prefix_queryset = queryset.order_by("-network", "-prefix_length").values_list("pk", flat=True)
+        self.assertEqual(list(table_queryset_data), list(prefix_queryset))
+
+        # Assets `location_count`
+        location_count_queryset = queryset.annotate(location_count=count_related(Location, "prefixes")).all()
+        self._validate_sorted_queryset_same_with_table_queryset(location_count_queryset, PrefixTable, "location_count")
+        self._validate_sorted_queryset_same_with_table_queryset(location_count_queryset, PrefixTable, "-location_count")

nautobot/ipam/tests/test_views.py

@@ -126,6 +126,7 @@ class RIRTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 
 class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase, ViewTestCases.ListObjectsViewTestCase):
     model = Prefix
+    filter_on_field = "prefix_length"
 
     @classmethod
     def setUpTestData(cls):

nautobot/ipam/views.py

@@ -793,7 +793,7 @@ class IPAddressEditView(generic.ObjectEditView):
             _, error_msg = retrieve_interface_or_vminterface_from_request(request)
             if error_msg:
                 messages.warning(request, error_msg)
-                return redirect(self.get_return_url(request), default_return_url="ipam:ipaddress_add")
+                return redirect(self.get_return_url(request, default_return_url="ipam:ipaddress_add"))
 
         return super().dispatch(request, *args, **kwargs)
 
@@ -876,17 +876,17 @@ class IPAddressAssignView(view_mixins.GetReturnURLMixin, generic.ObjectView):
     """
 
     queryset = IPAddress.objects.all()
-    default_return_url = "ipam:ipaddress_add"
 
     def dispatch(self, request, *args, **kwargs):
-        # Redirect user if an interface has not been provided
-        if "interface" not in request.GET and "vminterface" not in request.GET:
-            return redirect(self.get_return_url(request))
+        if request.user.is_authenticated:
+            # Redirect user if an interface has not been provided
+            if "interface" not in request.GET and "vminterface" not in request.GET:
+                return redirect(self.get_return_url(request, default_return_url="ipam:ipaddress_add"))
 
-        _, error_msg = retrieve_interface_or_vminterface_from_request(request)
-        if error_msg:
-            messages.warning(request, error_msg)
-            return redirect(self.get_return_url(request))
+            _, error_msg = retrieve_interface_or_vminterface_from_request(request)
+            if error_msg:
+                messages.warning(request, error_msg)
+                return redirect(self.get_return_url(request, default_return_url="ipam:ipaddress_add"))
 
         return super().dispatch(request, *args, **kwargs)
 

nautobot/project-static/css/base.css

@@ -27,6 +27,7 @@ body {
     transition-duration: var(--navbar-transition-duration);
     transition-timing-function: ease-in-out;
     transition-property: margin-left, width;
+    min-height: calc(100vh - 20px);
 }
 #main-content > .form {
     margin-top: 20px;