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

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()
 

nautobot/dcim/models/racks.py

@@ -7,7 +7,6 @@ from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import Count, Sum, Q
-from django.urls import reverse
 
 from nautobot.core.models.fields import AutoSlugField, NaturalOrderingField, JSONArrayField
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
@@ -18,7 +17,7 @@ from nautobot.core.utils.data import UtilizationData
 from nautobot.dcim.choices import DeviceFaceChoices, RackDimensionUnitChoices, RackTypeChoices, RackWidthChoices
 from nautobot.dcim.constants import RACK_ELEVATION_LEGEND_WIDTH_DEFAULT, RACK_U_HEIGHT_DEFAULT
 from nautobot.dcim.elevations import RackElevationSVG
-from nautobot.extras.models import RoleModelMixin, StatusModel
+from nautobot.extras.models import RoleField, StatusField
 from nautobot.extras.utils import extras_features
 from .device_components import PowerOutlet, PowerPort
 from .devices import Device
@@ -57,8 +56,6 @@ class RackGroup(TreeModel, OrganizationalModel):
     )
     description = models.CharField(max_length=200, blank=True)
 
-    csv_headers = ["location", "parent", "name", "slug", "description"]
-
     class Meta:
         ordering = ("name",)
         unique_together = [
@@ -72,18 +69,6 @@ class RackGroup(TreeModel, OrganizationalModel):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("dcim:rackgroup", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.location.name,
-            self.parent.name if self.parent else "",
-            self.name,
-            self.slug,
-            self.description,
-        )
-
     def clean(self):
         super().clean()
 
@@ -117,7 +102,7 @@ class RackGroup(TreeModel, OrganizationalModel):
     "statuses",
     "webhooks",
 )
-class Rack(PrimaryModel, StatusModel, RoleModelMixin):
+class Rack(PrimaryModel):
     """
     Devices are housed within Racks. Each rack has a defined height measured in rack units, and a front and rear face.
     Each Rack is assigned to a Location and (optionally) a RackGroup.
@@ -125,6 +110,8 @@ class Rack(PrimaryModel, StatusModel, RoleModelMixin):
 
     name = models.CharField(max_length=100, db_index=True)
     _name = NaturalOrderingField(target_field="name", max_length=100, blank=True, db_index=True)
+    status = StatusField(blank=False, null=False)
+    role = RoleField(blank=True, null=True)
     facility_id = models.CharField(
         max_length=50,
         blank=True,
@@ -189,25 +176,6 @@ class Rack(PrimaryModel, StatusModel, RoleModelMixin):
     comments = models.TextField(blank=True)
     images = GenericRelation(to="extras.ImageAttachment")
 
-    csv_headers = [
-        "location",
-        "rack_group",
-        "name",
-        "facility_id",
-        "tenant",
-        "status",
-        "role",
-        "type",
-        "serial",
-        "asset_tag",
-        "width",
-        "u_height",
-        "desc_units",
-        "outer_width",
-        "outer_depth",
-        "outer_unit",
-        "comments",
-    ]
     clone_fields = [
         "location",
         "rack_group",
@@ -238,9 +206,6 @@ class Rack(PrimaryModel, StatusModel, RoleModelMixin):
     def __str__(self):
         return self.display or super().__str__()
 
-    def get_absolute_url(self):
-        return reverse("dcim:rack", args=[self.pk])
-
     def clean(self):
         super().clean()
 
@@ -279,27 +244,6 @@ class Rack(PrimaryModel, StatusModel, RoleModelMixin):
                         {"u_height": f"Rack must be at least {min_height}U tall to house currently installed devices."}
                     )
 
-    def to_csv(self):
-        return (
-            self.location.name,
-            self.rack_group.name if self.rack_group else None,
-            self.name,
-            self.facility_id,
-            self.tenant.name if self.tenant else None,
-            self.get_status_display(),
-            self.role.name if self.role else None,
-            self.get_type_display() if self.type else None,
-            self.serial,
-            self.asset_tag,
-            self.width,
-            self.u_height,
-            str(self.desc_units),
-            self.outer_width,
-            self.outer_depth,
-            self.outer_unit,
-            self.comments,
-        )
-
     @property
     def units(self):
         if self.desc_units:
@@ -534,25 +478,15 @@ class RackReservation(PrimaryModel):
     user = models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.PROTECT, related_name="rack_reservations")
     description = models.CharField(max_length=200)
 
-    csv_headers = [
-        "location",
-        "rack_group",
-        "rack",
-        "units",
-        "tenant",
-        "user",
-        "description",
-    ]
-
     class Meta:
         ordering = ["created"]
 
+    # TODO: no appropriate natural-key for RackReservation?
+    natural_key_field_names = ["id"]
+
     def __str__(self):
         return f"Reservation for rack {self.rack}"
 
-    def get_absolute_url(self):
-        return reverse("dcim:rackreservation", args=[self.pk])
-
     def clean(self):
         super().clean()
 
@@ -576,17 +510,6 @@ class RackReservation(PrimaryModel):
                 error = ", ".join([str(u) for u in conflicting_units])
                 raise ValidationError({"units": f"The following units have already been reserved: {error}"})
 
-    def to_csv(self):
-        return (
-            self.rack.location.name,
-            self.rack.rack_group if self.rack.rack_group else None,
-            self.rack.name,
-            ",".join([str(u) for u in self.units]),
-            self.tenant.name if self.tenant else None,
-            self.user.username,
-            self.description,
-        )
-
     @property
     def unit_list(self):
         return array_to_string(self.units)