nautobot 2.1.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/ipam/fields.py

@@ -2,8 +2,8 @@ from django.core.exceptions import ValidationError
 from django.db import models
 import netaddr
 
-from .formfields import IPNetworkFormField
 from . import lookups
+from .formfields import IPNetworkFormField
 
 
 class VarbinaryIPField(models.BinaryField):

nautobot/ipam/filters.py

@@ -1,8 +1,9 @@
-import django_filters
-import netaddr
+import contextlib
+
 from django.core.exceptions import ValidationError
 from django.db.models import Q
-from netaddr.core import AddrFormatError
+import django_filters
+import netaddr
 
 from nautobot.core.filters import (
     MultiValueCharFilter,
@@ -20,6 +21,7 @@ from nautobot.extras.filters import NautobotFilterSet, RoleModelFilterSetMixin,
 from nautobot.ipam import choices
 from nautobot.tenancy.filters import TenancyModelFilterSetMixin
 from nautobot.virtualization.models import VirtualMachine, VMInterface
+
 from .models import (
     IPAddress,
     IPAddressToInterface,
@@ -33,7 +35,6 @@ from .models import (
     VRF,
 )
 
-
 __all__ = (
     "IPAddressFilterSet",
     "NamespaceFilterSet",
@@ -158,19 +159,19 @@ class PrefixFilterSet(
     parent = django_filters.ModelMultipleChoiceFilter(
         queryset=Prefix.objects.all(),
     )
-    prefix = django_filters.CharFilter(
+    prefix = MultiValueCharFilter(
         method="filter_prefix",
         label="Prefix",
     )
-    within = django_filters.CharFilter(
+    within = MultiValueCharFilter(
         method="search_within",
         label="Within prefix",
     )
-    within_include = django_filters.CharFilter(
+    within_include = MultiValueCharFilter(
         method="search_within_include",
         label="Within and including prefix",
     )
-    contains = django_filters.CharFilter(
+    contains = MultiValueCharFilter(
         method="search_contains",
         label="Prefixes which contain this prefix or IP",
     )
@@ -221,54 +222,43 @@ class PrefixFilterSet(
         model = Prefix
         fields = ["date_allocated", "id", "prefix_length", "tags"]
 
+    def _strip_values(self, values):
+        return [value.strip() for value in values if value.strip()]
+
     def filter_prefix(self, queryset, name, value):
-        value = value.strip()
-        if not value:
-            return queryset
-        # filter for Prefix models equal to |value|
-        try:
-            return queryset.net_equals(netaddr.IPNetwork(value))
-        except (AddrFormatError, ValueError):
-            return queryset.none()
+        prefixes = self._strip_values(value)
+        with contextlib.suppress(netaddr.AddrFormatError, ValueError):
+            return queryset.net_equals(*prefixes)
+        return queryset.none()
 
     def search_within(self, queryset, name, value):
-        value = value.strip()
-        if not value:
-            return queryset
-        try:
-            return queryset.net_contained(netaddr.IPNetwork(value))
-        except (AddrFormatError, ValueError):
-            return queryset.none()
+        prefixes = self._strip_values(value)
+        with contextlib.suppress(netaddr.AddrFormatError, ValueError):
+            return queryset.net_contained(*prefixes)
+        return queryset.none()
 
     def search_within_include(self, queryset, name, value):
-        value = value.strip()
-        if not value:
-            return queryset
-        try:
-            return queryset.net_contained_or_equal(netaddr.IPNetwork(value))
-        except (AddrFormatError, ValueError):
-            return queryset.none()
+        prefixes = self._strip_values(value)
+        with contextlib.suppress(netaddr.AddrFormatError, ValueError):
+            return queryset.net_contained_or_equal(*prefixes)
+        return queryset.none()
 
     def search_contains(self, queryset, name, value):
-        value = value.strip()
-        if not value:
-            return queryset
-        try:
-            # Searching by prefix
-            if "/" in value:
-                return queryset.net_contains_or_equals(netaddr.IPNetwork(value).cidr)
-            # Searching by IP address
-            else:
-                # filter for Prefixes containing |value|
-                # netaddr.IPAddress objects have no netmask
-                # so prefix_length is not considered
-                query = netaddr.IPAddress(value)
-                return queryset.filter(
-                    network__lte=bytes(query),
-                    broadcast__gte=bytes(query),
-                )
-        except (AddrFormatError, ValueError):
-            return queryset.none()
+        prefixes_queryset = queryset.none()
+        values = self._strip_values(value)
+
+        if prefixes := [prefix for prefix in values if "/" in prefix]:
+            with contextlib.suppress(netaddr.AddrFormatError, ValueError):
+                prefixes_queryset |= queryset.net_contains_or_equals(*prefixes)
+
+        if prefixes_without_length := [prefix for prefix in values if "/" not in prefix]:
+            query = Q()
+            for _prefix in prefixes_without_length:
+                with contextlib.suppress(netaddr.AddrFormatError, ValueError):
+                    prefix = netaddr.IPAddress(_prefix)
+                    query |= Q(network__lte=bytes(prefix), broadcast__gte=bytes(prefix))
+            prefixes_queryset |= queryset.filter(query)
+        return prefixes_queryset
 
     def generate_query_filter_present_in_vrf(self, value):
         if isinstance(value, str):
@@ -295,7 +285,7 @@ class IPAddressFilterSet(
         queryset=Prefix.objects.all(),
         label="Parent prefix",
     )
-    prefix = django_filters.CharFilter(
+    prefix = MultiValueCharFilter(
         method="search_by_prefix",
         label="Contained in prefix",
     )
@@ -383,14 +373,8 @@ class IPAddressFilterSet(
         return queryset.filter(params)
 
     def search_by_prefix(self, queryset, name, value):
-        value = value.strip()
-        if not value:
-            return queryset
-        try:
-            query = netaddr.IPNetwork(value.strip()).cidr
-            return queryset.net_host_contained(query)
-        except (AddrFormatError, ValueError):
-            return queryset.none()
+        prefixes = [prefix.strip() for prefix in value if prefix.strip()]
+        return queryset.net_host_contained(*prefixes)
 
     def filter_address(self, queryset, name, value):
         try:

nautobot/ipam/formfields.py

@@ -1,8 +1,7 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_ipv4_address, validate_ipv6_address
-from netaddr import IPAddress, IPNetwork, AddrFormatError
-
+from netaddr import AddrFormatError, IPAddress, IPNetwork
 
 #
 # Form fields

nautobot/ipam/forms.py

@@ -24,8 +24,8 @@ from nautobot.dcim.form_mixins import (
 from nautobot.dcim.models import Device, Location, Rack
 from nautobot.extras.forms import (
     NautobotBulkEditForm,
-    NautobotModelForm,
     NautobotFilterForm,
+    NautobotModelForm,
     RoleModelBulkEditFormMixin,
     RoleModelFilterFormMixin,
     StatusModelBulkEditFormMixin,
@@ -35,10 +35,11 @@ from nautobot.extras.forms import (
 from nautobot.tenancy.forms import TenancyFilterForm, TenancyForm
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster, VirtualMachine
-from .choices import IPAddressVersionChoices, IPAddressTypeChoices, ServiceProtocolChoices, PrefixTypeChoices
+
+from .choices import IPAddressTypeChoices, IPAddressVersionChoices, PrefixTypeChoices, ServiceProtocolChoices
 from .constants import (
-    IPADDRESS_MASK_LENGTH_MIN,
     IPADDRESS_MASK_LENGTH_MAX,
+    IPADDRESS_MASK_LENGTH_MIN,
     PREFIX_LENGTH_MAX,
     PREFIX_LENGTH_MIN,
     SERVICE_PORT_MAX,
@@ -72,7 +73,7 @@ IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice(
 class NamespaceForm(LocatableModelFormMixin, NautobotModelForm):
     class Meta:
         model = Namespace
-        fields = ["name", "description", "location"]
+        fields = ["name", "description", "location", "tags"]
 
 
 class NamespaceBulkEditForm(

nautobot/ipam/graphql/types.py

@@ -2,7 +2,7 @@ import graphene
 
 from nautobot.core.graphql.types import OptimizedNautobotObjectType
 from nautobot.extras.models import DynamicGroup
-from nautobot.ipam import models, filters
+from nautobot.ipam import filters, models
 
 
 class IPAddressType(OptimizedNautobotObjectType):

nautobot/ipam/homepage.py

@@ -1,7 +1,6 @@
 from nautobot.core.apps import HomePageItem, HomePagePanel
 from nautobot.ipam.models import IPAddress, Prefix, VLAN, VRF
 
-
 layout = (
     HomePagePanel(
         name="IPAM",

nautobot/ipam/lookups.py

@@ -1,7 +1,6 @@
-import netaddr
-from django.db import NotSupportedError
-from django.db import connection as _connection
+from django.db import connection as _connection, NotSupportedError
 from django.db.models import Lookup, lookups
+import netaddr
 
 
 def _mysql_varbin_to_broadcast():

nautobot/ipam/migrations/0002_initial_part_2.py

@@ -2,9 +2,10 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import nautobot.extras.models.statuses
 import taggit.managers
 
+import nautobot.extras.models.statuses
+
 
 class Migration(migrations.Migration):
     initial = True

nautobot/ipam/migrations/0003_remove_max_length.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.8 on 2021-05-14 19:58
 
 from django.db import migrations
+
 import nautobot.ipam.fields
 
 

nautobot/ipam/migrations/0004_fixup_p2p_broadcast.py

@@ -1,5 +1,4 @@
 from django.db import migrations
-
 import netaddr
 
 

nautobot/ipam/migrations/0005_auto_slug.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.13 on 2021-08-05 19:24
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/ipam/migrations/0010_alter_ipam_role_add_new_role.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 import django.db.models.deletion
+
 import nautobot.extras.models.roles
 
 

nautobot/ipam/migrations/0011_migrate_ipam_role_data.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.16 on 2022-11-23 12:27
 
 from django.db import migrations
+
 from nautobot.extras.utils import migrate_role_data
 from nautobot.ipam.choices import IPAddressRoleChoices
 

nautobot/ipam/migrations/0020_related_name_changes.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 import django.db.models.deletion
+
 import nautobot.extras.models.roles
 import nautobot.extras.models.statuses
 

nautobot/ipam/migrations/0022_aggregate_to_prefix_data_migration.py

@@ -8,8 +8,7 @@ from django.utils.timezone import make_aware
 from nautobot.core.models.managers import TagsManager
 from nautobot.core.models.utils import serialize_object
 from nautobot.core.utils.migrations import update_object_change_ct_for_replaced_models
-from nautobot.extras import choices as extras_choices
-from nautobot.extras import models as extras_models
+from nautobot.extras import choices as extras_choices, models as extras_models
 from nautobot.extras.constants import CHANGELOG_MAX_OBJECT_REPR
 from nautobot.ipam.choices import PrefixTypeChoices
 

nautobot/ipam/migrations/0024_interface_to_ipaddress_m2m.py

@@ -1,8 +1,9 @@
 # Generated by Django 3.2.18 on 2023-03-07 16:02
 
+import uuid
+
 from django.db import migrations, models
 import django.db.models.deletion
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/ipam/migrations/0025_interface_ipaddress_m2m_data_migration.py

@@ -1,3 +1,5 @@
+from contextlib import suppress
+
 from django.db import migrations
 
 
@@ -7,22 +9,22 @@ def migrate_ipaddress_to_m2m(apps, schema_editor):
     Interface = apps.get_model("dcim", "Interface")
     VMInterface = apps.get_model("virtualization", "VMInterface")
 
-    for ip_address in IPAddress.objects.filter(assigned_object_id__isnull=False):
+    for ip_address in IPAddress.objects.filter(assigned_object_id__isnull=False, assigned_object_type__isnull=False):
         related_ct = ip_address.assigned_object_type
         if related_ct.app_label == "dcim" and related_ct.model == "interface":
-            related_obj = Interface.objects.get(id=ip_address.assigned_object_id)
-            IPAddressToInterface.objects.create(
-                ip_address=ip_address,
-                interface=related_obj,
-            )
+            with suppress(Interface.DoesNotExist):
+                related_obj = Interface.objects.get(id=ip_address.assigned_object_id)
+                IPAddressToInterface.objects.create(
+                    ip_address=ip_address,
+                    interface=related_obj,
+                )
         elif related_ct.app_label == "virtualization" and related_ct.model == "vminterface":
-            related_obj = VMInterface.objects.get(id=ip_address.assigned_object_id)
-            IPAddressToInterface.objects.create(
-                ip_address=ip_address,
-                vm_interface=related_obj,
-            )
-        else:
-            continue
+            with suppress(VMInterface.DoesNotExist):
+                related_obj = VMInterface.objects.get(id=ip_address.assigned_object_id)
+                IPAddressToInterface.objects.create(
+                    ip_address=ip_address,
+                    vm_interface=related_obj,
+                )
 
 
 class Migration(migrations.Migration):

nautobot/ipam/migrations/0028_tagsfield.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-04-21 13:59
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/ipam/migrations/0030_ipam__namespaces.py

@@ -1,11 +1,13 @@
 # Generated by Django 3.2.18 on 2023-03-14 21:24
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.extras.models.mixins
 import nautobot.ipam.models
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/ipam/migrations/0034_status_nonnullable.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 import django.db.models.deletion
+
 import nautobot.extras.models.statuses
 
 

nautobot/ipam/migrations/0037_data_migration_vlan_group_name_uniqueness.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 from nautobot.ipam.utils.migrations import increment_names_of_records_with_similar_names
 
-
 DEFAULT_VLAN_GROUP_BASENAME = "Default VLAN Group"
 
 

nautobot/ipam/migrations/0039_alter_ipaddresstointerface_ip_address.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.23 on 2023-12-01 14:09
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipam", "0038_vlan_group_name_unique_remove_slug"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ipaddresstointerface",
+            name="ip_address",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, related_name="interface_assignments", to="ipam.ipaddress"
+            ),
+        ),
+    ]

nautobot/ipam/models.py

@@ -1,13 +1,13 @@
 import logging
 import operator
 
-import netaddr
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError, MultipleObjectsReturned
+from django.core.exceptions import MultipleObjectsReturned, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import Q
 from django.utils.functional import cached_property
+import netaddr
 
 from nautobot.core.models import BaseManager, BaseModel
 from nautobot.core.models.fields import JSONArrayField
@@ -19,11 +19,11 @@ from nautobot.extras.models import RoleField, StatusField
 from nautobot.extras.utils import extras_features
 from nautobot.ipam import choices, constants
 from nautobot.virtualization.models import VMInterface
+
 from .fields import VarbinaryIPField
 from .querysets import IPAddressQuerySet, PrefixQuerySet, RIRQuerySet
 from .validators import DNSValidator
 
-
 __all__ = (
     "IPAddress",
     "Prefix",
@@ -101,10 +101,10 @@ class VRF(PrimaryModel):
     """
 
     name = models.CharField(max_length=100, db_index=True)
-    rd = models.CharField(
+    rd = models.CharField(  # noqa: DJ001  # django-nullable-model-string-field -- see below
         max_length=constants.VRF_RD_MAX_LENGTH,
         blank=True,
-        null=True,
+        null=True,  # because rd is optional but part of a uniqueness constraint
         verbose_name="Route distinguisher",
         help_text="Unique route distinguisher (as defined in RFC 4364)",
     )
@@ -266,10 +266,10 @@ class VRFDeviceAssignment(BaseModel):
     virtual_machine = models.ForeignKey(
         "virtualization.VirtualMachine", null=True, blank=True, on_delete=models.CASCADE, related_name="vrf_assignments"
     )
-    rd = models.CharField(
+    rd = models.CharField(  # noqa: DJ001  # django-nullable-model-string-field -- see below
         max_length=constants.VRF_RD_MAX_LENGTH,
         blank=True,
-        null=True,
+        null=True,  # because rd is optional but (will be) part of a uniqueness constraint
         verbose_name="Route distinguisher",
         help_text="Unique route distinguisher (as defined in RFC 4364)",
     )
@@ -1050,6 +1050,9 @@ class IPAddress(PrimaryModel):
         if namespace is None and self.parent is not None:
             namespace = self.parent.namespace
 
+        if namespace is None:
+            namespace = get_default_namespace()
+
         self._namespace = namespace
 
         self._deconstruct_address(address)
@@ -1193,7 +1196,7 @@ class IPAddress(PrimaryModel):
 
 @extras_features("graphql")
 class IPAddressToInterface(BaseModel):
-    ip_address = models.ForeignKey("ipam.IPAddress", on_delete=models.CASCADE, related_name="+")
+    ip_address = models.ForeignKey("ipam.IPAddress", on_delete=models.CASCADE, related_name="interface_assignments")
     interface = models.ForeignKey(
         "dcim.Interface", blank=True, null=True, on_delete=models.CASCADE, related_name="ip_address_assignments"
     )

nautobot/ipam/navigation.py

@@ -8,7 +8,6 @@ from nautobot.core.apps import (
     NavMenuTab,
 )
 
-
 menu_items = (
     NavMenuTab(
         name="IPAM",

nautobot/ipam/querysets.py

@@ -1,8 +1,8 @@
 import re
 
-import netaddr
 from django.core.exceptions import ValidationError
 from django.db.models import ProtectedError, Q
+import netaddr
 
 from nautobot.core.models.querysets import RestrictedQuerySet
 from nautobot.core.utils.data import merge_dicts_without_collision
@@ -187,50 +187,50 @@ class BaseNetworkQuerySet(RestrictedQuerySet):
 
         return self.filter(the_filter)
 
+    def _build_prefix_and_last_ip(self, ip):
+        if isinstance(ip, str):
+            ip = netaddr.IPNetwork(ip)
+        last_ip = self._get_last_ip(ip)
+        return ip, last_ip
+
 
 class PrefixQuerySet(BaseNetworkQuerySet):
     """Queryset for `Prefix` objects."""
 
-    def net_equals(self, prefix):
-        prefix = netaddr.IPNetwork(prefix)
-        last_ip = self._get_last_ip(prefix)
-        return self.filter(prefix_length=prefix.prefixlen, network=prefix.network, broadcast=last_ip)
-
-    def net_contained(self, prefix):
-        prefix = netaddr.IPNetwork(prefix)
-        last_ip = self._get_last_ip(prefix)
-        return self.filter(
-            prefix_length__gt=prefix.prefixlen,
-            network__gte=prefix.network,
-            broadcast__lte=last_ip,
-        )
-
-    def net_contained_or_equal(self, prefix):
-        prefix = netaddr.IPNetwork(prefix)
-        last_ip = self._get_last_ip(prefix)
-        return self.filter(
-            prefix_length__gte=prefix.prefixlen,
-            network__gte=prefix.network,
-            broadcast__lte=last_ip,
-        )
-
-    def net_contains(self, prefix):
-        prefix = netaddr.IPNetwork(prefix)
-        last_ip = self._get_last_ip(prefix)
-        return self.filter(
-            prefix_length__lt=prefix.prefixlen,
-            network__lte=prefix.network,
-            broadcast__gte=last_ip,
-        )
-
-    def net_contains_or_equals(self, prefix):
-        prefix = netaddr.IPNetwork(prefix)
-        last_ip = self._get_last_ip(prefix)
-        return self.filter(
-            prefix_length__lte=prefix.prefixlen,
-            network__lte=prefix.network,
-            broadcast__gte=last_ip,
-        )
+    def net_equals(self, *prefixes):
+        query = Q()
+        for prefix in prefixes:
+            prefix, last_ip = self._build_prefix_and_last_ip(prefix)
+            query |= Q(prefix_length=prefix.prefixlen, network=prefix.network, broadcast=last_ip)
+        return self.filter(query) if query else self.none()
+
+    def net_contained(self, *prefixes):
+        query = Q()
+        for prefix in prefixes:
+            prefix, last_ip = self._build_prefix_and_last_ip(prefix)
+            query |= Q(prefix_length__gt=prefix.prefixlen, network__gte=prefix.network, broadcast__lte=last_ip)
+        return self.filter(query) if query else self.none()
+
+    def net_contained_or_equal(self, *prefixes):
+        query = Q()
+        for prefix in prefixes:
+            prefix, last_ip = self._build_prefix_and_last_ip(prefix)
+            query |= Q(prefix_length__gte=prefix.prefixlen, network__gte=prefix.network, broadcast__lte=last_ip)
+        return self.filter(query) if query else self.none()
+
+    def net_contains(self, *prefixes):
+        query = Q()
+        for prefix in prefixes:
+            prefix, last_ip = self._build_prefix_and_last_ip(prefix)
+            query |= Q(prefix_length__lt=prefix.prefixlen, network__lte=prefix.network, broadcast__gte=last_ip)
+        return self.filter(query) if query else self.none()
+
+    def net_contains_or_equals(self, *prefixes):
+        query = Q()
+        for prefix in prefixes:
+            prefix, last_ip = self._build_prefix_and_last_ip(prefix)
+            query |= Q(prefix_length__lte=prefix.prefixlen, network__lte=prefix.network, broadcast__gte=last_ip)
+        return self.filter(query) if query else self.none()
 
     def get(self, *args, **kwargs):
         """
@@ -305,7 +305,7 @@ class PrefixQuerySet(BaseNetworkQuerySet):
             return super().delete(*args, **kwargs)
         except ProtectedError as err:
             # This will be either IPAddress or Prefix.
-            protected_instance = tuple(err.protected_objects)[0]
+            protected_instance = next(iter(err.protected_objects))
             protected_model = protected_instance._meta.model
             protected_parent = protected_instance.parent
             new_parent = protected_parent.parent_id
@@ -422,15 +422,14 @@ class IPAddressQuerySet(BaseNetworkQuerySet):
 
         return self.filter(the_filter)
 
-    def net_host_contained(self, network):
+    def net_host_contained(self, *networks):
         # consider only host ip address when
         # filtering for membership in |network|
-        network = netaddr.IPNetwork(network)
-        last_ip = self._get_last_ip(network)
-        return self.filter(
-            host__lte=last_ip,
-            host__gte=network.network,
-        )
+        query = Q()
+        for ip in networks:
+            ip, last_ip = self._build_prefix_and_last_ip(ip)
+            query |= Q(host__lte=last_ip, host__gte=ip.network)
+        return self.filter(query) if query else self.none()
 
     def net_in(self, networks):
         # for a tuple of IP addresses, filter queryset for matches.