nautobot 2.2.8__py3-none-any.whl → 2.3.0__py3-none-any.whl

nautobot/ipam/__init__.py

@@ -1 +0,0 @@
-default_app_config = "nautobot.ipam.apps.IPAMConfig"

nautobot/ipam/apps.py

@@ -2,6 +2,7 @@ from nautobot.core.apps import NautobotConfig
 
 
 class IPAMConfig(NautobotConfig):
+    default = True
     name = "nautobot.ipam"
     verbose_name = "IPAM"
     searchable_models = [

nautobot/ipam/factory.py

@@ -6,6 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 import factory
 import faker
 
+from nautobot.core.constants import CHARFIELD_MAX_LENGTH
 from nautobot.core.factory import (
     get_random_instances,
     NautobotBoolIterator,
@@ -36,7 +37,7 @@ class RIRFactory(OrganizationalModelFactory):
     is_private = factory.LazyAttribute(lambda rir: rir.name.startswith("RFC"))
 
     has_description = NautobotBoolIterator()
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
 
 def random_route_distinguisher():
@@ -72,7 +73,7 @@ class RouteTargetFactory(PrimaryModelFactory):
     name = factory.LazyFunction(random_route_distinguisher)
 
     has_description = NautobotBoolIterator()
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
     has_tenant = factory.Faker("boolean", chance_of_getting_true=75)
     tenant = factory.Maybe("has_tenant", random_instance(Tenant), None)
@@ -100,7 +101,7 @@ class VRFFactory(PrimaryModelFactory):
     tenant = factory.Maybe("has_tenant", random_instance(Tenant), None)
 
     has_description = NautobotBoolIterator()
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
     namespace = random_instance(Namespace, allow_null=False)
 
@@ -135,7 +136,7 @@ class VLANGroupFactory(OrganizationalModelFactory):
     name = factory.LazyAttribute(lambda o: o.unique_name.upper())
 
     has_description = NautobotBoolIterator()
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
     has_location = NautobotBoolIterator()
     location = factory.Maybe(
@@ -211,7 +212,7 @@ class VLANFactory(PrimaryModelFactory):
     )
 
     has_description = NautobotBoolIterator()
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
     has_vlan_group = NautobotBoolIterator()
     vlan_group = factory.Maybe("has_vlan_group", random_instance(VLANGroup, allow_null=False), None)
@@ -235,7 +236,7 @@ class VLANFactory(PrimaryModelFactory):
 
 class VLANGetOrCreateFactory(VLANFactory):
     class Meta:
-        django_get_or_create = ("vlan_group", "tenant")
+        django_get_or_create = ("vlan_group", "vid")
 
 
 class VRFGetOrCreateFactory(VRFFactory):
@@ -251,7 +252,7 @@ class NamespaceFactory(PrimaryModelFactory):
     class Meta:
         model = Namespace
 
-    name = UniqueFaker("text", max_nb_chars=20)
+    name = UniqueFaker("text", max_nb_chars=20)  # could be up to CHARFIELD_MAX_LENGTH but that gets unwieldy fast
 
 
 class PrefixFactory(PrimaryModelFactory):
@@ -293,7 +294,7 @@ class PrefixFactory(PrimaryModelFactory):
         UniqueFaker("ipv6_network"),
         UniqueFaker("ipv4", network=True),
     )
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
     role = factory.Maybe(
         "has_role",
         random_instance(lambda: Role.objects.get_for_model(Prefix), allow_null=False),
@@ -357,7 +358,7 @@ class PrefixFactory(PrimaryModelFactory):
             return
 
         # 50% chance to create children
-        if not faker.Faker().pybool():
+        if factory.random.randgen.choice([True, False]):
             return
 
         action = "create" if create else "build"
@@ -376,9 +377,9 @@ class PrefixFactory(PrimaryModelFactory):
 
         # Default to maximum of 4 children unless overridden in kwargs
         max_count = int(kwargs.pop("max_count", 4))
-        child_count = faker.Faker().pyint(min_value=0, max_value=min(max_count, self.prefix.size))
-        if child_count == 0:
+        if max_count == 0:
             return
+        child_count = faker.Faker().pyint(min_value=1, max_value=min(max_count, self.prefix.size))
 
         # Propagate parent tenant to children if parent tenant is set
         if self.tenant is not None:
@@ -403,13 +404,10 @@ class PrefixFactory(PrimaryModelFactory):
             if child_cidr > 128 or self.ip_version == 4 and child_cidr > 32:
                 raise ValueError(f"Unable to create {child_count} child prefixes in container prefix {self.cidr_str}.")
 
-            if self.type == PrefixTypeChoices.TYPE_CONTAINER:
-                weights = [10, 1]  # prefer network prefixes
-                child_type = factory.random.randgen.choices(
-                    [PrefixTypeChoices.TYPE_NETWORK, PrefixTypeChoices.TYPE_CONTAINER], weights
-                )[0]
-            else:
-                child_type = PrefixTypeChoices.TYPE_POOL
+            weights = [1, 6, 3]  # prefer network and pool prefixes
+            child_type = factory.random.randgen.choices(
+                [PrefixTypeChoices.TYPE_CONTAINER, PrefixTypeChoices.TYPE_NETWORK, PrefixTypeChoices.TYPE_POOL], weights
+            )[0]
 
             # Create child prefixes, preserving is_ipv6 from parent
             for count, address in enumerate(self.prefix.subnet(child_cidr)):
@@ -462,7 +460,7 @@ class IPAddressFactory(PrimaryModelFactory):
     #     UniqueFaker("ipv6"),
     #     UniqueFaker("ipv4_private"),
     # )
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
     dns_name = factory.Maybe("has_dns_name", factory.Faker("hostname"), "")
     # TODO: Needs to be made more robust because prefixes and namespaces need to exist first
     # nat_inside = factory.SubFactory(

nautobot/ipam/filters.py

@@ -5,6 +5,7 @@ from django.db.models import Q
 import django_filters
 import netaddr
 
+from nautobot.cloud.models import CloudNetwork
 from nautobot.core.filters import (
     MultiValueCharFilter,
     MultiValueNumberFilter,
@@ -256,16 +257,23 @@ class PrefixFilterSet(
     )
     ip_version = django_filters.NumberFilter()
     location = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         to_field_name="name",
         field_name="locations",
         label='Location (name or ID) (deprecated, use "locations" filter instead)',
     )
     locations = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         to_field_name="name",
         label="Locations (name or ID)",
     )
+    cloud_networks = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=CloudNetwork.objects.all(),
+        to_field_name="name",
+        label="Cloud Network (name or ID)",
+    )
 
     class Meta:
         model = Prefix
@@ -334,6 +342,7 @@ class PrefixLocationAssignmentFilterSet(NautobotFilterSet):
         label="Prefix",
     )
     location = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         to_field_name="name",
         label="Locations (name or ID)",
@@ -559,12 +568,14 @@ class VLANFilterSet(
         label="VLAN Group (name or ID)",
     )
     location = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         to_field_name="name",
         field_name="locations",
         label='Location (name or ID) (deprecated, use "locations" filter instead)',
     )
     locations = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         to_field_name="name",
         label="Locations (name or ID)",
@@ -593,11 +604,13 @@ class VLANLocationAssignmentFilterSet(NautobotFilterSet):
         },
     )
     vlan = NaturalKeyOrPKMultipleChoiceFilter(
+        prefers_id=True,
         to_field_name="vid",
         queryset=VLAN.objects.all(),
         label="VLAN (VID or ID)",
     )
     location = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         to_field_name="name",
         label="Locations (name or ID)",

nautobot/ipam/forms.py

@@ -580,10 +580,14 @@ class IPAddressForm(IPAddressFormMixin, ReturnURLForm):
                 if nat_inside_parent.count() == 1:
                     nat_inside_parent = nat_inside_parent.first()
                     if nat_inside_parent.interface is not None:
-                        initial["nat_location"] = nat_inside_parent.interface.device.location.pk
-                        if nat_inside_parent.interface.device.rack:
-                            initial["nat_rack"] = nat_inside_parent.interface.device.rack.pk
-                        initial["nat_device"] = nat_inside_parent.interface.device.pk
+                        parent_device = nat_inside_parent.interface.device
+                        if parent_device is None and nat_inside_parent.interface.module is not None:
+                            parent_device = nat_inside_parent.interface.module.device
+                        if parent_device:
+                            initial["nat_location"] = parent_device.location.pk
+                            if parent_device.rack:
+                                initial["nat_rack"] = parent_device.rack.pk
+                            initial["nat_device"] = parent_device.pk
                     elif nat_inside_parent.vm_interface is not None:
                         initial["nat_cluster"] = nat_inside_parent.vm_interface.virtual_machine.cluster.pk
                         initial["nat_virtual_machine"] = nat_inside_parent.vm_interface.virtual_machine.pk

nautobot/ipam/graphql/types.py

@@ -17,7 +17,7 @@ class IPAddressType(OptimizedNautobotObjectType):
         filterset_class = filters.IPAddressFilterSet
 
     def resolve_dynamic_groups(self, args):
-        return DynamicGroup.objects.get_for_object(self, use_cache=True)
+        return DynamicGroup.objects.get_for_object(self)
 
 
 class PrefixType(OptimizedNautobotObjectType):
@@ -33,7 +33,7 @@ class PrefixType(OptimizedNautobotObjectType):
         filterset_class = filters.PrefixFilterSet
 
     def resolve_dynamic_groups(self, args):
-        return DynamicGroup.objects.get_for_object(self, use_cache=True)
+        return DynamicGroup.objects.get_for_object(self)
 
 
 class VLANType(OptimizedNautobotObjectType):

nautobot/ipam/migrations/0047_alter_ipaddress_role_alter_ipaddress_status_and_more.py

@@ -0,0 +1,59 @@
+# Generated by Django 4.2.9 on 2024-01-17 18:52
+
+from django.db import migrations
+import django.db.models.deletion
+
+import nautobot.extras.models.roles
+import nautobot.extras.models.statuses
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0110_alter_configcontext_cluster_groups_and_more"),
+        ("ipam", "0046_update_all_charfields_max_length_to_255"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ipaddress",
+            name="role",
+            field=nautobot.extras.models.roles.RoleField(
+                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to="extras.role"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ipaddress",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="prefix",
+            name="role",
+            field=nautobot.extras.models.roles.RoleField(
+                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to="extras.role"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="prefix",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vlan",
+            name="role",
+            field=nautobot.extras.models.roles.RoleField(
+                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to="extras.role"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vlan",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, to="extras.status"
+            ),
+        ),
+    ]

nautobot/ipam/models.py

@@ -27,13 +27,19 @@ from .validators import DNSValidator
 
 __all__ = (
     "IPAddress",
+    "IPAddressToInterface",
+    "Namespace",
     "Prefix",
+    "PrefixLocationAssignment",
     "RIR",
     "RouteTarget",
     "Service",
     "VLAN",
     "VLANGroup",
+    "VLANLocationAssignment",
     "VRF",
+    "VRFDeviceAssignment",
+    "VRFPrefixAssignment",
 )
 
 
@@ -43,7 +49,6 @@ logger = logging.getLogger(__name__)
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",
@@ -275,6 +280,7 @@ class VRFDeviceAssignment(BaseModel):
         help_text="Unique route distinguisher (as defined in RFC 4364)",
     )
     name = models.CharField(blank=True, max_length=CHARFIELD_MAX_LENGTH)
+    is_metadata_associable_model = False
 
     class Meta:
         unique_together = [
@@ -312,6 +318,7 @@ class VRFDeviceAssignment(BaseModel):
 class VRFPrefixAssignment(BaseModel):
     vrf = models.ForeignKey("ipam.VRF", on_delete=models.CASCADE, related_name="+")
     prefix = models.ForeignKey("ipam.Prefix", on_delete=models.CASCADE, related_name="vrf_assignments")
+    is_metadata_associable_model = False
 
     class Meta:
         unique_together = ["vrf", "prefix"]
@@ -391,7 +398,6 @@ class RIR(OrganizationalModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",
@@ -493,11 +499,6 @@ class Prefix(PrimaryModel):
         "type",
         "vlan",
     ]
-    """
-    dynamic_group_filter_fields = {
-        "vrf": "vrf_id",  # Duplicate filter fields that will be collapsed in 2.0
-    }
-    """
 
     class Meta:
         ordering = (
@@ -965,6 +966,7 @@ class Prefix(PrimaryModel):
 class PrefixLocationAssignment(BaseModel):
     prefix = models.ForeignKey("ipam.Prefix", on_delete=models.CASCADE, related_name="location_assignments")
     location = models.ForeignKey("dcim.Location", on_delete=models.CASCADE, related_name="prefix_assignments")
+    is_metadata_associable_model = False
 
     class Meta:
         unique_together = ["prefix", "location"]
@@ -977,7 +979,6 @@ class PrefixLocationAssignment(BaseModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "statuses",
@@ -1011,7 +1012,7 @@ class IPAddress(PrimaryModel):
     parent = models.ForeignKey(
         "ipam.Prefix",
         blank=True,
-        null=True,
+        null=True,  # TODO remove this, it shouldn't be permitted for the database!
         related_name="ip_addresses",  # `IPAddress` to use `related_name="ip_addresses"`
         on_delete=models.PROTECT,
         help_text="The parent Prefix of this IPAddress.",
@@ -1108,7 +1109,7 @@ class IPAddress(PrimaryModel):
             raise ValidationError({"namespace": "No suitable parent Prefix exists in this Namespace"}) from e
 
     def clean(self):
-        super().clean()
+        self.address = self.address  # not a no-op - forces re-calling of self._deconstruct_address()
 
         # Validate that host is not being modified
         if self.present_in_database:
@@ -1122,8 +1123,8 @@ class IPAddress(PrimaryModel):
 
         closest_parent = self._get_closest_parent()
         # Validate `parent` can be used as the parent for this ipaddress
-        if self.parent and closest_parent:
-            if self.parent != closest_parent:
+        if closest_parent is not None:
+            if self.parent is not None and self.parent != closest_parent:
                 raise ValidationError(
                     {
                         "parent": (
@@ -1135,23 +1136,20 @@ class IPAddress(PrimaryModel):
             self.parent = closest_parent
             self._namespace = None
 
-    def save(self, *args, **kwargs):
         # 3.0 TODO: uncomment the below to enforce this constraint
         # if self.parent.type != choices.PrefixTypeChoices.TYPE_NETWORK:
         #     err_msg = f"IP addresses cannot be created in {self.parent.type} prefixes. You must create a network prefix first."
         #     raise ValidationError({"address": err_msg})
 
-        self.address = self.address  # not a no-op - forces re-calling of self._deconstruct_address()
-
         # Force dns_name to lowercase
         if not self.dns_name.islower:
             self.dns_name = self.dns_name.lower()
 
-        # Host and mask_length are required to get closest parent
-        closest_parent = self._get_closest_parent()
-        if closest_parent is not None:
-            self.parent = closest_parent
-            self._namespace = None
+        super().clean()
+
+    def save(self, *args, **kwargs):
+        self.clean()  # MUST do data fixup as above
+
         super().save(*args, **kwargs)
 
     @property
@@ -1247,6 +1245,7 @@ class IPAddressToInterface(BaseModel):
     is_primary = models.BooleanField(default=False, help_text="Is primary address on interface")
     is_secondary = models.BooleanField(default=False, help_text="Is secondary address on interface")
     is_standby = models.BooleanField(default=False, help_text="Is standby address on interface")
+    is_metadata_associable_model = False
 
     class Meta:
         unique_together = [
@@ -1444,6 +1443,7 @@ class VLAN(PrimaryModel):
 class VLANLocationAssignment(BaseModel):
     vlan = models.ForeignKey("ipam.VLAN", on_delete=models.CASCADE, related_name="location_assignments")
     location = models.ForeignKey("dcim.Location", on_delete=models.CASCADE, related_name="vlan_assignments")
+    is_metadata_associable_model = False
 
     class Meta:
         unique_together = ["vlan", "location"]

nautobot/ipam/querysets.py

@@ -56,7 +56,7 @@ class BaseNetworkQuerySet(RestrictedQuerySet):
             return call_map[version](search)
 
         except netaddr.core.AddrFormatError:
-            ver_map = {4: "0/32", 6: "::/128"}
+            ver_map = {4: "0.0.0.0/32", 6: "::/128"}
             return netaddr.IPNetwork(ver_map[version])
 
     def _check_and_prep_ipv6(self, search):

nautobot/ipam/signals.py

@@ -109,8 +109,10 @@ def assert_locations_content_types(sender, instance, action, reverse, model, pk_
         # instance = the Prefix or VLAN
         # model = Location class
         instance_ct = ContentType.objects.get_for_model(instance)
-        invalid_locations = model.objects.select_related("location_type").filter(
-            Q(pk__in=pk_set), ~Q(location_type__content_types__in=[instance_ct])
+        invalid_locations = (
+            model.objects.without_tree_fields()
+            .select_related("location_type")
+            .filter(Q(pk__in=pk_set), ~Q(location_type__content_types__in=[instance_ct]))
         )
         if invalid_locations.exists():
             invalid_location_types = {location.location_type.name for location in invalid_locations}

nautobot/ipam/tables.py

@@ -355,6 +355,9 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     location_count = LinkedCountColumn(
         viewname="dcim:location_list", url_params={"prefixes": "pk"}, verbose_name="Locations"
     )
+    cloud_networks_count = LinkedCountColumn(
+        viewname="cloud:cloudnetwork_list", url_params={"prefixes": "pk"}, verbose_name="Cloud Networks"
+    )
 
     class Meta(BaseTable.Meta):
         model = Prefix
@@ -368,6 +371,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "namespace",
             "tenant",
             "location_count",
+            "cloud_networks_count",
             "vlan",
             "role",
             "rir",
@@ -443,6 +447,7 @@ class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
     )
     tenant = TenantColumn()
     parent__namespace = tables.Column(linkify=True)
+    # Interface, Device, and VirtualMachine tables aren't currently filterable by IP address (?) so no LinkedCountColumn
     interface_count = tables.Column(verbose_name="Interfaces")
     interface_parent_count = tables.Column(verbose_name="Devices")
     vm_interface_count = LinkedCountColumn(

nautobot/ipam/templates/ipam/ipaddress_interfaces.html

@@ -11,7 +11,7 @@
                 <strong>Interfaces</strong>
                 <div class="pull-right noprint">
                     {% if request.user.is_authenticated %}
-                        <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#IPAddressInterfaceTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+                        {% table_config_button_small interface_table %}
                     {% endif %}
                 </div>
                 <div class="pull-right col-md-2 noprint">

nautobot/ipam/templates/ipam/ipaddress_vm_interfaces.html

@@ -11,7 +11,7 @@
                 <strong>Interfaces</strong>
                 <div class="pull-right noprint">
                     {% if request.user.is_authenticated %}
-                        <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#IPAddressVMInterfaceTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+                        {% table_config_button_small vm_interface_table %}
                     {% endif %}
                 </div>
                 <div class="pull-right col-md-2 noprint">

nautobot/ipam/templates/ipam/prefix.html

@@ -119,4 +119,5 @@
 {% block content_right_page %}
             {% include 'panel_table.html' with table=parent_prefix_table heading='Parent Prefixes' panel_class='default' %}
             {% include "utilities/obj_table.html" with table=vrf_table table_template="panel_table.html" heading="Assigned VRFs" disable_pagination=False %}
+            {% include "utilities/obj_table.html" with table=cloud_network_table table_template="panel_table.html" heading="Assigned Cloud Networks" disable_pagination=False %}
 {% endblock content_right_page %}