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

nautobot/dcim/migrations/0043_status_nonnullable.py

@@ -0,0 +1,72 @@
+# Generated by Django 3.2.18 on 2023-05-19 18:05
+
+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", "0083_rename_computed_field_slug_to_key"),
+        ("dcim", "0042_fixup_null_statuses"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="cable",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="cables", to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="device",
+            name="role",
+            field=nautobot.extras.models.roles.RoleField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="devices", to="extras.role"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="device",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="devices", to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="deviceredundancygroup",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="device_redundancy_groups", to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="interface",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="interfaces", to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="location",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="locations", to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="powerfeed",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="power_feeds", to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="rack",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="racks", to="extras.status"
+            ),
+        ),
+    ]

nautobot/dcim/models/cables.py

@@ -6,7 +6,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
 from django.db.models import Sum
-from django.urls import reverse
 from django.utils.functional import classproperty
 
 from nautobot.core.models.fields import ColorField
@@ -19,7 +18,7 @@ from nautobot.dcim.utils import (
     object_to_path_node,
     path_node_to_object,
 )
-from nautobot.extras.models import Status, StatusModel
+from nautobot.extras.models import Status, StatusField
 from nautobot.extras.utils import extras_features
 
 # TODO: There's an ugly circular-import pattern where if we move this import "up" to above, we get into an import loop
@@ -52,7 +51,7 @@ logger = logging.getLogger(__name__)
     "statuses",
     "webhooks",
 )
-class Cable(PrimaryModel, StatusModel):
+class Cable(PrimaryModel):
     """
     A physical connection between two endpoints.
     """
@@ -74,6 +73,7 @@ class Cable(PrimaryModel, StatusModel):
     termination_b_id = models.UUIDField()
     termination_b = GenericForeignKey(ct_field="termination_b_type", fk_field="termination_b_id")
     type = models.CharField(max_length=50, choices=CableTypeChoices, blank=True)
+    status = StatusField(blank=False, null=False)
     label = models.CharField(max_length=100, blank=True)
     color = ColorField(blank=True)
     length = models.PositiveSmallIntegerField(blank=True, null=True)
@@ -93,19 +93,6 @@ class Cable(PrimaryModel, StatusModel):
         to=Device, on_delete=models.CASCADE, related_name="+", blank=True, null=True
     )
 
-    csv_headers = [
-        "termination_a_type",
-        "termination_a_id",
-        "termination_b_type",
-        "termination_b_id",
-        "type",
-        "status",
-        "label",
-        "color",
-        "length",
-        "length_unit",
-    ]
-
     class Meta:
         ordering = [
             "termination_a_type",
@@ -134,15 +121,12 @@ class Cable(PrimaryModel, StatusModel):
         pk = self.pk or self._pk
         return self.label or f"#{pk}"
 
-    def get_absolute_url(self):
-        return reverse("dcim:cable", args=[self.pk])
-
     @classproperty  # https://github.com/PyCQA/pylint-django/issues/240
     def STATUS_CONNECTED(cls):  # pylint: disable=no-self-argument
         """Return a cached "connected" `Status` object for later reference."""
         if getattr(cls, "__status_connected", None) is None:
             try:
-                cls.__status_connected = Status.objects.get_for_model(Cable).get(slug="connected")
+                cls.__status_connected = Status.objects.get_for_model(Cable).get(name="Connected")
             except Status.DoesNotExist:
                 logger.warning("Status 'connected' not found for dcim.cable")
                 return None
@@ -259,7 +243,6 @@ class Cable(PrimaryModel, StatusModel):
             self.length_unit = ""
 
     def save(self, *args, **kwargs):
-
         # Store the given length (if any) in meters for use in database ordering
         if self.length and self.length_unit:
             self._abs_length = to_meters(self.length, self.length_unit)
@@ -277,20 +260,6 @@ class Cable(PrimaryModel, StatusModel):
         # Update the private pk used in __str__ in case this is a new object (i.e. just got its pk)
         self._pk = self.pk
 
-    def to_csv(self):
-        return (
-            f"{self.termination_a_type.app_label}.{self.termination_a_type.model}",
-            self.termination_a_id,
-            f"{self.termination_b_type.app_label}.{self.termination_b_type.model}",
-            self.termination_b_id,
-            self.get_type_display(),
-            self.get_status_display(),
-            self.label,
-            self.color,
-            self.length,
-            self.length_unit,
-        )
-
     def get_compatible_types(self):
         """
         Return all termination types compatible with termination A.

nautobot/dcim/models/device_component_templates.py

@@ -13,7 +13,6 @@ from nautobot.dcim.choices import (
     PowerOutletTypeChoices,
     PowerOutletFeedLegChoices,
     InterfaceTypeChoices,
-    InterfaceStatusChoices,
     PortTypeChoices,
 )
 
@@ -76,6 +75,12 @@ class ComponentTemplateModel(BaseModel, ChangeLoggedModel, CustomFieldModel, Rel
 
         return super().to_objectchange(action, related_object=device_type, **kwargs)
 
+    def get_absolute_url(self, api=False):
+        # TODO: in the new UI, this should be able to link directly to the object, instead of the device-type.
+        if not api:
+            return self.device_type.get_absolute_url(api=api)
+        return super().get_absolute_url(api=api)
+
     def instantiate_model(self, model, device, **kwargs):
         """
         Helper method to self.instantiate().
@@ -249,7 +254,7 @@ class InterfaceTemplate(ComponentTemplateModel):
 
     def instantiate(self, device):
         try:
-            status = Status.objects.get_for_model(Interface).get(slug=InterfaceStatusChoices.STATUS_ACTIVE)
+            status = Status.objects.get_for_model(Interface).get(name="Active")
         except Status.DoesNotExist:
             status = Status.objects.get_for_model(Interface).first()
         return self.instantiate_model(

nautobot/dcim/models/device_components.py

@@ -4,7 +4,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models, transaction
 from django.db.models import Sum
-from django.urls import reverse
+from django.utils.functional import classproperty
 
 from nautobot.core.models.fields import ForeignKeyWithAutoRelatedName, MACAddressCharField, NaturalOrderingField
 from nautobot.core.models.generics import PrimaryModel
@@ -30,11 +30,10 @@ from nautobot.dcim.constants import (
     VIRTUAL_IFACE_TYPES,
     WIRELESS_IFACE_TYPES,
 )
-
 from nautobot.extras.models import (
     RelationshipModel,
     Status,
-    StatusModel,
+    StatusField,
 )
 from nautobot.extras.utils import extras_features
 
@@ -216,24 +215,10 @@ class ConsolePort(CableTermination, PathEndpoint, ComponentModel):
         help_text="Physical port type",
     )
 
-    csv_headers = ["device", "name", "label", "type", "description"]
-
     class Meta:
         ordering = ("device", "_name")
         unique_together = ("device", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:consoleport", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.identifier,
-            self.name,
-            self.label,
-            self.type,
-            self.description,
-        )
-
     @property
     def parent(self):
         return self.device
@@ -257,24 +242,10 @@ class ConsoleServerPort(CableTermination, PathEndpoint, ComponentModel):
         help_text="Physical port type",
     )
 
-    csv_headers = ["device", "name", "label", "type", "description"]
-
     class Meta:
         ordering = ("device", "_name")
         unique_together = ("device", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:consoleserverport", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.identifier,
-            self.name,
-            self.label,
-            self.type,
-            self.description,
-        )
-
     @property
     def parent(self):
         return self.device
@@ -316,34 +287,10 @@ class PowerPort(CableTermination, PathEndpoint, ComponentModel):
         help_text="Allocated power draw (watts)",
     )
 
-    csv_headers = [
-        "device",
-        "name",
-        "label",
-        "type",
-        "maximum_draw",
-        "allocated_draw",
-        "description",
-    ]
-
     class Meta:
         ordering = ("device", "_name")
         unique_together = ("device", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:powerport", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.identifier,
-            self.name,
-            self.label,
-            self.get_type_display(),
-            self.maximum_draw,
-            self.allocated_draw,
-            self.description,
-        )
-
     @property
     def parent(self):
         return self.device
@@ -453,34 +400,10 @@ class PowerOutlet(CableTermination, PathEndpoint, ComponentModel):
         help_text="Phase (for three-phase feeds)",
     )
 
-    csv_headers = [
-        "device",
-        "name",
-        "label",
-        "type",
-        "power_port",
-        "feed_leg",
-        "description",
-    ]
-
     class Meta:
         ordering = ("device", "_name")
         unique_together = ("device", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:poweroutlet", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.identifier,
-            self.name,
-            self.label,
-            self.get_type_display(),
-            self.power_port.name if self.power_port else None,
-            self.get_feed_leg_display(),
-            self.description,
-        )
-
     @property
     def parent(self):
         return self.device
@@ -498,11 +421,12 @@ class PowerOutlet(CableTermination, PathEndpoint, ComponentModel):
 #
 
 
-class BaseInterface(RelationshipModel, StatusModel):
+class BaseInterface(RelationshipModel):
     """
     Abstract base class for fields shared by dcim.Interface and virtualization.VMInterface.
     """
 
+    status = StatusField(blank=False, null=False)
     enabled = models.BooleanField(default=True)
     mac_address = MACAddressCharField(blank=True, default="", verbose_name="MAC Address")
     mtu = models.PositiveIntegerField(
@@ -540,11 +464,11 @@ class BaseInterface(RelationshipModel, StatusModel):
             raise ValidationError({"untagged_vlan": "Mode must be set when specifying untagged_vlan"})
 
     def save(self, *args, **kwargs):
-
         if not self.status:
             query = Status.objects.get_for_model(self)
             try:
-                status = query.get(slug=InterfaceStatusChoices.STATUS_ACTIVE)
+                status_as_dict = InterfaceStatusChoices.as_dict()
+                status = query.get(name=status_as_dict.get(InterfaceStatusChoices.STATUS_ACTIVE))
             except Status.DoesNotExist:
                 raise ValidationError({"status": "Default status 'active' does not exist"})
             self.status = status
@@ -604,6 +528,13 @@ class Interface(CableTermination, PathEndpoint, ComponentModel, BaseInterface):
         blank=True,
         verbose_name="Tagged VLANs",
     )
+    vrf = models.ForeignKey(
+        to="ipam.VRF",
+        related_name="interfaces",
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+    )
     ip_addresses = models.ManyToManyField(
         to="ipam.IPAddress",
         through="ipam.IPAddressToInterface",
@@ -612,54 +543,20 @@ class Interface(CableTermination, PathEndpoint, ComponentModel, BaseInterface):
         verbose_name="IP Addresses",
     )
 
-    csv_headers = [
-        "device",
-        "name",
-        "label",
-        "lag",
-        "type",
-        "enabled",
-        "mac_address",
-        "mtu",
-        "mgmt_only",
-        "description",
-        "mode",
-        "status",
-        "parent_interface",
-        "bridge",
-    ]
-
     class Meta:
         ordering = ("device", CollateAsChar("_name"))
         unique_together = ("device", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:interface", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.identifier if self.device else None,
-            self.name,
-            self.label,
-            self.lag.name if self.lag else None,
-            self.get_type_display(),
-            self.enabled,
-            self.mac_address,
-            self.mtu,
-            str(self.mgmt_only),
-            self.description,
-            self.get_mode_display(),
-            self.get_status_display(),
-            self.parent_interface.name if self.parent_interface else None,
-            self.bridge.name if self.bridge else None,
-        )
-
     def clean(self):
         super().clean()
 
+        # VRF validation
+        if self.vrf and self.vrf not in self.device.vrfs.all():
+            # TODO(jathan): Or maybe we automatically add the VRF to the device?
+            raise ValidationError({"vrf": "VRF must be assigned to same Device."})
+
         # LAG validation
         if self.lag is not None:
-
             # A LAG interface cannot be its own parent
             if self.lag_id == self.pk:
                 raise ValidationError({"lag": "A LAG interface cannot be its own parent."})
@@ -699,7 +596,6 @@ class Interface(CableTermination, PathEndpoint, ComponentModel, BaseInterface):
 
         # Parent validation
         if self.parent_interface is not None:
-
             # An interface cannot be its own parent
             if self.parent_interface_id == self.pk:
                 raise ValidationError({"parent_interface": "An interface cannot be its own parent."})
@@ -747,7 +643,6 @@ class Interface(CableTermination, PathEndpoint, ComponentModel, BaseInterface):
 
         # Bridge validation
         if self.bridge is not None:
-
             # An interface cannot be bridged to itself
             if self.bridge_id == self.pk:
                 raise ValidationError({"bridge": "An interface cannot be bridged to itself."})
@@ -882,16 +777,6 @@ class FrontPort(CableTermination, ComponentModel):
         ],
     )
 
-    csv_headers = [
-        "device",
-        "name",
-        "label",
-        "type",
-        "rear_port",
-        "rear_port_position",
-        "description",
-    ]
-
     class Meta:
         ordering = ("device", "_name")
         unique_together = (
@@ -899,20 +784,6 @@ class FrontPort(CableTermination, ComponentModel):
             ("rear_port", "rear_port_position"),
         )
 
-    def get_absolute_url(self):
-        return reverse("dcim:frontport", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.identifier,
-            self.name,
-            self.label,
-            self.get_type_display(),
-            self.rear_port.name,
-            self.rear_port_position,
-            self.description,
-        )
-
     @property
     def parent(self):
         return self.device
@@ -949,15 +820,10 @@ class RearPort(CableTermination, ComponentModel):
         ],
     )
 
-    csv_headers = ["device", "name", "label", "type", "positions", "description"]
-
     class Meta:
         ordering = ("device", "_name")
         unique_together = ("device", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:rearport", kwargs={"pk": self.pk})
-
     def clean(self):
         super().clean()
 
@@ -971,16 +837,6 @@ class RearPort(CableTermination, ComponentModel):
                 }
             )
 
-    def to_csv(self):
-        return (
-            self.device.identifier,
-            self.name,
-            self.label,
-            self.get_type_display(),
-            self.positions,
-            self.description,
-        )
-
     @property
     def parent(self):
         return self.device
@@ -1005,24 +861,10 @@ class DeviceBay(ComponentModel):
         null=True,
     )
 
-    csv_headers = ["device", "name", "label", "installed_device", "description"]
-
     class Meta:
         ordering = ("device", "_name")
         unique_together = ("device", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:devicebay", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.identifier,
-            self.name,
-            self.label,
-            self.installed_device.identifier if self.installed_device else None,
-            self.description,
-        )
-
     def clean(self):
         super().clean()
 
@@ -1090,34 +932,15 @@ class InventoryItem(TreeModel, ComponentModel):
     )
     discovered = models.BooleanField(default=False, help_text="This item was automatically discovered")
 
-    csv_headers = [
-        "device",
-        "name",
-        "label",
-        "manufacturer",
-        "part_id",
-        "serial",
-        "asset_tag",
-        "discovered",
-        "description",
-    ]
-
     class Meta:
         ordering = ("_name",)
         unique_together = ("device", "parent", "name")
 
-    def get_absolute_url(self):
-        return reverse("dcim:inventoryitem", kwargs={"pk": self.pk})
-
-    def to_csv(self):
-        return (
-            self.device.name or f"{{{self.device.pk}}}",
-            self.name,
-            self.label,
-            self.manufacturer.name if self.manufacturer else None,
-            self.part_id,
-            self.serial,
-            self.asset_tag,
-            str(self.discovered),
-            self.description,
-        )
+    @classproperty  # https://github.com/PyCQA/pylint-django/issues/240
+    def natural_key_field_lookups(cls):  # pylint: disable=no-self-argument
+        """
+        Due to the recursive nature of InventoryItem.unique_together, we need a custom implementation of this property.
+
+        For the time being we just use the PK as a natural key.
+        """
+        return ["pk"]