nautobot 2.3.13__py3-none-any.whl → 2.3.15__py3-none-any.whl

nautobot/ipam/api/views.py

@@ -227,7 +227,8 @@ class PrefixViewSet(NautobotModelViewSet):
 
                 # Create the new Prefix(es)
                 serializer.is_valid(raise_exception=True)
-                serializer.save()
+                self.perform_create(serializer)
+
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
 
         else:
@@ -318,7 +319,8 @@ class PrefixViewSet(NautobotModelViewSet):
 
                 # Create the new IP address(es)
                 serializer.is_valid(raise_exception=True)
-                serializer.save()
+                self.perform_create(serializer)
+
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
 
         # Determine the maximum number of IPs to return
@@ -396,21 +398,20 @@ class VLANGroupViewSet(NautobotModelViewSet):
     serializer_class = serializers.VLANGroupSerializer
     filterset_class = filters.VLANGroupFilterSet
 
-    def restrict_queryset(self, request, *args, **kwargs):
-        """
-        Apply "view" permissions on the POST /available-vlans/ endpoint, otherwise as ModelViewSetMixin.
-        """
-        if request.user.is_authenticated and self.action == "available_vlans":
-            self.queryset = self.queryset.restrict(request.user, "view")
-        else:
-            super().restrict_queryset(request, *args, **kwargs)
+    @staticmethod
+    def vlan_group_queryset():
+        return (
+            VLANGroup.objects.select_related("location")
+            .prefetch_related("tags")
+            .annotate(vlan_count=count_related(VLAN, "vlan_group"))
+        )
 
     class AvailableVLANPermissions(TokenPermissions):
-        """As nautobot.core.api.authentication.TokenPermissions, but enforcing add_vlan permission."""
+        """As nautobot.core.api.authentication.TokenPermissions, but enforcing `add_vlan` and `view_vlan` permission."""
 
         perms_map = {
-            "GET": ["ipam.view_vlangroup"],
-            "POST": ["ipam.view_vlangroup", "ipam.add_vlan"],
+            "GET": ["ipam.view_vlangroup", "ipam.view_vlan"],
+            "POST": ["ipam.view_vlangroup", "ipam.view_vlan", "ipam.add_vlan"],
         }
 
     @extend_schema(methods=["get"], responses={200: ListSerializer(child=IntegerField())})
@@ -426,6 +427,7 @@ class VLANGroupViewSet(NautobotModelViewSet):
         methods=["get", "post"],
         permission_classes=[AvailableVLANPermissions],
         filterset_class=None,
+        queryset=VLAN.objects.all(),
     )
     def available_vlans(self, request, pk=None):
         """
@@ -433,7 +435,7 @@ class VLANGroupViewSet(NautobotModelViewSet):
         By default, the number of VIDs returned will be equivalent to PAGINATE_COUNT.
         An arbitrary limit (up to MAX_PAGE_SIZE, if set) may be passed, however results will not be paginated.
         """
-        vlan_group = get_object_or_404(self.queryset, pk=pk)
+        vlan_group = get_object_or_404(self.vlan_group_queryset().restrict(user=request.user), pk=pk)
 
         if request.method == "POST":
             with cache.lock(
@@ -509,7 +511,7 @@ class VLANGroupViewSet(NautobotModelViewSet):
 
                 # Create the new VLANs
                 serializer.is_valid(raise_exception=True)
-                serializer.save()
+                self.perform_create(serializer)
 
                 data = serializer.data
 

nautobot/ipam/models.py

@@ -531,8 +531,32 @@ class Prefix(PrimaryModel):
         prefix = kwargs.pop("prefix", None)
         self._location = kwargs.pop("location", None)
         super().__init__(*args, **kwargs)
+
+        # Initialize cached fields
+        self._parent = None
+        self._network = None
+        self._prefix_length = None
+        self._namespace_id = None
+
         self._deconstruct_prefix(prefix)
 
+    @staticmethod
+    def _extract_field_value(field_name, field_names, values):
+        for current_field, field_value in zip(field_names, values):
+            if field_name == current_field:
+                return field_value
+        return None
+
+    @classmethod
+    def from_db(cls, db, field_names, values):
+        instance = super().from_db(db, field_names, values)
+        # These cached values are used to detect changes during save,
+        # avoiding unnecessary re-parenting of subnets and IPs if these fields have not been updated.
+        instance._network = cls._extract_field_value("network", field_names, values)
+        instance._prefix_length = cls._extract_field_value("prefix_length", field_names, values)
+        instance._namespace_id = cls._extract_field_value("namespace_id", field_names, values)
+        return instance
+
     def __str__(self):
         return str(self.prefix)
 
@@ -612,6 +636,23 @@ class Prefix(PrimaryModel):
             protected_objects.update(parent=self.parent)
             return super().delete(*args, **kwargs)
 
+    def get_parent(self):
+        # Determine if a parent exists and set it to the closest ancestor by `prefix_length`.
+        if self._parent is not None:
+            return self._parent
+
+        if supernets := self.supernets():
+            parent = max(supernets, key=operator.attrgetter("prefix_length"))
+            self._parent = parent
+            return parent
+        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):
             # Clear host bits from prefix
@@ -619,11 +660,7 @@ class Prefix(PrimaryModel):
             # which will (re)set the broadcast and ip_version values of this instance to their correct values.
             self.prefix = self.prefix.cidr
 
-        # Determine if a parent exists and set it to the closest ancestor by `prefix_length`.
-        supernets = self.supernets()
-        if supernets:
-            parent = max(supernets, key=operator.attrgetter("prefix_length"))
-            self.parent = parent
+        self.parent = self.get_parent()
 
         # Validate that creation of this prefix does not create an invalid parent/child relationship
         # 3.0 TODO: uncomment this to enforce this constraint
@@ -655,15 +692,26 @@ class Prefix(PrimaryModel):
         #     )
         #     raise ValidationError({"__all__": err_msg})
 
+        # cache the value of present_in_database; because after `super().save()`
+        # `self.present_in_database` would always return True`
+        present_in_database = self.present_in_database
+
         with transaction.atomic():
             super().save(*args, **kwargs)
             if self._location is not None:
                 self.location = self._location
 
-        # Determine the subnets and reparent them to this prefix.
-        self.reparent_subnets()
-        # Determine the child IPs and reparent them to this prefix.
-        self.reparent_ips()
+        # Only reparent subnets and ips if any of these fields has been updated.
+        if (
+            not present_in_database
+            or self._network != self.network
+            or self._namespace_id != self.namespace_id
+            or self._prefix_length != self.prefix_length
+        ):
+            # Determine the subnets and reparent them to this prefix.
+            self.reparent_subnets()
+            # Determine the child IPs and reparent them to this prefix.
+            self.reparent_ips()
 
     @property
     def cidr_str(self):
@@ -739,6 +787,7 @@ class Prefix(PrimaryModel):
         Returns:
             QuerySet
         """
+
         query = Prefix.objects.all()
 
         if for_update:
@@ -750,7 +799,7 @@ class Prefix(PrimaryModel):
         if not include_self:
             query = query.exclude(id=self.id)
 
-        return query.filter(
+        supernets = query.filter(
             ip_version=self.ip_version,
             prefix_length__lte=self.prefix_length,
             network__lte=self.network,
@@ -758,6 +807,8 @@ class Prefix(PrimaryModel):
             namespace=self.namespace,
         )
 
+        return supernets
+
     def subnets(self, direct=False, include_self=False, for_update=False):
         """
         Return subnets of this Prefix.
@@ -867,7 +918,7 @@ class Prefix(PrimaryModel):
         Return all available IPs within this prefix as an IPSet.
         """
         prefix = netaddr.IPSet(self.prefix)
-        child_ips = netaddr.IPSet([ip.address.ip for ip in self.ip_addresses.all()])
+        child_ips = netaddr.IPSet([ip.address.ip for ip in self.get_all_ips()])
         available_ips = prefix - child_ips
 
         # IPv6, pool, or IPv4 /31-32 sets are fully usable

nautobot/ipam/tables.py

@@ -404,7 +404,7 @@ class PrefixDetailTable(PrefixTable):
             "type",
             "status",
             "children",
-            # "vrf",
+            "vrf_count",
             "utilization",
             "tenant",
             "location_count",
@@ -420,7 +420,7 @@ class PrefixDetailTable(PrefixTable):
             "type",
             "status",
             "children",
-            # "vrf",
+            "vrf_count",
             "utilization",
             "tenant",
             "location_count",