nautobot 2.1.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/dcim/migrations/0033_add_tree_managers_and_foreign_keys_pre_data_migration.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.tree_queries
 
 

nautobot/dcim/migrations/0034_migrate_region_and_site_data_to_locations.py

@@ -7,8 +7,7 @@ from django.db import migrations
 
 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
+from nautobot.extras import choices as extras_choices, models as extras_models
 from nautobot.extras.utils import FeatureQuery
 
 logger = logging.getLogger(__name__)

nautobot/dcim/migrations/0038_fixup_fks_and_related_names.py

@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.fields
 
 

nautobot/dcim/migrations/0039_related_name_changes.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 import django.db.models.deletion
+
 import nautobot.core.models.fields
 import nautobot.extras.models.roles
 import nautobot.extras.models.statuses

nautobot/dcim/migrations/0042_alter_location_managers.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-03-15 18:07
 
 from django.db import migrations
+
 import nautobot.dcim.models.locations
 
 

nautobot/dcim/migrations/0044_tagsfield.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-04-21 13:59
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/dcim/migrations/0047_status_nonnullable.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 import django.db.models.deletion
+
 import nautobot.extras.models.roles
 import nautobot.extras.models.statuses
 

nautobot/dcim/migrations/0051_interface_redundancy_group_nullable_status.py

@@ -1,4 +1,5 @@
 from django.db import migrations, models
+
 from nautobot.extras.utils import fixup_null_statuses
 
 

nautobot/dcim/models/cables.py

@@ -1,5 +1,5 @@
-import logging
 from collections import defaultdict
+import logging
 
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
@@ -25,10 +25,10 @@ from nautobot.extras.utils import extras_features
 # from dcim.models.cables to core.models.generics to extras.models.datasources to core.models.generics.
 # Deferring the update to here works for now; fixing so that core.models.generics doesn't depend on extras.models
 # would be the much more invasive but much more "correct" fix.
-from nautobot.core.models.generics import BaseModel, PrimaryModel
+from nautobot.core.models.generics import BaseModel, PrimaryModel  # isort: skip
 
-from .devices import Device
 from .device_components import FrontPort, RearPort
+from .devices import Device
 
 __all__ = (
     "Cable",

nautobot/dcim/models/device_component_templates.py

@@ -1,24 +1,24 @@
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.contrib.contenttypes.models import ContentType
 
 from nautobot.core.models import BaseModel
 from nautobot.core.models.fields import ForeignKeyWithAutoRelatedName, NaturalOrderingField
 from nautobot.core.models.ordering import naturalize_interface
 from nautobot.dcim.choices import (
-    SubdeviceRoleChoices,
     ConsolePortTypeChoices,
-    PowerPortTypeChoices,
-    PowerOutletTypeChoices,
-    PowerOutletFeedLegChoices,
     InterfaceTypeChoices,
     PortTypeChoices,
+    PowerOutletFeedLegChoices,
+    PowerOutletTypeChoices,
+    PowerPortTypeChoices,
+    SubdeviceRoleChoices,
 )
-
 from nautobot.dcim.constants import REARPORT_POSITIONS_MAX, REARPORT_POSITIONS_MIN
 from nautobot.extras.models import ChangeLoggedModel, CustomField, CustomFieldModel, RelationshipModel, Status
 from nautobot.extras.utils import extras_features
+
 from .device_components import (
     ConsolePort,
     ConsoleServerPort,

nautobot/dcim/models/devices.py

@@ -1,6 +1,5 @@
 from collections import OrderedDict
 
-import yaml
 from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
@@ -11,15 +10,18 @@ from django.db.models import F, ProtectedError, Q
 from django.urls import reverse
 from django.utils.functional import cached_property, classproperty
 from django.utils.html import format_html
+import yaml
 
 from nautobot.core.models import BaseManager
 from nautobot.core.models.fields import 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.dcim.utils import get_all_network_driver_mappings
 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 (
     ConsolePort,
     ConsoleServerPort,
@@ -30,8 +32,6 @@ from .device_components import (
     PowerPort,
     RearPort,
 )
-from nautobot.dcim.utils import get_all_network_driver_mappings
-
 
 __all__ = (
     "Device",
@@ -408,7 +408,12 @@ class Device(PrimaryModel, ConfigContextModel):
         blank=True,
         null=True,
     )
-    name = models.CharField(max_length=64, blank=True, null=True, db_index=True)
+    name = models.CharField(  # noqa: DJ001  # django-nullable-model-string-field -- intentional, see below
+        max_length=64,
+        blank=True,
+        null=True,  # because name is part of uniqueness constraint but is optional
+        db_index=True,
+    )
     _name = NaturalOrderingField(target_field="name", max_length=100, blank=True, null=True, db_index=True)
     serial = models.CharField(max_length=255, blank=True, verbose_name="Serial number", db_index=True)
     asset_tag = models.CharField(

nautobot/dcim/models/locations.py

@@ -3,7 +3,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.functional import classproperty
-
 from timezone_field import TimeZoneField
 
 from nautobot.core.models.fields import NaturalOrderingField
@@ -45,6 +44,12 @@ class LocationType(TreeModel, OrganizationalModel):
         help_text="Allow Locations of this type to be parents/children of other Locations of this same type",
     )
 
+    clone_fields = [
+        "parent",
+        "nestable",
+        "content_types",
+    ]
+
     class Meta:
         ordering = ("name",)
 

nautobot/dcim/models/power.py

@@ -11,9 +11,9 @@ from nautobot.dcim.constants import (
     POWERFEED_MAX_UTILIZATION_DEFAULT,
     POWERFEED_VOLTAGE_DEFAULT,
 )
-
 from nautobot.extras.models import StatusField
 from nautobot.extras.utils import extras_features
+
 from .device_components import CableTermination, PathEndpoint
 
 __all__ = (

nautobot/dcim/models/racks.py

@@ -6,9 +6,9 @@ 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.db.models import Count, Sum, Q
+from django.db.models import Count, Q, Sum
 
-from nautobot.core.models.fields import NaturalOrderingField, JSONArrayField
+from nautobot.core.models.fields import JSONArrayField, NaturalOrderingField
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.tree_queries import TreeModel
 from nautobot.core.models.utils import array_to_string
@@ -19,6 +19,7 @@ from nautobot.dcim.constants import RACK_ELEVATION_LEGEND_WIDTH_DEFAULT, RACK_U_
 from nautobot.dcim.elevations import RackElevationSVG
 from nautobot.extras.models import RoleField, StatusField
 from nautobot.extras.utils import extras_features
+
 from .device_components import PowerOutlet, PowerPort
 from .devices import Device
 from .power import PowerFeed
@@ -108,10 +109,10 @@ class Rack(PrimaryModel):
     _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(
+    facility_id = models.CharField(  # noqa: DJ001  # django-nullable-model-string-field -- intentional, see below
         max_length=50,
         blank=True,
-        null=True,
+        null=True,  # because facility_id is optional but is part of a uniqueness constraint
         verbose_name="Facility ID",
         help_text="Locally-assigned identifier",
     )

nautobot/dcim/navigation.py

@@ -8,7 +8,6 @@ from nautobot.core.apps import (
     NavMenuTab,
 )
 
-
 menu_items = (
     NavMenuTab(
         name="Organization",

nautobot/dcim/signals.py

@@ -2,22 +2,23 @@ import logging
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
-from django.db.models.signals import m2m_changed, post_save, pre_delete
 from django.db import transaction
+from django.db.models.signals import m2m_changed, post_save, pre_delete
 from django.dispatch import receiver
 
 from nautobot.core.signals import disable_for_loaddata
+
 from .models import (
     Cable,
     CablePath,
     Device,
     DeviceRedundancyGroup,
+    Interface,
     PathEndpoint,
     PowerPanel,
     Rack,
     RackGroup,
     VirtualChassis,
-    Interface,
 )
 from .utils import validate_interface_tagged_vlans
 

nautobot/dcim/tables/__init__.py

@@ -3,6 +3,7 @@ from django_tables2.utils import Accessor
 
 from nautobot.core.tables import BaseTable, BooleanColumn
 from nautobot.dcim.models import ConsolePort, Interface, PowerPort
+
 from .cables import CableTable
 from .devices import (
     ConsolePortTable,
@@ -15,15 +16,15 @@ from .devices import (
     DeviceImportTable,
     DeviceInterfaceTable,
     DeviceInventoryItemTable,
-    DevicePowerPortTable,
     DevicePowerOutletTable,
+    DevicePowerPortTable,
     DeviceRearPortTable,
     DeviceRedundancyGroupTable,
     DeviceTable,
     FrontPortTable,
-    InterfaceTable,
-    InterfaceRedundancyGroupTable,
     InterfaceRedundancyGroupAssociationTable,
+    InterfaceRedundancyGroupTable,
+    InterfaceTable,
     InventoryItemTable,
     PlatformTable,
     PowerOutletTable,
@@ -46,10 +47,10 @@ from .devicetypes import (
 from .locations import LocationTable, LocationTypeTable
 from .power import PowerFeedTable, PowerPanelTable
 from .racks import (
-    RackTable,
     RackDetailTable,
     RackGroupTable,
     RackReservationTable,
+    RackTable,
 )
 
 __all__ = (

nautobot/dcim/tables/cables.py

@@ -9,6 +9,7 @@ from nautobot.core.tables import (
 )
 from nautobot.dcim.models import Cable
 from nautobot.extras.tables import StatusTableMixin
+
 from .template_code import CABLE_LENGTH, CABLE_TERMINATION_PARENT
 
 __all__ = ("CableTable",)

nautobot/dcim/tables/devices.py

@@ -30,6 +30,7 @@ from nautobot.dcim.models import (
 from nautobot.dcim.utils import cable_status_color_css
 from nautobot.extras.tables import RoleTableMixin, StatusTableMixin
 from nautobot.tenancy.tables import TenantColumn
+
 from .template_code import (
     CABLETERMINATION,
     CONSOLEPORT_BUTTONS,

nautobot/dcim/tables/locations.py

@@ -68,7 +68,6 @@ class LocationTable(StatusTableMixin, BaseTable):
             "parent",
             "tenant",
             "description",
-            "actions",
             "facility",
             "asn",
             "time_zone",
@@ -80,6 +79,7 @@ class LocationTable(StatusTableMixin, BaseTable):
             "contact_phone",
             "contact_email",
             "tags",
+            "actions",
         )
         default_columns = ("pk", "name", "status", "parent", "tenant", "description", "tags", "actions")
         orderable = False

nautobot/dcim/tables/power.py

@@ -9,6 +9,7 @@ from nautobot.core.tables import (
 )
 from nautobot.dcim.models import PowerFeed, PowerPanel
 from nautobot.extras.tables import StatusTableMixin
+
 from .devices import CableTerminationTable
 
 __all__ = (

nautobot/dcim/tables/racks.py

@@ -11,7 +11,8 @@ from nautobot.core.tables import (
 from nautobot.dcim.models import Rack, RackGroup, RackReservation
 from nautobot.extras.tables import RoleTableMixin, StatusTableMixin
 from nautobot.tenancy.tables import TenantColumn
-from .template_code import TREE_LINK, RACKGROUP_ELEVATIONS, UTILIZATION_GRAPH
+
+from .template_code import RACKGROUP_ELEVATIONS, TREE_LINK, UTILIZATION_GRAPH
 
 __all__ = (
     "RackTable",

nautobot/dcim/templates/dcim/device/consoleports.html

@@ -49,6 +49,6 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/connection_toggles.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/connection_toggles.js' %}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/consoleserverports.html

@@ -49,6 +49,6 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/connection_toggles.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/connection_toggles.js' %}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/devicebays.html

@@ -46,5 +46,5 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/frontports.html

@@ -49,6 +49,6 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/connection_toggles.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/connection_toggles.js' %}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/interfaces.html

@@ -24,7 +24,7 @@
                     <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}" class="btn btn-warning btn-xs">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
                     </button>
-                    <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_edit' %}?device={{ object.pk }}&return_url={% url 'dcim:device_interfaces' pk=object.pk %}" class="btn btn-warning btn-xs">
+                    <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_edit' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}" class="btn btn-warning btn-xs">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
                     </button>
                     <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={% url 'dcim:device_interfaces' pk=object.pk %}" class="btn btn-danger btn-xs">
@@ -52,7 +52,7 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/connection_toggles.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/interface_filtering.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/connection_toggles.js' %}"></script>
+    <script src="{% versioned_static 'js/interface_filtering.js' %}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/inventory.html

@@ -46,5 +46,5 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/poweroutlets.html

@@ -49,6 +49,6 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/connection_toggles.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/connection_toggles.js' %}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/powerports.html

@@ -49,6 +49,6 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/connection_toggles.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/connection_toggles.js' %}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/device/rearports.html

@@ -49,6 +49,6 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/connection_toggles.js' %}?v{{ settings.VERSION }}"></script>
-    <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/connection_toggles.js' %}"></script>
+    <script src="{% versioned_static 'js/tableconfig.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/inc/location_hierarchy.html

@@ -1,5 +1,6 @@
 {% load helpers %}
 {% if location is not None %}
+{% with ancestors=location.ancestors %}
     <style>
         .location-hierarchy {
             list-style-type: none;
@@ -12,16 +13,17 @@
         }
     </style>
     <ul class="location-hierarchy">
-        {% for ancestor in location.ancestors %}
+        {% for ancestor in ancestors %}
             <li>{{ ancestor|hyperlinked_object:"name" }} ({{ ancestor.location_type|hyperlinked_object:"name" }})
                 <ul>
         {% endfor %}
         <li><strong>{{ location|hyperlinked_object:"name" }} ({{ location.location_type|hyperlinked_object:"name" }})</strong></li>
-        {% for ancestor in location.ancestors %}
+        {% for ancestor in ancestors %}
                 </ul>
             </li>
         {% endfor %}
     </ul>
+{% endwith %}
 {% else %}
     {{ location|placeholder }}
 {% endif %}

nautobot/dcim/templates/dcim/rack.html

@@ -322,5 +322,5 @@
 
 {% block javascript %}
     {{block.super}}
-    <script src="{% static 'js/rack_elevations.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/rack_elevations.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/templates/dcim/rack_elevation_list.html

@@ -53,5 +53,5 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/rack_elevations.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/rack_elevations.js' %}"></script>
 {% endblock %}

nautobot/dcim/templates/dcim/rackreservation.html

@@ -83,5 +83,5 @@
 
 {% block javascript %}
     {{ block.super }}
-    <script src="{% static 'js/rack_elevations.js' %}?v{{ settings.VERSION }}"></script>
+    <script src="{% versioned_static 'js/rack_elevations.js' %}"></script>
 {% endblock javascript %}

nautobot/dcim/tests/test_api.py

@@ -1,14 +1,13 @@
 import json
 from unittest import skip
 
+from constance.test import override_config
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.test import override_settings
 from django.urls import reverse
 from rest_framework import status
 
-from constance.test import override_config
-
 from nautobot.core.testing import APITestCase, APIViewTestCases
 from nautobot.core.testing.utils import generate_random_device_asset_tag_of_specified_size
 from nautobot.dcim.choices import (
@@ -34,17 +33,17 @@ from nautobot.dcim.models import (
     Interface,
     InterfaceRedundancyGroup,
     InterfaceTemplate,
+    InventoryItem,
     Location,
     LocationType,
     Manufacturer,
-    InventoryItem,
     Platform,
     PowerFeed,
-    PowerPort,
-    PowerPortTemplate,
     PowerOutlet,
     PowerOutletTemplate,
     PowerPanel,
+    PowerPort,
+    PowerPortTemplate,
     Rack,
     RackGroup,
     RackReservation,
@@ -53,11 +52,10 @@ from nautobot.dcim.models import (
     VirtualChassis,
 )
 from nautobot.extras.models import ConfigContextSchema, Role, SecretsGroup, Status
-from nautobot.ipam.models import IPAddress, VLAN, VLANGroup, Namespace, Prefix
+from nautobot.ipam.models import IPAddress, Namespace, Prefix, VLAN, VLANGroup
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster, ClusterType
 
-
 # Use the proper swappable User model
 User = get_user_model()
 
@@ -720,6 +718,7 @@ class ManufacturerTest(APIViewTestCases.APIViewTestCase):
         # FIXME(jathan): This has to be replaced with# `get_deletable_object` and
         # `get_deletable_object_pks` but this is a workaround just so all of these objects are
         # deletable for now.
+        Device.objects.all().delete()
         DeviceType.objects.all().delete()
         Platform.objects.all().delete()
 
@@ -1104,6 +1103,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
+        Device.objects.all().delete()
         locations = Location.objects.filter(location_type=LocationType.objects.get(name="Campus"))[:2]
 
         rack_status = Status.objects.get_for_model(Rack).first()

nautobot/dcim/tests/test_cablepaths.py

@@ -21,7 +21,6 @@ from nautobot.dcim.models import (
     PowerPort,
     RearPort,
 )
-
 from nautobot.dcim.utils import object_to_path_node
 from nautobot.extras.models import Role, Status