nautobot 2.0.0a3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/ipam/forms.py

@@ -4,8 +4,6 @@ from nautobot.core.forms import (
     add_blank_choice,
     AddressFieldMixin,
     BootstrapMixin,
-    CSVChoiceField,
-    CSVModelChoiceField,
     DateTimePicker,
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
@@ -21,21 +19,17 @@ from nautobot.core.forms import (
 from nautobot.core.forms.constants import BOOLEAN_WITH_BLANK_CHOICES
 from nautobot.dcim.form_mixins import (
     LocatableModelBulkEditFormMixin,
-    LocatableModelCSVFormMixin,
     LocatableModelFilterFormMixin,
     LocatableModelFormMixin,
 )
 from nautobot.dcim.models import Device, Location, Rack
 from nautobot.extras.forms import (
-    CustomFieldModelCSVForm,
     NautobotBulkEditForm,
     NautobotModelForm,
     NautobotFilterForm,
     RoleModelBulkEditFormMixin,
-    RoleModelCSVFormMixin,
     RoleModelFilterFormMixin,
     StatusModelBulkEditFormMixin,
-    StatusModelCSVFormMixin,
     StatusModelFilterFormMixin,
     TagsBulkEditFormMixin,
 )
@@ -92,6 +86,7 @@ class VRFForm(NautobotModelForm, TenancyForm):
     export_targets = DynamicModelMultipleChoiceField(queryset=RouteTarget.objects.all(), required=False)
     namespace = DynamicModelChoiceField(queryset=Namespace.objects.all())
     devices = DynamicModelMultipleChoiceField(queryset=Device.objects.all(), required=False)
+    virtual_machines = DynamicModelMultipleChoiceField(queryset=VirtualMachine.objects.all(), required=False)
     prefixes = DynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
@@ -113,6 +108,7 @@ class VRFForm(NautobotModelForm, TenancyForm):
             "tenant",
             "tags",
             "devices",
+            "virtual_machines",
             "prefixes",
         ]
         labels = {
@@ -123,19 +119,6 @@ class VRFForm(NautobotModelForm, TenancyForm):
         }
 
 
-class VRFCSVForm(CustomFieldModelCSVForm):
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned tenant",
-    )
-
-    class Meta:
-        model = VRF
-        fields = VRF.csv_headers
-
-
 class VRFBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=VRF.objects.all(), widget=forms.MultipleHiddenInput())
     namespace = DynamicModelChoiceField(queryset=Namespace.objects.all(), required=False)
@@ -179,19 +162,6 @@ class RouteTargetForm(NautobotModelForm, TenancyForm):
         ]
 
 
-class RouteTargetCSVForm(CustomFieldModelCSVForm):
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned tenant",
-    )
-
-    class Meta:
-        model = RouteTarget
-        fields = RouteTarget.csv_headers
-
-
 class RouteTargetBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=RouteTarget.objects.all(), widget=forms.MultipleHiddenInput())
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
@@ -239,15 +209,6 @@ class RIRForm(NautobotModelForm):
         ]
 
 
-class RIRCSVForm(CustomFieldModelCSVForm):
-    class Meta:
-        model = RIR
-        fields = RIR.csv_headers
-        help_texts = {
-            "name": "RIR name",
-        }
-
-
 class RIRFilterForm(NautobotFilterForm):
     model = RIR
     is_private = forms.NullBooleanField(
@@ -324,56 +285,6 @@ class PrefixForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, Prefix
         return instance
 
 
-class PrefixCSVForm(
-    PrefixFieldMixin,
-    LocatableModelCSVFormMixin,
-    StatusModelCSVFormMixin,
-    RoleModelCSVFormMixin,
-    CustomFieldModelCSVForm,
-):
-    vrf = CSVModelChoiceField(
-        queryset=VRF.objects.all(),
-        to_field_name="name",
-        required=False,
-        help_text="Assigned VRF",
-    )
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned tenant",
-    )
-    vlan_group = CSVModelChoiceField(
-        queryset=VLANGroup.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="VLAN's group (if any)",
-    )
-    vlan = CSVModelChoiceField(
-        queryset=VLAN.objects.all(),
-        required=False,
-        to_field_name="vid",
-        help_text="Assigned VLAN",
-    )
-    type = CSVChoiceField(choices=PrefixTypeChoices, required=False)
-    rir = CSVModelChoiceField(queryset=RIR.objects.all(), to_field_name="name", help_text="Assigned RIR")
-
-    class Meta:
-        model = Prefix
-        fields = Prefix.csv_headers
-
-    def __init__(self, data=None, *args, **kwargs):
-        super().__init__(data, *args, **kwargs)
-
-        if data:
-            # Limit vlan queryset by assigned location and vlan_group
-            params = {
-                f"location__{self.fields['location'].to_field_name}": data.get("location"),
-                f"vlan_group__{self.fields['vlan_group'].to_field_name}": data.get("vlan_group"),
-            }
-            self.fields["vlan"].queryset = self.fields["vlan"].queryset.filter(**params)
-
-
 class PrefixBulkEditForm(
     TagsBulkEditFormMixin,
     LocatableModelBulkEditFormMixin,
@@ -627,33 +538,6 @@ class IPAddressBulkAddForm(NautobotModelForm, TenancyForm, AddressFieldMixin):
         self.fields["vrf"].empty_label = "Global"
 
 
-class IPAddressCSVForm(StatusModelCSVFormMixin, RoleModelCSVFormMixin, AddressFieldMixin, CustomFieldModelCSVForm):
-    vrf = CSVModelChoiceField(
-        queryset=VRF.objects.all(),
-        to_field_name="name",
-        required=False,
-        help_text="Assigned VRF",
-    )
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        to_field_name="name",
-        required=False,
-        help_text="Assigned tenant",
-    )
-
-    class Meta:
-        model = IPAddress
-        fields = [
-            "address",
-            "vrf",
-            "tenant",
-            "status",
-            "role",
-            "dns_name",
-            "description",
-        ]
-
-
 class IPAddressBulkEditForm(
     TagsBulkEditFormMixin, StatusModelBulkEditFormMixin, RoleModelBulkEditFormMixin, NautobotBulkEditForm
 ):
@@ -719,11 +603,11 @@ class IPAddressFilterForm(NautobotFilterForm, TenancyFilterForm, StatusModelFilt
         label="IP version",
         widget=StaticSelect2(),
     )
-    mask_length = forms.ChoiceField(
+    mask_length = forms.MultipleChoiceField(
         required=False,
         choices=IPADDRESS_MASK_LENGTH_CHOICES,
         label="Mask length",
-        widget=StaticSelect2(),
+        widget=StaticSelect2Multiple(),
     )
     vrf_id = DynamicModelMultipleChoiceField(
         queryset=VRF.objects.all(),
@@ -753,12 +637,6 @@ class VLANGroupForm(LocatableModelFormMixin, NautobotModelForm):
         ]
 
 
-class VLANGroupCSVForm(LocatableModelCSVFormMixin, CustomFieldModelCSVForm):
-    class Meta:
-        model = VLANGroup
-        fields = VLANGroup.csv_headers
-
-
 class VLANGroupFilterForm(NautobotFilterForm, LocatableModelFilterFormMixin):
     model = VLANGroup
 
@@ -799,37 +677,6 @@ class VLANForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
         }
 
 
-class VLANCSVForm(LocatableModelCSVFormMixin, StatusModelCSVFormMixin, RoleModelCSVFormMixin, CustomFieldModelCSVForm):
-    vlan_group = CSVModelChoiceField(
-        queryset=VLANGroup.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned VLAN group",
-    )
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        to_field_name="name",
-        required=False,
-        help_text="Assigned tenant",
-    )
-
-    class Meta:
-        model = VLAN
-        fields = VLAN.csv_headers
-        help_texts = {
-            "vid": "Numeric VLAN ID (1-4095)",
-            "name": "VLAN name",
-        }
-
-    def __init__(self, data=None, *args, **kwargs):
-        super().__init__(data, *args, **kwargs)
-
-        if data:
-            # Limit vlan queryset by assigned group
-            params = {f"location__{self.fields['location'].to_field_name}": data.get("location")}
-            self.fields["vlan_group"].queryset = self.fields["vlan_group"].queryset.filter(**params)
-
-
 class VLANBulkEditForm(
     TagsBulkEditFormMixin,
     LocatableModelBulkEditFormMixin,
@@ -944,26 +791,6 @@ class ServiceFilterForm(NautobotFilterForm):
     tag = TagFilterField(model)
 
 
-class ServiceCSVForm(CustomFieldModelCSVForm):
-    device = CSVModelChoiceField(
-        queryset=Device.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Required if not assigned to a VM",
-    )
-    virtual_machine = CSVModelChoiceField(
-        queryset=VirtualMachine.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Required if not assigned to a device",
-    )
-    protocol = CSVChoiceField(choices=ServiceProtocolChoices, help_text="IP protocol")
-
-    class Meta:
-        model = Service
-        fields = Service.csv_headers
-
-
 class ServiceBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=Service.objects.all(), widget=forms.MultipleHiddenInput())
     protocol = forms.ChoiceField(

nautobot/ipam/lookups.py

@@ -236,6 +236,7 @@ class NetIn(Lookup):
         # This is to satisfy an issue with django cacheops, specifically this line:
         # https://github.com/Suor/django-cacheops/blob/a5ed1ac28c7259f5ad005e596cc045d1d61e2c51/cacheops/query.py#L175
         # Without 1, and one 1 value as %s, will result in stacktrace. A non-impacting condition is added to the query
+        # TODO: Although we don't use cacheops now, removing this code causes a traceback in MySQL? Leaving for now
         if _connection.vendor == "mysql":
             self.query_starter = "'1' NOT IN %s AND "
         elif _connection.vendor == "postgresql":

nautobot/ipam/management/commands/fix_prefix_broadcast.py

@@ -0,0 +1,17 @@
+from django.core.management.base import BaseCommand
+from django.db import transaction
+
+from nautobot.ipam.models import Prefix
+
+
+class Command(BaseCommand):
+    help = "Updates Prefix.broadcast to match the correct derived value."
+
+    def handle(self, *args, **kwargs):
+        """Run through all objects and ensure they are associated with the correct custom fields."""
+        with transaction.atomic():
+            for prefix in Prefix.objects.all():
+                if prefix.broadcast != str(prefix.prefix[-1]):
+                    self.stdout.write(f"Updating {prefix} broadcast from {prefix.broadcast} to {prefix.prefix[-1]}")
+                    prefix.broadcast = prefix.prefix[-1]
+                    prefix.save()

nautobot/ipam/migrations/0010_alter_ipam_role_add_new_role.py

@@ -7,7 +7,7 @@ import nautobot.extras.models.roles
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("extras", "0061_collect_roles_from_related_apps_roles"),
+        ("extras", "0062_collect_roles_from_related_apps_roles"),
         ("ipam", "0009_alter_vlan_name"),
     ]
 

nautobot/ipam/migrations/0011_migrate_ipam_role_data.py

@@ -6,47 +6,41 @@ from nautobot.ipam.choices import IPAddressRoleChoices
 
 
 def migrate_data_from_legacy_role_to_new_role(apps, schema):
-    """Copy record from role to temp_role"""
-
-    role_model = apps.get_model("extras", "Role")
-    model_class_is_choice_field_map = {
-        "VLAN": False,
-        "Prefix": False,
-        "IPAddress": True,
-    }
-    for model_name, is_choices in model_class_is_choice_field_map.items():
-        model = apps.get_model("ipam", model_name)
-        migrate_role_data(model=model, role_model=role_model, is_choice_field=is_choices)
-
-
-def reverse_ipaddress_data_migration(apps):
-    model = apps.get_model("ipam", "IPAddress")
-    migrate_role_data(
-        model=model,
-        role_choiceset=IPAddressRoleChoices,
-        legacy_role="new_role",
-        new_role="legacy_role",
-    )
-
-
-def reverse_vlan_and_prefix_data_migration(apps):
-    model_role_map = {"VLAN": {"role_model": "Role"}, "Prefix": {"role_model": "Role"}}
-    for model_name, value in model_role_map.items():
-        model = apps.get_model("ipam", model_name)
-        role_model = apps.get_model("ipam", value["role_model"])
+    """Migrate VLAN/Prefix/IPAddress data from legacy_role to new_role."""
+    to_role_model = apps.get_model("extras", "Role")
+    ipam_role_model = apps.get_model("ipam", "Role")
+    for model_to_migrate, from_role_model, from_role_choiceset in [
+        (apps.get_model("ipam", "VLAN"), ipam_role_model, None),
+        (apps.get_model("ipam", "Prefix"), ipam_role_model, None),
+        (apps.get_model("ipam", "IPAddress"), None, IPAddressRoleChoices),
+    ]:
         migrate_role_data(
-            model=model,
-            role_model=role_model,
-            legacy_role="new_role",
-            new_role="legacy_role",
+            model_to_migrate=model_to_migrate,
+            from_role_field_name="legacy_role",
+            from_role_model=from_role_model,
+            to_role_field_name="new_role",
+            from_role_choiceset=from_role_choiceset,
+            to_role_model=to_role_model,
         )
 
 
-def reverse_role_data_migrate(apps, schema):
-    """Reverse changes made to new_role"""
-
-    reverse_vlan_and_prefix_data_migration(apps)
-    reverse_ipaddress_data_migration(apps)
+def migrate_data_from_new_role_to_legacy_role(apps, schema):
+    """Migrate VLAN/Prefix/IPAddress data from new_role to legacy_role."""
+    to_role_model = apps.get_model("extras", "Role")
+    ipam_role_model = apps.get_model("ipam", "Role")
+    for model_to_migrate, from_role_model, from_role_choiceset in [
+        (apps.get_model("ipam", "VLAN"), ipam_role_model, None),
+        (apps.get_model("ipam", "Prefix"), ipam_role_model, None),
+        (apps.get_model("ipam", "IPAddress"), None, IPAddressRoleChoices),
+    ]:
+        migrate_role_data(
+            model_to_migrate=model_to_migrate,
+            from_role_field_name="new_role",
+            from_role_model=to_role_model,
+            to_role_field_name="legacy_role",
+            to_role_model=from_role_model,
+            to_role_choiceset=from_role_choiceset,
+        )
 
 
 class Migration(migrations.Migration):
@@ -55,5 +49,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(migrate_data_from_legacy_role_to_new_role, reverse_role_data_migrate),
+        migrations.RunPython(migrate_data_from_legacy_role_to_new_role, migrate_data_from_new_role_to_legacy_role),
     ]

nautobot/ipam/migrations/0020_related_name_changes.py

@@ -8,7 +8,7 @@ import nautobot.extras.models.statuses
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("extras", "0067_created_datetime"),
+        ("extras", "0068_created_datetime"),
         ("ipam", "0019_created_datetime"),
     ]
 

nautobot/ipam/migrations/0022_aggregate_to_prefix_data_migration.py

@@ -5,7 +5,7 @@ from django.conf import settings
 from django.db import migrations
 from django.utils.timezone import make_aware
 
-from nautobot.core.models.generics import _NautobotTaggableManager
+from nautobot.core.models.managers import TagsManager
 from nautobot.core.models.utils import serialize_object
 from nautobot.extras import choices as extras_choices
 from nautobot.extras import models as extras_models
@@ -197,7 +197,7 @@ def migrate_aggregate_to_prefix(apps, schema_editor):
         # make tag manager available in migration for nautobot.core.models.utils.serialize_object
         # https://github.com/jazzband/django-taggit/issues/101
         # https://github.com/jazzband/django-taggit/issues/454
-        prefix.tags = _NautobotTaggableManager(
+        prefix.tags = TagsManager(
             through=extras_models.TaggedItem, model=Prefix, instance=prefix, prefetch_cache_name="tags"
         )
 

nautobot/ipam/migrations/0028_tagsfield.py

@@ -0,0 +1,44 @@
+# Generated by Django 3.2.18 on 2023-04-21 13:59
+
+from django.db import migrations
+import nautobot.core.models.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0079_tagsfield"),
+        ("ipam", "0027_remove_rir_slug"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ipaddress",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="prefix",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="routetarget",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="service",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="vlan",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="vrf",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+    ]

nautobot/ipam/migrations/0029_ip_address_to_interface_uniqueness_constraints.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-05-25 19:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("virtualization", "0022_vminterface_timestamps_data_migration"),
+        ("dcim", "0040_tagsfield"),
+        ("ipam", "0028_tagsfield"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="ipaddresstointerface",
+            unique_together={("ip_address", "interface"), ("ip_address", "vm_interface")},
+        ),
+    ]

nautobot/ipam/migrations/{0028_ipam__namespaces.py → 0030_ipam__namespaces.py}

@@ -5,15 +5,13 @@ from django.db import migrations, models
 import django.db.models.deletion
 import nautobot.extras.models.mixins
 import nautobot.ipam.models
-import taggit.managers
 import uuid
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("dcim", "0040_ipam__namespaces"),
-        ("extras", "0070_rename_model_fields"),
-        ("ipam", "0027_remove_rir_slug"),
+        ("extras", "0071_rename_model_fields"),
+        ("ipam", "0029_ip_address_to_interface_uniqueness_constraints"),
     ]
 
     operations = [
@@ -55,7 +53,21 @@ class Migration(migrations.Migration):
                 (
                     "device",
                     models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, related_name="vrf_assignments", to="dcim.device"
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="vrf_assignments",
+                        to="dcim.device",
+                    ),
+                ),
+                (
+                    "virtual_machine",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="vrf_assignments",
+                        to="virtualization.virtualmachine",
                     ),
                 ),
                 (
@@ -66,7 +78,12 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
-                "unique_together": {("device", "rd", "name"), ("vrf", "device")},
+                "unique_together": {
+                    ("device", "rd", "name"),
+                    ("vrf", "virtual_machine"),
+                    ("virtual_machine", "rd", "name"),
+                    ("vrf", "device"),
+                },
             },
         ),
         migrations.CreateModel(
@@ -96,7 +113,7 @@ class Migration(migrations.Migration):
                         to="dcim.location",
                     ),
                 ),
-                ("tags", taggit.managers.TaggableManager(through="extras.TaggedItem", to="extras.Tag")),
+                ("tags", nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag")),
             ],
             options={
                 "abstract": False,
@@ -130,15 +147,18 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "prefixes",
             },
         ),
-        migrations.AlterUniqueTogether(
-            name="prefix",
-            unique_together={("namespace", "network", "prefix_length")},
-        ),
         migrations.AddField(
             model_name="vrf",
             name="devices",
             field=models.ManyToManyField(related_name="vrfs", through="ipam.VRFDeviceAssignment", to="dcim.Device"),
         ),
+        migrations.AddField(
+            model_name="vrf",
+            name="virtual_machines",
+            field=models.ManyToManyField(
+                related_name="vrfs", through="ipam.VRFDeviceAssignment", to="virtualization.VirtualMachine"
+            ),
+        ),
         migrations.AddField(
             model_name="vrf",
             name="namespace",
@@ -149,11 +169,6 @@ class Migration(migrations.Migration):
                 to="ipam.namespace",
             ),
         ),
-        migrations.AddField(
-            model_name="vrf",
-            name="prefixes",
-            field=models.ManyToManyField(related_name="vrfs", through="ipam.VRFPrefixAssignment", to="ipam.Prefix"),
-        ),
         migrations.AlterField(
             model_name="vrf",
             name="rd",
@@ -161,22 +176,56 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterModelOptions(
             name="vrf",
-            options={"ordering": ("namespace", "name"), "verbose_name": "VRF", "verbose_name_plural": "VRFs"},
+            options={"ordering": ("namespace", "name", "rd"), "verbose_name": "VRF", "verbose_name_plural": "VRFs"},
         ),
-        migrations.AlterUniqueTogether(
-            name="vrf",
-            unique_together={("namespace", "name"), ("namespace", "rd")},
+        migrations.AddField(
+            model_name="vrf",
+            name="prefixes_m2m",
+            field=models.ManyToManyField(related_name="vrfs_m2m", through="ipam.VRFPrefixAssignment", to="ipam.Prefix"),
+        ),
+        migrations.AddField(
+            model_name="prefix",
+            name="parent",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="children",
+                to="ipam.prefix",
+            ),
         ),
-        migrations.RemoveField(
+        migrations.AlterIndexTogether(
+            name="prefix",
+            index_together={
+                ("network", "broadcast", "prefix_length"),
+                ("namespace", "network", "broadcast", "prefix_length"),
+            },
+        ),
+        #
+        #  Folded in from 0032_ipam__ipaddress__add_parent.py
+        #
+        migrations.AddField(
             model_name="ipaddress",
-            name="vrf",
+            name="ip_version",
+            field=models.IntegerField(db_index=True, editable=False, null=True),
         ),
-        migrations.RemoveField(
-            model_name="prefix",
-            name="vrf",
+        migrations.AddField(
+            model_name="ipaddress",
+            name="parent",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="ip_addresses",
+                to="ipam.prefix",
+            ),
         ),
-        migrations.RemoveField(
-            model_name="vrf",
-            name="enforce_unique",
+        migrations.AlterModelOptions(
+            name="ipaddress",
+            options={
+                "ordering": ("ip_version", "host", "prefix_length"),
+                "verbose_name": "IP address",
+                "verbose_name_plural": "IP addresses",
+            },
         ),
     ]