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

nautobot/dcim/models/devices.py

@@ -16,7 +16,7 @@ from nautobot.core.models.fields import AutoSlugField, NaturalOrderingField
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.dcim.choices import DeviceFaceChoices, DeviceRedundancyGroupFailoverStrategyChoices, SubdeviceRoleChoices
-from nautobot.extras.models import ConfigContextModel, RoleRequiredRoleModelMixin, StatusModel
+from nautobot.extras.models import ConfigContextModel, RoleField, StatusField
 from nautobot.extras.querysets import ConfigContextModelQuerySet
 from nautobot.extras.utils import extras_features
 from .device_components import (
@@ -58,23 +58,14 @@ class Manufacturer(OrganizationalModel):
     """
 
     name = models.CharField(max_length=100, unique=True)
-    slug = AutoSlugField(populate_from="name")
     description = models.CharField(max_length=200, blank=True)
 
-    csv_headers = ["name", "slug", "description"]
-
     class Meta:
         ordering = ["name"]
 
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("dcim:manufacturer", args=[self.slug])
-
-    def to_csv(self):
-        return (self.name, self.slug, self.description)
-
 
 @extras_features(
     "custom_links",
@@ -153,9 +144,6 @@ class DeviceType(PrimaryModel):
         self._original_front_image = self.front_image if self.present_in_database else None
         self._original_rear_image = self.rear_image if self.present_in_database else None
 
-    def get_absolute_url(self):
-        return reverse("dcim:devicetype", args=[self.pk])
-
     def to_yaml(self):
         data = OrderedDict(
             (
@@ -334,7 +322,6 @@ class Platform(OrganizationalModel):
     """
 
     name = models.CharField(max_length=100, unique=True)
-    slug = AutoSlugField(populate_from="name")
     manufacturer = models.ForeignKey(
         to="dcim.Manufacturer",
         on_delete=models.PROTECT,
@@ -358,34 +345,12 @@ class Platform(OrganizationalModel):
     )
     description = models.CharField(max_length=200, blank=True)
 
-    csv_headers = [
-        "name",
-        "slug",
-        "manufacturer",
-        "napalm_driver",
-        "napalm_args",
-        "description",
-    ]
-
     class Meta:
         ordering = ["name"]
 
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("dcim:platform", args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.manufacturer.name if self.manufacturer else None,
-            self.napalm_driver,
-            self.napalm_args,
-            self.description,
-        )
-
 
 @extras_features(
     "custom_links",
@@ -397,7 +362,7 @@ class Platform(OrganizationalModel):
     "statuses",
     "webhooks",
 )
-class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleModelMixin):
+class Device(PrimaryModel, ConfigContextModel):
     """
     A Device represents a piece of physical hardware. Each Device is assigned a DeviceType,
     Role, and (optionally) a Platform. Device names are not required, however if one is set it must be unique.
@@ -412,6 +377,8 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
     """
 
     device_type = models.ForeignKey(to="dcim.DeviceType", on_delete=models.PROTECT, related_name="devices")
+    status = StatusField(blank=False, null=False)
+    role = RoleField(blank=False, null=False)
     tenant = models.ForeignKey(
         to="tenancy.Tenant",
         on_delete=models.PROTECT,
@@ -521,27 +488,6 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
 
     objects = BaseManager.from_queryset(ConfigContextModelQuerySet)()
 
-    csv_headers = [
-        "name",
-        "role",
-        "tenant",
-        "manufacturer",
-        "device_type",
-        "platform",
-        "serial",
-        "asset_tag",
-        "status",
-        "location",
-        "rack_group",
-        "rack_name",
-        "position",
-        "face",
-        "device_redundancy_group",
-        "device_redundancy_group_priority",
-        "secrets_group",
-        "primary_ip",
-        "comments",
-    ]
     clone_fields = [
         "device_type",
         "role",
@@ -554,6 +500,8 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
         "secrets_group",
     ]
 
+    natural_key_field_names = ["name", "tenant", "location"]  # location should be last since it's variadic
+
     class Meta:
         ordering = ("_name",)  # Name may be null
         unique_together = (
@@ -565,11 +513,7 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
     def __str__(self):
         return self.display or super().__str__()
 
-    def get_absolute_url(self):
-        return reverse("dcim:device", args=[self.pk])
-
     def validate_unique(self, exclude=None):
-
         # Check for a duplicate name on a device assigned to the same Location and no Tenant. This is necessary
         # because Django does not consider two NULL fields to be equal, and thus will not trigger a violation
         # of the uniqueness constraint without manual intervention.
@@ -628,7 +572,6 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
             )
 
         if self.rack:
-
             try:
                 # Child devices cannot be assigned to a rack face/unit
                 if self.device_type.is_child_device and self.face:
@@ -667,42 +610,28 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
 
         # Validate primary IP addresses
         vc_interfaces = self.vc_interfaces.all()
-        if self.primary_ip4:
-            if self.primary_ip4.family != 4:
-                raise ValidationError({"primary_ip4": f"{self.primary_ip4} is not an IPv4 address."})
-            if ipam_models.IPAddressToInterface.objects.filter(
-                ip_address=self.primary_ip4, interface__in=vc_interfaces
-            ).exists():
-                pass
-            elif (
-                self.primary_ip4.nat_inside is not None
-                and ipam_models.IPAddressToInterface.objects.filter(
-                    ip_address=self.primary_ip4.nat_inside, interface__in=vc_interfaces
-                ).exists()
-            ):
-                pass
-            else:
-                raise ValidationError(
-                    {"primary_ip4": f"The specified IP address ({self.primary_ip4}) is not assigned to this device."}
-                )
-        if self.primary_ip6:
-            if self.primary_ip6.family != 6:
-                raise ValidationError({"primary_ip6": f"{self.primary_ip6} is not an IPv6 address."})
-            if ipam_models.IPAddressToInterface.objects.filter(
-                ip_address=self.primary_ip6, interface__in=vc_interfaces
-            ).exists():
-                pass
-            elif (
-                self.primary_ip6.nat_inside is not None
-                and ipam_models.IPAddressToInterface.objects.filter(
-                    ip_address=self.primary_ip6.nat_inside, interface__in=vc_interfaces
-                ).exists()
-            ):
-                pass
-            else:
-                raise ValidationError(
-                    {"primary_ip6": f"The specified IP address ({self.primary_ip6}) is not assigned to this device."}
-                )
+        for field in ["primary_ip4", "primary_ip6"]:
+            ip = getattr(self, field)
+            if ip is not None:
+                if field == "primary_ip4":
+                    if ip.ip_version != 4:
+                        raise ValidationError({f"{field}": f"{ip} is not an IPv4 address."})
+                else:
+                    if ip.ip_version != 6:
+                        raise ValidationError({f"{field}": f"{ip} is not an IPv6 address."})
+                if ipam_models.IPAddressToInterface.objects.filter(ip_address=ip, interface__in=vc_interfaces).exists():
+                    pass
+                elif (
+                    ip.nat_inside is not None
+                    and ipam_models.IPAddressToInterface.objects.filter(
+                        ip_address=ip.nat_inside, interface__in=vc_interfaces
+                    ).exists()
+                ):
+                    pass
+                else:
+                    raise ValidationError(
+                        {f"{field}": f"The specified IP address ({ip}) is not assigned to this device."}
+                    )
 
         # Validate manufacturer/platform
         if hasattr(self, "device_type") and self.platform:
@@ -751,7 +680,6 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
             )
 
     def save(self, *args, **kwargs):
-
         is_new = not self.present_in_database
 
         super().save(*args, **kwargs)
@@ -780,29 +708,6 @@ class Device(PrimaryModel, ConfigContextModel, StatusModel, RoleRequiredRoleMode
             device.rack = self.rack
             device.save()
 
-    def to_csv(self):
-        return (
-            self.name or "",
-            self.role.name,
-            self.tenant.name if self.tenant else None,
-            self.device_type.manufacturer.name,
-            self.device_type.model,
-            self.platform.name if self.platform else None,
-            self.serial,
-            self.asset_tag,
-            self.get_status_display(),
-            self.location.name,
-            self.rack.rack_group.name if self.rack and self.rack.rack_group else None,
-            self.rack.name if self.rack else None,
-            self.position,
-            self.get_face_display(),
-            self.device_redundancy_group.slug if self.device_redundancy_group else None,
-            self.device_redundancy_group_priority,
-            self.secrets_group.name if self.secrets_group else None,
-            self.primary_ip if self.primary_ip else None,
-            self.comments,
-        )
-
     @property
     def display(self):
         if self.name:
@@ -918,8 +823,6 @@ class VirtualChassis(PrimaryModel):
     name = models.CharField(max_length=64, db_index=True)
     domain = models.CharField(max_length=30, blank=True)
 
-    csv_headers = ["name", "domain", "master"]
-
     class Meta:
         ordering = ["name"]
         verbose_name_plural = "virtual chassis"
@@ -927,9 +830,6 @@ class VirtualChassis(PrimaryModel):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("dcim:virtualchassis", kwargs={"pk": self.pk})
-
     @property
     def member_interfaces(self):
         """Return a list of Interfaces common to all member devices."""
@@ -946,7 +846,6 @@ class VirtualChassis(PrimaryModel):
             )
 
     def delete(self, *args, **kwargs):
-
         # Check for LAG interfaces split across member chassis
         interfaces = Interface.objects.filter(device__in=self.members.all(), lag__isnull=False).exclude(
             lag__device=F("device")
@@ -959,13 +858,6 @@ class VirtualChassis(PrimaryModel):
 
         return super().delete(*args, **kwargs)
 
-    def to_csv(self):
-        return (
-            self.name,
-            self.domain,
-            self.master.name if self.master else None,
-        )
-
 
 @extras_features(
     "custom_links",
@@ -976,13 +868,13 @@ class VirtualChassis(PrimaryModel):
     "statuses",
     "webhooks",
 )
-class DeviceRedundancyGroup(PrimaryModel, StatusModel):
+class DeviceRedundancyGroup(PrimaryModel):
     """
     A DeviceRedundancyGroup represents a logical grouping of physical hardware for the purposes of high-availability.
     """
 
     name = models.CharField(max_length=100, unique=True)
-    slug = AutoSlugField(populate_from="name")
+    status = StatusField(blank=False, null=False)
     description = models.CharField(max_length=200, blank=True)
 
     failover_strategy = models.CharField(
@@ -1009,8 +901,6 @@ class DeviceRedundancyGroup(PrimaryModel, StatusModel):
         "secrets_group",
     ]
 
-    csv_headers = ["name", "failover_strategy", "status", "secrets_group", "comments"]
-
     class Meta:
         ordering = ("name",)
 
@@ -1020,15 +910,3 @@ class DeviceRedundancyGroup(PrimaryModel, StatusModel):
 
     def __str__(self):
         return self.name
-
-    def get_absolute_url(self):
-        return reverse("dcim:deviceredundancygroup", args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.failover_strategy,
-            self.get_status_display(),
-            self.secrets_group.name if self.secrets_group else None,
-            self.comments,
-        )

nautobot/dcim/models/locations.py

@@ -2,7 +2,6 @@ from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.urls import reverse
 from django.utils.functional import classproperty
 
 from timezone_field import TimeZoneField
@@ -11,7 +10,7 @@ from nautobot.core.models.fields import AutoSlugField, NaturalOrderingField
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.tree_queries import TreeManager, TreeModel, TreeQuerySet
 from nautobot.dcim.fields import ASNField
-from nautobot.extras.models import StatusModel
+from nautobot.extras.models import StatusField
 from nautobot.extras.utils import extras_features, FeatureQuery
 
 
@@ -46,27 +45,12 @@ class LocationType(TreeModel, OrganizationalModel):
         help_text="Allow Locations of this type to be parents/children of other Locations of this same type",
     )
 
-    csv_headers = ["name", "slug", "parent", "description", "nestable", "content_types"]
-
     class Meta:
         ordering = ("name",)
 
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("dcim:locationtype", args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.parent.name if self.parent else None,
-            self.description,
-            self.nestable,
-            ",".join(f"{ct.app_label}.{ct.model}" for ct in self.content_types.order_by("app_label", "model")),
-        )
-
     def clean(self):
         """
         Check changes to the nestable flag for validity.
@@ -133,7 +117,7 @@ class LocationManager(TreeManager.from_queryset(LocationQuerySet)):
     "statuses",
     "webhooks",
 )
-class Location(TreeModel, StatusModel, PrimaryModel):
+class Location(TreeModel, PrimaryModel):
     """
     A Location represents an arbitrarily specific geographic location, such as a campus, building, floor, room, etc.
 
@@ -170,6 +154,7 @@ class Location(TreeModel, StatusModel, PrimaryModel):
         on_delete=models.PROTECT,
         related_name="locations",
     )
+    status = StatusField(blank=False, null=False)
     tenant = models.ForeignKey(
         to="tenancy.Tenant",
         on_delete=models.PROTECT,
@@ -210,27 +195,6 @@ class Location(TreeModel, StatusModel, PrimaryModel):
 
     objects = LocationManager()
 
-    csv_headers = [
-        "name",
-        "slug",
-        "location_type",
-        "status",
-        "parent",
-        "tenant",
-        "description",
-        "facility",
-        "asn",
-        "time_zone",
-        "physical_address",
-        "shipping_address",
-        "latitude",
-        "longitude",
-        "contact_name",
-        "contact_phone",
-        "contact_email",
-        "comments",
-    ]
-
     clone_fields = [
         "location_type",
         "status",
@@ -284,31 +248,6 @@ class Location(TreeModel, StatusModel, PrimaryModel):
             natural_key_field_lookups.append(f"parent__{natural_key_field_lookups[-1]}")
         return dict(zip(natural_key_field_lookups, args))
 
-    def get_absolute_url(self):
-        return reverse("dcim:location", args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.location_type.name,
-            self.get_status_display(),
-            self.parent.name if self.parent else None,
-            self.tenant.name if self.tenant else None,
-            self.description,
-            self.facility,
-            self.asn,
-            self.time_zone,
-            self.physical_address,
-            self.shipping_address,
-            self.latitude,
-            self.longitude,
-            self.contact_name,
-            self.contact_phone,
-            self.contact_email,
-            self.comments,
-        )
-
     def validate_unique(self, exclude=None):
         # Check for a duplicate name on a Location with no parent.
         # This is necessary because Django does not consider two NULL fields to be equal.

nautobot/dcim/models/power.py

@@ -2,7 +2,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.urls import reverse
 
 from nautobot.core.models.generics import PrimaryModel
 from nautobot.core.models.validators import ExclusionValidator
@@ -13,7 +12,7 @@ from nautobot.dcim.constants import (
     POWERFEED_VOLTAGE_DEFAULT,
 )
 
-from nautobot.extras.models import StatusModel
+from nautobot.extras.models import StatusField
 from nautobot.extras.utils import extras_features
 from .device_components import CableTermination, PathEndpoint
 
@@ -47,8 +46,6 @@ class PowerPanel(PrimaryModel):
     )
     name = models.CharField(max_length=100, db_index=True)
 
-    csv_headers = ["location", "rack_group", "name"]
-
     class Meta:
         ordering = ["location", "name"]
         unique_together = ["location", "name"]
@@ -56,16 +53,6 @@ class PowerPanel(PrimaryModel):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("dcim:powerpanel", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.location.name,
-            self.rack_group.name if self.rack_group else None,
-            self.name,
-        )
-
     def clean(self):
         super().clean()
 
@@ -103,7 +90,7 @@ class PowerPanel(PrimaryModel):
     "statuses",
     "webhooks",
 )
-class PowerFeed(PrimaryModel, PathEndpoint, CableTermination, StatusModel):
+class PowerFeed(PrimaryModel, PathEndpoint, CableTermination):
     """
     An electrical circuit delivered from a PowerPanel.
     """
@@ -111,6 +98,7 @@ class PowerFeed(PrimaryModel, PathEndpoint, CableTermination, StatusModel):
     power_panel = models.ForeignKey(to="PowerPanel", on_delete=models.PROTECT, related_name="power_feeds")
     rack = models.ForeignKey(to="Rack", on_delete=models.PROTECT, blank=True, null=True, related_name="power_feeds")
     name = models.CharField(max_length=100)
+    status = StatusField(blank=False, null=False)
     type = models.CharField(
         max_length=50,
         choices=PowerFeedTypeChoices,
@@ -136,21 +124,6 @@ class PowerFeed(PrimaryModel, PathEndpoint, CableTermination, StatusModel):
     available_power = models.PositiveIntegerField(default=0, editable=False)
     comments = models.TextField(blank=True)
 
-    csv_headers = [
-        "location",
-        "power_panel",
-        "rack_group",
-        "rack",
-        "name",
-        "status",
-        "type",
-        "supply",
-        "phase",
-        "voltage",
-        "amperage",
-        "max_utilization",
-        "comments",
-    ]
     clone_fields = [
         "power_panel",
         "rack",
@@ -171,26 +144,6 @@ class PowerFeed(PrimaryModel, PathEndpoint, CableTermination, StatusModel):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("dcim:powerfeed", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.power_panel.location.name,
-            self.power_panel.name,
-            self.rack.rack_group.name if self.rack and self.rack.rack_group else None,
-            self.rack.name if self.rack else None,
-            self.name,
-            self.get_status_display(),
-            self.get_type_display(),
-            self.get_supply_display(),
-            self.get_phase_display(),
-            self.voltage,
-            self.amperage,
-            self.max_utilization,
-            self.comments,
-        )
-
     def clean(self):
         super().clean()
 
@@ -205,7 +158,6 @@ class PowerFeed(PrimaryModel, PathEndpoint, CableTermination, StatusModel):
             raise ValidationError({"voltage": "Voltage cannot be negative for AC supply"})
 
     def save(self, *args, **kwargs):
-
         # Cache the available_power property on the instance
         kva = abs(self.voltage) * self.amperage * (self.max_utilization / 100)
         if self.phase == PowerFeedPhaseChoices.PHASE_3PHASE: